Skip to content
Snippets Groups Projects
Commit 760ab5b6 authored by Jared Hancock's avatar Jared Hancock
Browse files

i18n: rtl: Fix dropdowns on action buttons

parent 5135c388
No related branches found
No related tags found
No related merge requests found
...@@ -99,3 +99,15 @@ ...@@ -99,3 +99,15 @@
padding-right:190px; padding-right:190px;
padding-left: 4px; 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;
...@@ -17,11 +17,11 @@ $actions= array( ...@@ -17,11 +17,11 @@ $actions= array(
<span <span
class="action-button pull-right" class="action-button pull-right"
data-dropdown="#action-dropdown-statuses"> data-dropdown="#action-dropdown-statuses">
<i class="icon-caret-down pull-right"></i>
<a class="tickets-action" <a class="tickets-action"
href="#statuses"><i href="#statuses"><i
class="icon-flag"></i> <?php class="icon-flag"></i> <?php
echo __('Change Status'); ?></a> echo __('Change Status'); ?></a>
<i class="icon-caret-down"></i>
</span> </span>
<div id="action-dropdown-statuses" <div id="action-dropdown-statuses"
class="action-dropdown anchor-right"> class="action-dropdown anchor-right">
......
...@@ -63,8 +63,8 @@ if($ticket->isOverdue()) ...@@ -63,8 +63,8 @@ if($ticket->isOverdue())
|| $thisstaff->canEditTickets() || $thisstaff->canEditTickets()
|| ($dept && $dept->isManager($thisstaff))) { ?> || ($dept && $dept->isManager($thisstaff))) { ?>
<span class="action-button pull-right" data-dropdown="#action-dropdown-more"> <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> <span ><i class="icon-cog"></i> <?php echo __('More');?></span>
<i class="icon-caret-down"></i>
</span> </span>
<?php <?php
} }
...@@ -83,9 +83,9 @@ if($ticket->isOverdue()) ...@@ -83,9 +83,9 @@ if($ticket->isOverdue())
<?php <?php
}?> }?>
<span class="action-button pull-right" data-dropdown="#action-dropdown-print"> <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 <a id="ticket-print" href="tickets.php?id=<?php echo $ticket->getId(); ?>&a=print"><i class="icon-print"></i> <?php
echo __('Print'); ?></a> echo __('Print'); ?></a>
<i class="icon-caret-down"></i>
</span> </span>
<div id="action-dropdown-print" class="action-dropdown anchor-right"> <div id="action-dropdown-print" class="action-dropdown anchor-right">
<ul> <ul>
......
...@@ -120,7 +120,6 @@ ...@@ -120,7 +120,6 @@
background-image: -ms-linear-gradient(top, #efefef 0%, #dddddd 100%); background-image: -ms-linear-gradient(top, #efefef 0%, #dddddd 100%);
background-image: -o-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%); background-image: linear-gradient(top, #efefef 0%, #dddddd 100%);
float: right;
height: 18px; height: 18px;
line-height: 18px; line-height: 18px;
margin-right: 0; margin-right: 0;
......
...@@ -36,7 +36,8 @@ if(jQuery) (function($) { ...@@ -36,7 +36,8 @@ if(jQuery) (function($) {
var trigger = $(this), var trigger = $(this),
dropdown = $( $(this).attr('data-dropdown') ), dropdown = $( $(this).attr('data-dropdown') ),
isOpen = trigger.hasClass('dropdown-open'); isOpen = trigger.hasClass('dropdown-open'),
rtl = $('html').hasClass('rtl');
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
...@@ -45,6 +46,9 @@ if(jQuery) (function($) { ...@@ -45,6 +46,9 @@ if(jQuery) (function($) {
if( isOpen || trigger.hasClass('dropdown-disabled') ) return; if( isOpen || trigger.hasClass('dropdown-disabled') ) return;
if (rtl && dropdown.hasClass('anchor-right'))
dropdown.removeClass('anchor-right');
dropdown.css({ dropdown.css({
left: dropdown.hasClass('anchor-right') ? left: dropdown.hasClass('anchor-right') ?
trigger.offset().left - (dropdown.outerWidth() - trigger.outerWidth() - 4) : trigger.offset().left, trigger.offset().left - (dropdown.outerWidth() - trigger.outerWidth() - 4) : trigger.offset().left,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment