diff --git a/css/rtl.css b/css/rtl.css index 63ec9e487c8713d618dfd5170689662483e39172..4b470981eb02edcfb73d75a21939e893037acb11 100644 --- a/css/rtl.css +++ b/css/rtl.css @@ -99,3 +99,15 @@ padding-right:190px; padding-left: 4px; } +.rtl .action-button i.icon-caret-down { + border-left: none; + border-right: 1px solid #aaa; + margin-left: 0; + margin-right: 5px; + padding-left: 0; + padding-right: 5px; +} +.rtl .action-dropdown ul { + text-align: right; +} + text-align: left; diff --git a/include/staff/templates/status-options.tmpl.php b/include/staff/templates/status-options.tmpl.php index bd6614148a0c68c05b647ec319f2ae8fafd1d361..edfdf19564e0367a1ebaa97e3adc1e08d075cf04 100644 --- a/include/staff/templates/status-options.tmpl.php +++ b/include/staff/templates/status-options.tmpl.php @@ -17,11 +17,11 @@ $actions= array( <span class="action-button pull-right" data-dropdown="#action-dropdown-statuses"> + <i class="icon-caret-down pull-right"></i> <a class="tickets-action" href="#statuses"><i class="icon-flag"></i> <?php echo __('Change Status'); ?></a> - <i class="icon-caret-down"></i> </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 ae878f5b2e918538101dc34dca0a72e12c2907d2..078af3a0a268bf45bed22653fcbecfdaef703ba2 100644 --- a/include/staff/ticket-view.inc.php +++ b/include/staff/ticket-view.inc.php @@ -63,8 +63,8 @@ if($ticket->isOverdue()) || $thisstaff->canEditTickets() || ($dept && $dept->isManager($thisstaff))) { ?> <span class="action-button pull-right" data-dropdown="#action-dropdown-more"> + <i class="icon-caret-down pull-right"></i> <span ><i class="icon-cog"></i> <?php echo __('More');?></span> - <i class="icon-caret-down"></i> </span> <?php } @@ -83,9 +83,9 @@ if($ticket->isOverdue()) <?php }?> <span class="action-button pull-right" data-dropdown="#action-dropdown-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> - <i class="icon-caret-down"></i> </span> <div id="action-dropdown-print" class="action-dropdown anchor-right"> <ul> diff --git a/scp/css/dropdown.css b/scp/css/dropdown.css index 3d259e33d047a40551efdf20ece80177c5f7623b..4fb664178aaa2ab61f663d6b9219ad00740bf64d 100644 --- a/scp/css/dropdown.css +++ b/scp/css/dropdown.css @@ -120,7 +120,6 @@ background-image: -ms-linear-gradient(top, #efefef 0%, #dddddd 100%); background-image: -o-linear-gradient(top, #efefef 0%, #dddddd 100%); background-image: linear-gradient(top, #efefef 0%, #dddddd 100%); - float: right; height: 18px; line-height: 18px; margin-right: 0; diff --git a/scp/js/jquery.dropdown.js b/scp/js/jquery.dropdown.js index c0604e75d2686c457c5ccb56c4c7be9122dbe970..b885042086efee07eeb228c60abefd86ec278c0b 100644 --- a/scp/js/jquery.dropdown.js +++ b/scp/js/jquery.dropdown.js @@ -36,7 +36,8 @@ if(jQuery) (function($) { var trigger = $(this), dropdown = $( $(this).attr('data-dropdown') ), - isOpen = trigger.hasClass('dropdown-open'); + isOpen = trigger.hasClass('dropdown-open'), + rtl = $('html').hasClass('rtl'); event.preventDefault(); event.stopPropagation(); @@ -45,6 +46,9 @@ if(jQuery) (function($) { if( isOpen || trigger.hasClass('dropdown-disabled') ) return; + if (rtl && dropdown.hasClass('anchor-right')) + dropdown.removeClass('anchor-right'); + dropdown.css({ left: dropdown.hasClass('anchor-right') ? trigger.offset().left - (dropdown.outerWidth() - trigger.outerWidth() - 4) : trigger.offset().left,