diff --git a/css/rtl.css b/css/rtl.css
index b784117a74cc7cabc839483a06b252bd0892b7a1..ed51362c5601c446daaaaad8293550e119dcb06e 100644
--- a/css/rtl.css
+++ b/css/rtl.css
@@ -49,6 +49,7 @@
}
.rtl #msg_notice,
.rtl #warning_bar,
+.rtl #msg_warning,
.rtl #msg_error,
.rtl .error-banner {
background-position: 99% 50%;
@@ -69,3 +70,23 @@
right: initial;
left: 0.5em;
}
+.rtl #sequences .manage-buttons {
+ margin-right: initial;
+ margin-left: 60px;
+}
+.rtl .row-item .button-group {
+ right: initial;
+ left: 0;
+}
+.rtl .row-item .button-group div {
+ padding-left: 9px;
+ padding-right: 12px;
+}
+.rtl .row-item .delete {
+ border-left: none;
+ border-right: 1px solid rgba(0,0,0,0.7);
+}
+.rtl [class^="icon-"].pull-left, [class*=" icon-"].pull-left {
+ margin-right: 0;
+ margin-left: 0.3em;
+}
diff --git a/include/client/faq.inc.php b/include/client/faq.inc.php
index 6d5950058945c483058605dbfdbefe630ef1e1e2..2ccc475e0349e3e83e5a80eab71a0c9eba9ab156 100644
--- a/include/client/faq.inc.php
+++ b/include/client/faq.inc.php
@@ -9,10 +9,10 @@ $category=$faq->getCategory();
<a href="index.php"><?php echo __('All Categories');?></a>
» <a href="faq.php?cid=<?php echo $category->getId(); ?>"><?php echo $category->getName(); ?></a>
</div>
-<div style="width:700px;padding-top:2px; float:left;">
+<div style="width:700px;padding-top:2px;" class="pull-left">
<strong style="font-size:16px;"><?php echo $faq->getQuestion() ?></strong>
</div>
-<div style="float:right;text-align:right;padding-top:5px;padding-right:5px;"></div>
+<div class="pull-right flush-right" style="padding-top:5px;padding-right:5px;"></div>
<div class="clear"></div>
<p>
<?php echo Format::safe_html($faq->getAnswerWithImages()); ?>
diff --git a/include/client/view.inc.php b/include/client/view.inc.php
index 1867ac467ab9b3ac50496c6f00c63c0abad3d150..dc3a0419f97a353471b6a87f7dc4ad1453b5b881 100644
--- a/include/client/view.inc.php
+++ b/include/client/view.inc.php
@@ -36,7 +36,7 @@ if ($thisclient && $thisclient->isGuest()
<?php if ($cfg->allowClientUpdates()
// Only ticket owners can edit the ticket details (and other forms)
&& $thisclient->getId() == $ticket->getUserId()) { ?>
- <a class="action-button" href="tickets.php?a=edit&id=<?php
+ <a class="action-button pull-right" href="tickets.php?a=edit&id=<?php
echo $ticket->getId(); ?>"><i class="icon-edit"></i> Edit</a>
<?php } ?>
</h1>
diff --git a/include/staff/dynamic-form.inc.php b/include/staff/dynamic-form.inc.php
index db879cc5f4690b226bc99370382be28b11fd62ec..4b1b852a09eedad808c779ba32e58c6d6b4c4bec 100644
--- a/include/staff/dynamic-form.inc.php
+++ b/include/staff/dynamic-form.inc.php
@@ -148,7 +148,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<?php } ?>
</select>
<?php if ($f->isConfigurable()) { ?>
- <a class="action-button field-config" style="float:none;overflow:inherit"
+ <a class="action-button field-config" style="overflow:inherit"
href="#ajax.php/form/field-config/<?php
echo $f->get('id'); ?>"
onclick="javascript:
diff --git a/include/staff/dynamic-list.inc.php b/include/staff/dynamic-list.inc.php
index f25f671135d4302bcbbda52a389e3fa904199d5b..f42abef7c27a9b035c5d4927147219bed01a5ad4 100644
--- a/include/staff/dynamic-list.inc.php
+++ b/include/staff/dynamic-list.inc.php
@@ -151,7 +151,7 @@ $info=Format::htmlchars(($errors && $_POST) ? array_merge($info,$_POST) : $info)
</select>
<?php if ($f->isConfigurable()) { ?>
<a class="action-button field-config"
- style="float:none;overflow:inherit"
+ style="overflow:inherit"
href="#form/field-config/<?php
echo $f->get('id'); ?>"><i
class="icon-cog"></i> <?php echo __('Config'); ?></a> <?php } ?></td>
@@ -254,7 +254,7 @@ $info=Format::htmlchars(($errors && $_POST) ? array_merge($info,$_POST) : $info)
value="<?php echo $i->getValue(); ?>"/>
<?php if ($list->hasProperties()) { ?>
<a class="action-button field-config"
- style="float:none;overflow:inherit"
+ style="overflow:inherit"
href="#list/<?php
echo $list->getId(); ?>/item/<?php
echo $id ?>/properties"
diff --git a/include/staff/helptopic.inc.php b/include/staff/helptopic.inc.php
index 3674b6a10f2c4a063cfb050a501daeb91c269836..bd254cd2db7e1b7a1bc5d06ac42706cb5b6b3375 100644
--- a/include/staff/helptopic.inc.php
+++ b/include/staff/helptopic.inc.php
@@ -320,7 +320,7 @@ if ($info['form_id'] == Topic::FORM_USE_PARENT) echo 'selected="selected"';
?>><?php echo $s->name; ?></option>
<?php } ?>
</select>
- <button class="action-button" onclick="javascript:
+ <button class="action-button pull-right" onclick="javascript:
$.dialog('ajax.php/sequence/manage', 205);
return false;
"><i class="icon-gear"></i> <?php echo __('Manage'); ?></button>
diff --git a/include/staff/org-view.inc.php b/include/staff/org-view.inc.php
index 304642b642d6fa0555d412b039181caf8941110d..b973f7fdd52f03c629e05ad78f03ad849e859d14 100644
--- a/include/staff/org-view.inc.php
+++ b/include/staff/org-view.inc.php
@@ -9,11 +9,11 @@ if(!defined('OSTSCPINC') || !$thisstaff || !is_object($org)) die('Invalid path')
title="Reload"><i class="icon-refresh"></i> <?php echo $org->getName(); ?></a></h2>
</td>
<td width="50%" class="right_align has_bottom_border">
- <span class="action-button" data-dropdown="#action-dropdown-more">
+ <span class="action-button pull-right" data-dropdown="#action-dropdown-more">
<span ><i class="icon-cog"></i> <?php echo __('More'); ?></span>
<i class="icon-caret-down"></i>
</span>
- <a id="org-delete" class="action-button org-action"
+ <a id="org-delete" class="action-button pull-right org-action"
href="#orgs/<?php echo $org->getId(); ?>/delete"><i class="icon-trash"></i>
<?php echo __('Delete Organization'); ?></a>
<div id="action-dropdown-more" class="action-dropdown anchor-right">
diff --git a/include/staff/settings-tickets.inc.php b/include/staff/settings-tickets.inc.php
index eea65c8bb7186430cb3a17d0e4628240d0b8c9e2..2e23da95068b404e91ace8b02749690fb2b9a802 100644
--- a/include/staff/settings-tickets.inc.php
+++ b/include/staff/settings-tickets.inc.php
@@ -46,7 +46,7 @@ if(!($maxfileuploads=ini_get('max_file_uploads')))
?>><?php echo $s->name; ?></option>
<?php } ?>
</select>
- <button class="action-button" onclick="javascript:
+ <button class="action-button pull-right" onclick="javascript:
$.dialog('ajax.php/sequence/manage', 205);
return false;
"><i class="icon-gear"></i> <?php echo __('Manage'); ?></button>
@@ -220,7 +220,7 @@ if(!($maxfileuploads=ini_get('max_file_uploads')))
$tform = TicketForm::objects()->one()->getForm();
$f = $tform->getField('message');
?>
- <a class="action-button field-config" style="float:none;overflow:inherit"
+ <a class="action-button field-config" style="overflow:inherit"
href="#ajax.php/form/field-config/<?php
echo $f->get('id'); ?>"
onclick="javascript:
diff --git a/include/staff/team.inc.php b/include/staff/team.inc.php
index 9923350b1429b15d11c1094c57099a045b489529..4b2feacbfd06c1898990ce90cfc9ce13f5b05321 100644
--- a/include/staff/team.inc.php
+++ b/include/staff/team.inc.php
@@ -105,7 +105,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</tr>
<?php
foreach($members as $k=>$staff){
- echo sprintf('<tr><td colspan=2><span style="width:350px;padding-left:5px; display:block; float:left;">
+ echo sprintf('<tr><td colspan=2><span style="width:350px;padding-left:5px; display:block;" class="pull-left">
<b><a href="staff.php?id=%d">%s</a></span></b>
<input type="checkbox" name="remove[]" value="%d"><i>'.__('Remove').'</i></td></tr>',
$staff->getId(),$staff->getName(),$staff->getId());
diff --git a/include/staff/templates/content-manage.tmpl.php b/include/staff/templates/content-manage.tmpl.php
index a570d19e47d3a28d88198606ad36c382b0cc327c..ddf9892ad4a5eef850ac4927571538f7580ec9c0 100644
--- a/include/staff/templates/content-manage.tmpl.php
+++ b/include/staff/templates/content-manage.tmpl.php
@@ -13,12 +13,12 @@
echo $content->getNotes(); ?></div>
<hr/>
<p class="full-width">
- <span class="buttons" style="float:left">
+ <span class="buttons pull-left">
<input type="reset" value="<?php echo __('Reset'); ?>">
<input type="button" name="cancel" class="<?php
echo $user ? 'cancel' : 'close'; ?>" value="<?php echo __('Cancel'); ?>">
</span>
- <span class="buttons" style="float:right">
+ <span class="buttons pull-right">
<input type="submit" value="<?php echo __('Save Changes'); ?>">
</span>
</p>
diff --git a/include/staff/templates/dynamic-field-config.tmpl.php b/include/staff/templates/dynamic-field-config.tmpl.php
index 5b2716e4e1e53d09034af80cdcfd7663b2668e21..51701b6ee1f66ce93c66fba5845a14abfd65d78b 100644
--- a/include/staff/templates/dynamic-field-config.tmpl.php
+++ b/include/staff/templates/dynamic-field-config.tmpl.php
@@ -51,11 +51,11 @@
</div>
<hr>
<p class="full-width">
- <span class="buttons" style="float:left">
+ <span class="buttons pull-left">
<input type="reset" value="<?php echo __('Reset'); ?>">
<input type="button" value="<?php echo __('Cancel'); ?>" class="close">
</span>
- <span class="buttons" style="float:right">
+ <span class="buttons pull-right">
<input type="submit" value="<?php echo __('Save'); ?>">
</span>
</p>
diff --git a/include/staff/templates/dynamic-form.tmpl.php b/include/staff/templates/dynamic-form.tmpl.php
index 611306d1ba831a32f54a1cca0a1d2bfe7b44b7dd..8ed99010089804b4a63f513b238c1ef50a56719c 100644
--- a/include/staff/templates/dynamic-form.tmpl.php
+++ b/include/staff/templates/dynamic-form.tmpl.php
@@ -64,7 +64,7 @@ if (isset($options['entry']) && $options['mode'] == 'edit') { ?>
<?php
}
if (($a = $field->getAnswer()) && $a->isDeleted()) {
- ?><a class="action-button danger overlay" title="Delete this data"
+ ?><a class="action-button float-right danger overlay" title="Delete this data"
href="#delete-answer"
onclick="javascript:if (confirm('<?php echo __('You sure?'); ?>'))
$.ajax({
diff --git a/include/staff/templates/form-manage.tmpl.php b/include/staff/templates/form-manage.tmpl.php
index abb649e78e6b7047f3575092500b1cac15d98d87..378fad751e0b7d52b019b17c7ffd9b2bd5030a4f 100644
--- a/include/staff/templates/form-manage.tmpl.php
+++ b/include/staff/templates/form-manage.tmpl.php
@@ -57,12 +57,12 @@ foreach ($forms as $e) { ?>
</div>
<hr>
<p class="full-width">
- <span class="buttons" style="float:left">
+ <span class="buttons pull-left">
<input type="reset" value="<?php echo __('Reset'); ?>">
<input type="button" name="cancel" class="<?php
echo $user ? 'cancel' : 'close' ?>" value="<?php echo __('Cancel'); ?>">
</span>
- <span class="buttons" style="float:right">
+ <span class="buttons pull-right">
<input type="submit" value="<?php echo __('Save Changes'); ?>">
</span>
</p>
diff --git a/include/staff/templates/list-item-properties.tmpl.php b/include/staff/templates/list-item-properties.tmpl.php
index a8d158f98e5641ade0376c8090fec148fe8ff62f..dcfc34b92d5bb7f51497cd227a13a2f609a79bc6 100644
--- a/include/staff/templates/list-item-properties.tmpl.php
+++ b/include/staff/templates/list-item-properties.tmpl.php
@@ -50,11 +50,11 @@
</table>
<hr>
<p class="full-width">
- <span class="buttons" style="float:left">
+ <span class="buttons pull-left">
<input type="reset" value="<?php echo __('Reset'); ?>">
<input type="button" value="<?php echo __('Cancel'); ?>" class="close">
</span>
- <span class="buttons" style="float:right">
+ <span class="buttons pull-right">
<input type="submit" value="<?php echo __('Save'); ?>">
</span>
</p>
diff --git a/include/staff/templates/org-delete.tmpl.php b/include/staff/templates/org-delete.tmpl.php
index 76222df053c66bf666e3d5cf1758deb60218b3f2..16e06c83b556e6bb2a034ba46d38c5c4834e3ec7 100644
--- a/include/staff/templates/org-delete.tmpl.php
+++ b/include/staff/templates/org-delete.tmpl.php
@@ -50,12 +50,12 @@ if ($info['error']) {
action="#orgs/<?php echo $org->getId(); ?>/delete">
<input type="hidden" name="id" value="<?php echo $org->getId(); ?>" />
<p class="full-width">
- <span class="buttons" style="float:left">
+ <span class="buttons pull-left">
<input type="reset" value="<?php echo __('Reset'); ?>">
<input type="button" name="cancel" class="close"
value="<?php echo __('No, Cancel'); ?>">
</span>
- <span class="buttons" style="float:right">
+ <span class="buttons pull-right">
<input type="submit" value="<?php echo __('Yes, Delete'); ?>">
</span>
</p>
diff --git a/include/staff/templates/org-lookup.tmpl.php b/include/staff/templates/org-lookup.tmpl.php
index 849eb126ba3684f05f906d0d8d8a884c901963a5..10a4ce28fbf75916ba718e52e45bd0c9f38ae25a 100644
--- a/include/staff/templates/org-lookup.tmpl.php
+++ b/include/staff/templates/org-lookup.tmpl.php
@@ -55,10 +55,10 @@ if ($info['error']) {
<div class="clear"></div>
<hr>
<p class="full-width">
- <span class="buttons" style="float:left">
+ <span class="buttons pull-left">
<input type="button" name="cancel" class="close" value="<?php echo __('Cancel'); ?>">
</span>
- <span class="buttons" style="float:right">
+ <span class="buttons pull-right">
<input type="submit" value="<?php echo __('Continue'); ?>">
</span>
</p>
@@ -73,12 +73,12 @@ if ($info['error']) {
</table>
<hr>
<p class="full-width">
- <span class="buttons" style="float:left">
+ <span class="buttons pull-left">
<input type="reset" value="<?php echo __('Reset'); ?>">
- <input type="button" name="cancel" class="<?php echo $org ? 'cancel' : 'close' ?>"
+ <input type="button" name="cancel" class="<?php echo $org ? 'cancel' : 'close' ?>"
value="<?php echo __('Cancel'); ?>">
</span>
- <span class="buttons" style="float:right">
+ <span class="buttons pull-right">
<input type="submit" value="<?php echo __('Add Organization'); ?>">
</span>
</p>
diff --git a/include/staff/templates/org-profile.tmpl.php b/include/staff/templates/org-profile.tmpl.php
index 800a0aad26ceb550e2f06276652a5b27c517e914..2b83f76b602a1fdbf32149957eb6118ed865efa1 100644
--- a/include/staff/templates/org-profile.tmpl.php
+++ b/include/staff/templates/org-profile.tmpl.php
@@ -144,12 +144,12 @@ if ($ticket && $ticket->getOwnerId() == $user->getId())
<hr>
<p class="full-width">
- <span class="buttons" style="float:left">
+ <span class="buttons pull-left">
<input type="reset" value="<?php echo __('Reset'); ?>">
<input type="button" name="cancel" class="<?php
echo $account ? 'cancel' : 'close'; ?>" value="<?php echo __('Cancel'); ?>">
</span>
- <span class="buttons" style="float:right">
+ <span class="buttons pull-right">
<input type="submit" value="<?php echo __('Update Organization'); ?>">
</span>
</p>
diff --git a/include/staff/templates/org.tmpl.php b/include/staff/templates/org.tmpl.php
index 222db9837f6a68ec786ba90d9985f7ca42443b94..06f82255c7736dc9db02d58f65ed5e51073f2b18 100644
--- a/include/staff/templates/org.tmpl.php
+++ b/include/staff/templates/org.tmpl.php
@@ -61,12 +61,12 @@ if ($ticket && $ticket->getOwnerId() == $user->getId())
</table>
<hr>
<p class="full-width">
- <span class="buttons" style="float:left">
+ <span class="buttons pull-left">
<input type="reset" value="<?php echo __('Reset'); ?>">
<input type="button" name="cancel" class="<?php
echo $account ? 'cancel' : 'close'; ?>" value="<?php echo __('Cancel'); ?>">
</span>
- <span class="buttons" style="float:right">
+ <span class="buttons pull-right">
<input type="submit" value="<?php echo __('Update Organization'); ?>">
</span>
</p>
diff --git a/include/staff/templates/sequence-manage.tmpl.php b/include/staff/templates/sequence-manage.tmpl.php
index 6f242eac61ab5e01d4bb449745eeca42c30a08b4..6827cd6267d5d5f0c8cbae54a0af44cf162c91be 100644
--- a/include/staff/templates/sequence-manage.tmpl.php
+++ b/include/staff/templates/sequence-manage.tmpl.php
@@ -19,7 +19,7 @@ foreach ($sequences as $e) {
<input type="hidden" class="fdeleted" name="seq[<?php echo $e->get('id'); ?>][deleted]" value="0"/>
<i class="icon-sort-by-order"></i>
<div style="display:inline-block" class="name"> <?php echo $e->getName(); ?> </div>
- <div style="display:inline-block;margin-right:60px" class="pull-right">
+ <div class="manage-buttons pull-right">
<span class="faded">next</span>
<span class="current"><?php echo $e->current(); ?></span>
</div>
@@ -45,7 +45,7 @@ foreach ($sequences as $e) {
<div class="row-item hidden" id="template">
<i class="icon-sort-by-order"></i>
<div style="display:inline-block" class="name"> <?php echo __('New Sequence'); ?> </div>
- <div style="display:inline-block;margin-right:60px" class="pull-right">
+ <div class="manage-buttons pull-right">
<span class="faded">next</span>
<span class="next">1</span>
</div>
diff --git a/include/staff/templates/status-options.tmpl.php b/include/staff/templates/status-options.tmpl.php
index 78372ed09195a50376f55cd34696db6c43af91a6..bd6614148a0c68c05b647ec319f2ae8fafd1d361 100644
--- a/include/staff/templates/status-options.tmpl.php
+++ b/include/staff/templates/status-options.tmpl.php
@@ -15,7 +15,7 @@ $actions= array(
?>
<span
- class="action-button"
+ class="action-button pull-right"
data-dropdown="#action-dropdown-statuses">
<a class="tickets-action"
href="#statuses"><i
diff --git a/include/staff/templates/ticket-status.tmpl.php b/include/staff/templates/ticket-status.tmpl.php
index 23d54255b00ac9c2d5ecdba8ea530596c58eb7ca..c033e0caa8d541b2a9bbed596fb3e8ba2d8c7c80 100644
--- a/include/staff/templates/ticket-status.tmpl.php
+++ b/include/staff/templates/ticket-status.tmpl.php
@@ -93,12 +93,12 @@ $action = $info['action'] ?: ('#tickets/status/'. $state);
</table>
<hr>
<p class="full-width">
- <span class="buttons" style="float:left">
+ <span class="buttons pull-left">
<input type="reset" value="<?php echo __('Reset'); ?>">
<input type="button" name="cancel" class="close"
value="<?php echo __('Cancel'); ?>">
</span>
- <span class="buttons" style="float:right">
+ <span class="buttons pull-right">
<input type="submit" value="<?php
echo $verb ?: __('Submit'); ?>">
</span>
diff --git a/include/staff/templates/tickets.tmpl.php b/include/staff/templates/tickets.tmpl.php
index 64f1aa91c6c0cbbfa4da5379ec870256e9e85184..ea0aae0b7e3b28be02252f2d245100b4b73cbddc 100644
--- a/include/staff/templates/tickets.tmpl.php
+++ b/include/staff/templates/tickets.tmpl.php
@@ -56,7 +56,7 @@ if ($results) {
}
}
?>
-<div style="width:700px; float:left;">
+<div style="width:700px;" class="pull-left">
<?php
if ($results) {
echo '<strong>'.sprintf(_N('Showing %d ticket', 'Showing %d tickets',
@@ -66,7 +66,7 @@ if ($results) {
}
?>
</div>
-<div style="float:right;text-align:right;padding-right:5px;">
+<div class="pull-right flush-right" style="padding-right:5px;">
<?php
if ($user) { ?>
<b><a class="Icon newTicket" href="tickets.php?a=open&uid=<?php echo $user->getId(); ?>">
diff --git a/include/staff/templates/user-account.tmpl.php b/include/staff/templates/user-account.tmpl.php
index 95509afc6cc5317af65af3575f168cc2f5b86a3f..c56e44bda86865f6220c17311d7404fecac85512 100644
--- a/include/staff/templates/user-account.tmpl.php
+++ b/include/staff/templates/user-account.tmpl.php
@@ -154,11 +154,11 @@ if ($info['error']) {
</div>
<hr>
<p class="full-width">
- <span class="buttons" style="float:left">
+ <span class="buttons pull-left">
<input type="reset" value="<?php echo __('Reset'); ?>">
<input type="button" name="cancel" class="close" value="<?php echo __('Cancel'); ?>">
</span>
- <span class="buttons" style="float:right">
+ <span class="buttons pull-right">
<input type="submit"
value="<?php echo __('Save Changes'); ?>">
</span>
diff --git a/include/staff/templates/user-delete.tmpl.php b/include/staff/templates/user-delete.tmpl.php
index 876b5d14ee278b3505b7291ca2fa53710246c15d..b563643d284146896f33ce2df58532d6da5d4554 100644
--- a/include/staff/templates/user-delete.tmpl.php
+++ b/include/staff/templates/user-delete.tmpl.php
@@ -64,12 +64,12 @@ if ($info['error']) {
}
?>
<p class="full-width">
- <span class="buttons" style="float:left">
+ <span class="buttons pull-left">
<input type="reset" value="<?php echo __('Reset'); ?>">
<input type="button" name="cancel" class="close"
value="<?php echo __('No, Cancel'); ?>">
</span>
- <span class="buttons" style="float:right">
+ <span class="buttons pull-right">
<input type="submit" value="<?php echo __('Yes, Delete User'); ?>">
</span>
</p>
diff --git a/include/staff/templates/user-import.tmpl.php b/include/staff/templates/user-import.tmpl.php
index 25a261e39c1bf03dcd39dbdca6720a67442a6805..447f83ee2441b3764853e2f5e7098b800c6bc9db 100644
--- a/include/staff/templates/user-import.tmpl.php
+++ b/include/staff/templates/user-import.tmpl.php
@@ -74,12 +74,12 @@ if ($org_id) { ?>
</div>
<hr>
<p class="full-width">
- <span class="buttons" style="float:left">
+ <span class="buttons pull-left">
<input type="reset" value="<?php echo __('Reset'); ?>">
<input type="button" name="cancel" class="close" value="<?php
echo __('Cancel'); ?>">
</span>
- <span class="buttons" style="float:right">
+ <span class="buttons pull-right">
<input type="submit" value="<?php echo __('Import Users'); ?>">
</span>
</p>
diff --git a/include/staff/templates/user-lookup.tmpl.php b/include/staff/templates/user-lookup.tmpl.php
index 980a032fc4050edd86e7d24e98d8448dfb1edcc7..fa18f885888041d997c5e75e192d5644e7fd35b2 100644
--- a/include/staff/templates/user-lookup.tmpl.php
+++ b/include/staff/templates/user-lookup.tmpl.php
@@ -54,11 +54,11 @@ if ($info['error']) {
<div class="clear"></div>
<hr>
<p class="full-width">
- <span class="buttons" style="float:left">
+ <span class="buttons pull-left">
<input type="button" name="cancel" class="close" value="<?php
echo __('Cancel'); ?>">
</span>
- <span class="buttons" style="float:right">
+ <span class="buttons pull-right">
<input type="submit" value="<?php echo __('Continue'); ?>">
</span>
</p>
@@ -73,11 +73,11 @@ if ($info['error']) {
</table>
<hr>
<p class="full-width">
- <span class="buttons" style="float:left">
+ <span class="buttons pull-left">
<input type="reset" value="<?php echo __('Reset'); ?>">
<input type="button" name="cancel" class="<?php echo $user ? 'cancel' : 'close' ?>" value="<?php echo __('Cancel'); ?>">
</span>
- <span class="buttons" style="float:right">
+ <span class="buttons pull-right">
<input type="submit" value="<?php echo __('Add User'); ?>">
</span>
</p>
diff --git a/include/staff/templates/user-register.tmpl.php b/include/staff/templates/user-register.tmpl.php
index 6f5662ca213361fd8e163b3e3be43134a46bb3d2..015f82edf9fa5a66fe9d0c744deeb8a8eb665896 100644
--- a/include/staff/templates/user-register.tmpl.php
+++ b/include/staff/templates/user-register.tmpl.php
@@ -165,11 +165,11 @@ echo sprintf(__(
</table>
<hr>
<p class="full-width">
- <span class="buttons" style="float:left">
+ <span class="buttons pull-left">
<input type="reset" value="<?php echo __('Reset'); ?>">
<input type="button" name="cancel" class="close" value="<?php echo __('Cancel'); ?>">
</span>
- <span class="buttons" style="float:right">
+ <span class="buttons pull-right">
<input type="submit" value="<?php echo __('Create Account'); ?>">
</span>
</p>
diff --git a/include/staff/templates/user.tmpl.php b/include/staff/templates/user.tmpl.php
index 655e92ecfeba38232b3d6ac4e8c5a90f37d435b3..af21b01286708196a9d3ebfce6b4b08849f9954f 100644
--- a/include/staff/templates/user.tmpl.php
+++ b/include/staff/templates/user.tmpl.php
@@ -129,12 +129,12 @@ if ($ticket && $ticket->getOwnerId() == $user->getId())
</table>
<hr>
<p class="full-width">
- <span class="buttons" style="float:left">
+ <span class="buttons pull-left">
<input type="reset" value="<?php echo __('Reset'); ?>">
<input type="button" name="cancel" class="<?php
echo ($ticket && $user) ? 'cancel' : 'close' ?>" value="<?php echo __('Cancel'); ?>">
</span>
- <span class="buttons" style="float:right">
+ <span class="buttons pull-right">
<input type="submit" value="<?php echo __('Update User'); ?>">
</span>
</p>
diff --git a/include/staff/templates/users.tmpl.php b/include/staff/templates/users.tmpl.php
index 11eb0952a47eaa4561fefb40e2aef178e9920347..40a2d4952e1c2043917b961b9601cf3a0f0d6c81 100644
--- a/include/staff/templates/users.tmpl.php
+++ b/include/staff/templates/users.tmpl.php
@@ -53,8 +53,8 @@ else
$showing .= __("This organization doesn't have any users yet");
?>
-<div style="width:700px; float:left;"><b><?php echo $showing; ?></b></div>
-<div style="float:right;text-align:right;padding-right:5px;">
+<div style="width:700px;" class="pull-left"><b><?php echo $showing; ?></b></div>
+<div class="pull-right flush-right" style="padding-right:5px;">
<b><a href="#orgs/<?php echo $org->getId(); ?>/add-user" class="Icon newstaff add-user"
><?php echo __('Add User'); ?></a></b>
|
@@ -164,10 +164,10 @@ if ($res && $num) { //Show options..
<div><?php echo __('Please confirm to continue.'); ?></div>
<hr style="margin-top:1em"/>
<p class="full-width">
- <span class="buttons" style="float:left">
+ <span class="buttons pull-left">
<input type="button" value="<?php echo __('No, Cancel'); ?>" class="close">
</span>
- <span class="buttons" style="float:right">
+ <span class="buttons pull-right">
<input type="button" value="<?php echo __('Yes, Do it!'); ?>" class="confirm">
</span>
</p>
diff --git a/include/staff/ticket-edit.inc.php b/include/staff/ticket-edit.inc.php
index 406d6967196bc9d8fe2d72e4ff2e8528719ffb65..96d1abe6fc943457bf67cbfd3459582dd5b0da2c 100644
--- a/include/staff/ticket-edit.inc.php
+++ b/include/staff/ticket-edit.inc.php
@@ -36,7 +36,7 @@ if ($_POST)
<span id="client-name"><?php echo Format::htmlchars($user->getName()); ?></span>
<<span id="client-email"><?php echo $user->getEmail(); ?></span>>
</a>
- <a class="action-button" style="float:none;overflow:inherit" href="#"
+ <a class="action-button" style="overflow:inherit" href="#"
onclick="javascript:
$.userLookup('ajax.php/tickets/<?php echo $ticket->getId(); ?>/change-user',
function(user) {
diff --git a/include/staff/ticket-open.inc.php b/include/staff/ticket-open.inc.php
index 5ca5cb5436b480e319d5c2b93a522ad036735249..3c8b8f2421ee1840c2ddae3e2574abb4d387c1b0 100644
--- a/include/staff/ticket-open.inc.php
+++ b/include/staff/ticket-open.inc.php
@@ -59,7 +59,7 @@ if ($_POST)
<span id="user-name"><?php echo Format::htmlchars($user->getName()); ?></span>
<<span id="user-email"><?php echo $user->getEmail(); ?></span>>
</a>
- <a class="action-button" style="float:none;overflow:inherit" href="#"
+ <a class="action-button" style="overflow:inherit" href="#"
onclick="javascript:
$.userLookup('ajax.php/users/select/'+$('input#uid').val(),
function(user) {
diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php
index 5a0100bbcaf2f16ce5c9513d19905845f5c7c013..27347d5a2b0668ea76dfc23d7fa06bd216730789 100644
--- a/include/staff/ticket-view.inc.php
+++ b/include/staff/ticket-view.inc.php
@@ -57,12 +57,12 @@ if($ticket->isOverdue())
title="<?php echo __('Reload'); ?>"><i class="icon-refresh"></i>
<?php echo sprintf(__('Ticket #%s'), $ticket->getNumber()); ?></a></h2>
</td>
- <td width="auto" class="right_align has_bottom_border">
+ <td width="auto" class="flush-right has_bottom_border">
<?php
if ($thisstaff->canBanEmails()
|| $thisstaff->canEditTickets()
|| ($dept && $dept->isManager($thisstaff))) { ?>
- <span class="action-button" data-dropdown="#action-dropdown-more">
+ <span class="action-button pull-right" data-dropdown="#action-dropdown-more">
<span ><i class="icon-cog"></i> <?php echo __('More');?></span>
<i class="icon-caret-down"></i>
</span>
@@ -72,17 +72,17 @@ if($ticket->isOverdue())
echo TicketStatus::status_options();
if ($thisstaff->canEditTickets()) { ?>
- <a class="action-button" href="tickets.php?id=<?php echo $ticket->getId(); ?>&a=edit"><i class="icon-edit"></i> <?php
+ <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>
<?php
}
if ($ticket->isOpen() && !$ticket->isAssigned() && $thisstaff->canAssignTickets()) {?>
- <a id="ticket-claim" class="action-button confirm-action" href="#claim"><i class="icon-user"></i> <?php
+ <a id="ticket-claim" class="action-button pull-right confirm-action" href="#claim"><i class="icon-user"></i> <?php
echo __('Claim'); ?></a>
<?php
}?>
- <span class="action-button" data-dropdown="#action-dropdown-print">
+ <span class="action-button pull-right" data-dropdown="#action-dropdown-print">
<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>
diff --git a/include/staff/tickets.inc.php b/include/staff/tickets.inc.php
index 3b716905e3a12150365c39da98d19458daa2e23c..bedb40e2fffd47676dc5669a8a7b9eb6b8ca5b00 100644
--- a/include/staff/tickets.inc.php
+++ b/include/staff/tickets.inc.php
@@ -334,7 +334,7 @@ if ($results) {
<?php
if ($thisstaff->canDeleteTickets()) { ?>
- <a id="tickets-delete" class="action-button tickets-action"
+ <a id="tickets-delete" class="action-button pull-right tickets-action"
href="#tickets/status/delete"><i
class="icon-trash"></i> <?php echo __('Delete'); ?></a>
<?php
diff --git a/include/staff/user-view.inc.php b/include/staff/user-view.inc.php
index 7a5bd384bf413ce7e8507a5ef04c8248c847fcfe..91f2ee98dde7f14e521ef193ef069d29eedd24a3 100644
--- a/include/staff/user-view.inc.php
+++ b/include/staff/user-view.inc.php
@@ -13,21 +13,21 @@ $org = $user->getOrganization();
title="Reload"><i class="icon-refresh"></i> <?php echo Format::htmlchars($user->getName()); ?></a></h2>
</td>
<td width="50%" class="right_align has_bottom_border">
- <span class="action-button" data-dropdown="#action-dropdown-more">
+ <span class="action-button pull-right" data-dropdown="#action-dropdown-more">
<span ><i class="icon-cog"></i> <?php echo __('More'); ?></span>
<i class="icon-caret-down"></i>
</span>
- <a id="user-delete" class="action-button user-action"
+ <a id="user-delete" class="action-button pull-right user-action"
href="#users/<?php echo $user->getId(); ?>/delete"><i class="icon-trash"></i>
<?php echo __('Delete User'); ?></a>
<?php
if ($account) { ?>
- <a id="user-manage" class="action-button user-action"
+ <a id="user-manage" class="action-button pull-right user-action"
href="#users/<?php echo $user->getId(); ?>/manage"><i class="icon-edit"></i>
<?php echo __('Manage Account'); ?></a>
<?php
} else { ?>
- <a id="user-register" class="action-button user-action"
+ <a id="user-register" class="action-button pull-right user-action"
href="#users/<?php echo $user->getId(); ?>/register"><i class="icon-edit"></i>
<?php echo __('Register'); ?></a>
<?php
diff --git a/scp/css/dropdown.css b/scp/css/dropdown.css
index 961abd6fa0fb3b7945ef6bcd56594c1c947ddb8d..3d259e33d047a40551efdf20ece80177c5f7623b 100644
--- a/scp/css/dropdown.css
+++ b/scp/css/dropdown.css
@@ -104,7 +104,6 @@
padding: 0 5px;
text-decoration: none !important;
line-height:18px;
- float:right;
margin-left:5px;
}
.action-button span,
diff --git a/scp/css/scp.css b/scp/css/scp.css
index bac13a5dfa36680590434cfeb9e4400dd270d94a..b9ca8df1b4bd6311593c551317afefbc4d05632f 100644
--- a/scp/css/scp.css
+++ b/scp/css/scp.css
@@ -1761,6 +1761,10 @@ div.selected-signature .inner {
background: #fc9f41; /* Old browsers */
color: rgba(255,255,255,0.8) !important;
}
+#sequences .manage-buttons {
+ display: inline-block;
+ margin-right: 60px;
+}
tr.disabled td,
tr.disabled th {