diff --git a/include/staff/templates/status-options.tmpl.php b/include/staff/templates/status-options.tmpl.php
index 1f9918f26ca44c70df7cd72e2af925d598cc84fe..30adcd8ec507cff06f0f7771259ae3c1c09bc9a8 100644
--- a/include/staff/templates/status-options.tmpl.php
+++ b/include/staff/templates/status-options.tmpl.php
@@ -33,13 +33,12 @@ if (!$nextStatuses)
?>
<span
- class="action-button"
- data-dropdown="#action-dropdown-statuses">
+ class="action-button pull-right"
+ data-dropdown="#action-dropdown-statuses" data-placement="bottom" data-toggle="tooltip" title="<?php echo __('Change Status'); ?>">
<i class="icon-caret-down pull-right"></i>
<a class="tickets-action"
href="#statuses"><i
- class="icon-flag"></i> <?php
- echo __('Change Status'); ?></a>
+ class="icon-flag"></i></a>
</span>
<div id="action-dropdown-statuses"
class="action-dropdown anchor-right">
diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php
index 63f1083d042a4b8026c0e39defae7e69453bec21..82212dea55d234c86ebe807034f9f85ca3488f5e 100644
--- a/include/staff/ticket-view.inc.php
+++ b/include/staff/ticket-view.inc.php
@@ -60,39 +60,41 @@ if($ticket->isOverdue())
if ($thisstaff->hasPerm(Email::PERM_BANLIST)
|| $role->hasPerm(TicketModel::PERM_EDIT)
|| ($dept && $dept->isManager($thisstaff))) { ?>
- <span class="action-button pull-right" data-dropdown="#action-dropdown-more">
+ <span class="action-button pull-right" data-placement="bottom" data-dropdown="#action-dropdown-more" data-toggle="tooltip" title="<?php echo __('More');?>">
<i class="icon-caret-down pull-right"></i>
- <span ><i class="icon-cog"></i> <?php echo __('More');?></span>
+ <span ><i class="icon-cog"></i></span>
</span>
<?php
}
- // Status change options
- echo TicketStatus::status_options();
if ($role->hasPerm(TicketModel::PERM_EDIT)) { ?>
- <a class="action-button pull-right" href="tickets.php?id=<?php echo $ticket->getId(); ?>&a=edit"><i class="icon-edit"></i> <?php
- echo __('Edit'); ?></a>
+ <span class="action-button pull-right"><a data-placement="bottom" data-toggle="tooltip" title="<?php echo __('Edit'); ?>" href="tickets.php?id=<?php echo $ticket->getId(); ?>&a=edit"><i class="icon-edit"></i></a></span>
<?php
} ?>
<?php
// Transfer
if ($role->hasPerm(TicketModel::PERM_TRANSFER)) {?>
- <a class="ticket-action action-button pull-right" id="ticket-transfer"
+ <span class="action-button pull-right">
+ <a class="ticket-action" id="ticket-transfer" data-placement="bottom" data-toggle="tooltip" title="<?php echo __('Transfer'); ?>"
data-redirect="tickets.php"
- href="#tickets/<?php echo $ticket->getId(); ?>/transfer"><i class="icon-share"></i> <?php
- echo __('Transfer'); ?></a>
+ href="#tickets/<?php echo $ticket->getId(); ?>/transfer"><i class="icon-share"></i></a>
+ </span>
<?php
} ?>
<?php
// Assign
if ($ticket->isOpen() && $role->hasPerm(TicketModel::PERM_ASSIGN)) {?>
- <span class="action-button pull-right" data-dropdown="#action-dropdown-assign">
+ <span class="action-button pull-right"
+ data-dropdown="#action-dropdown-assign"
+ data-placement="bottom"
+ data-toggle="tooltip"
+ title=" <?php echo $ticket->isAssigned() ? _↪_('Assign') : __('Reassign'); ?>"
+ >
<i class="icon-caret-down pull-right"></i>
<a class="ticket-action" id="ticket-assign"
data-redirect="tickets.php"
- href="#tickets/<?php echo $ticket->getId(); ?>/assign"><i class="icon-user"></i> <?php
- echo $ticket->isAssigned() ? __('Reassign') : __('Assign'); ?></a>
+ href="#tickets/<?php echo $ticket->getId(); ?>/assign"><i class="icon-user"></i></a>
</span>
<div id="action-dropdown-assign" class="action-dropdown anchor-right">
<ul>
@@ -117,10 +119,9 @@ if($ticket->isOverdue())
</div>
<?php
} ?>
- <span class="action-button pull-right" data-dropdown="#action-dropdown-print">
+ <span class="action-button pull-right" data-placement="bottom" data-dropdown="#action-dropdown-print" data-toggle="tooltip" title="<?php echo __('Print'); ?>">
<i class="icon-caret-down pull-right"></i>
- <a id="ticket-print" href="tickets.php?id=<?php echo $ticket->getId(); ?>&a=print"><i class="icon-print"></i> <?php
- echo __('Print'); ?></a>
+ <a id="ticket-print" href="tickets.php?id=<?php echo $ticket->getId(); ?>&a=print"><i class="icon-print"></i></a>
</span>
<div id="action-dropdown-print" class="action-dropdown anchor-right">
<ul>
@@ -196,7 +197,16 @@ if($ticket->isOverdue())
?>
</ul>
</div>
- </div>
+ <?php
+ // Status change options
+ echo TicketStatus::status_options(); ?>
+ <span class="action-button ticket-response pull-right"data-placement="bottom" data-toggle="tooltip" title="Internal Note">
+ <a href="#reply"><i class="icon-file-text"></i></a>
+ </span>
+ <span class="action-button ticket-response pull-right" data-placement="bottom" data-toggle="tooltip" title="Post Reply">
+ <a href="#note"><i class="icon-mail-reply"></i></a>
+ </span>
+ </div>
<div class="flush-left">
<h2><a href="tickets.php?id=<?php echo $ticket->getId(); ?>"
title="<?php echo __('Reload'); ?>"><i class="icon-refresh"></i>
@@ -473,12 +483,7 @@ $tcount = $ticket->getThreadEntries($types)->count();
<div id="ticket_tabs_container">
<div id="ticket_thread" class="tab_content">
-
-<div class="ticket-response pull-right">
- <a class="action-button muted" data-toggle="tooltip" title="Post Reply"><i class="icon-mail-reply"></i></a>
- <a class="action-button muted" data-toggle="tooltip" title="Internal Note"><i class="icon-file-text"></i></a>
-</div>
-<div class="clear"></div>
+
<?php
// Render ticket thread
$ticket->getThread()->render(
diff --git a/scp/css/dropdown.css b/scp/css/dropdown.css
index c0b90c83a9fc3b080df495c16e74c18380b88770..1106463645a48208b3526afe37ee08423e7db3ff 100644
--- a/scp/css/dropdown.css
+++ b/scp/css/dropdown.css
@@ -5,7 +5,7 @@
.action-dropdown {
position: absolute;
- z-index: 9999999;
+ z-index: 9999998;
display: none;
margin-top: 8px;
}
diff --git a/scp/css/scp.css b/scp/css/scp.css
index b108e5b9ecdd03226d60e0dec8716955b3619185..05e1bdf686d71b6bac0f5655e02c7e0ba4785284 100644
--- a/scp/css/scp.css
+++ b/scp/css/scp.css
@@ -905,9 +905,8 @@ h2 .reload {
margin:0;
}
/***** top page ticket response buttons *****/
-.ticket-response {
+a.ticket-response {
color:#555;
- padding-bottom:6px;
}
.thread-entry {
diff --git a/scp/css/tooltip.css b/scp/css/tooltip.css
index ae54e90fc6b05e52e73828a6a4fa8492244023bc..daecf02bccdecc1d1477b834066b8771723610b9 100644
--- a/scp/css/tooltip.css
+++ b/scp/css/tooltip.css
@@ -1,6 +1,6 @@
.tooltip {
position: absolute;
- z-index: 1070;
+ z-index: 9999999;
display: block;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-style: normal;
diff --git a/scp/js/scp.js b/scp/js/scp.js
index 94b3b699371c1208ddb25932dbeeef6bdfb25c5e..28162de01b9a026a35a573f8089a35658c98ebda 100644
--- a/scp/js/scp.js
+++ b/scp/js/scp.js
@@ -464,6 +464,10 @@ var scp_prep = function() {
$('[data-toggle="tooltip"]').tooltip()
+ $('[data-toggle="tooltip"]').on('click', function() {
+ $(this).tooltip('hide');
+ });
+
$('.attached.input input[autofocus]').parent().addClass('focus')
$('.attached.input input')
.on('focus', function() { $(this).parent().addClass('focus'); })
diff --git a/scp/js/thread.js b/scp/js/thread.js
index 0b4ebe50213763d035bd4df033856d6c51fe2241..0a9fe075f8bb2ec5ffcca789d4e53d66c8bb9539 100644
--- a/scp/js/thread.js
+++ b/scp/js/thread.js
@@ -166,6 +166,14 @@ var thread = {
// Open first response option tab if not already active
if (!document.location.hash)
$('.actions .tabs li:visible:first:not(.active) a', $container.parent()).trigger('click');
+
+ //Reply and Internal Note buttons scroll to bottom and changes tabs.
+ $('.ticket-response').click(function () {
+ $('html, body').animate({
+ scrollTop: $(document).height()
+ }, 'slow');
+ return false;
+ });
}
};