From 749d46fb08cc17ec41499ede26165c434d1e5fb3 Mon Sep 17 00:00:00 2001
From: Nathan Febuary <nathan@enhancesoft.com>
Date: Tue, 7 Jul 2015 16:37:35 -0500
Subject: [PATCH] Change admin panel to use sticky bars and new buttons
Fixup IE and firefox rendering issues
---
include/staff/apikeys.inc.php | 30 ++++--
include/staff/banlist.inc.php | 34 +++++--
include/staff/departments.inc.php | 37 ++++---
include/staff/dynamic-forms.inc.php | 27 +++--
include/staff/dynamic-lists.inc.php | 25 +++--
include/staff/emails.inc.php | 23 +++--
include/staff/filters.inc.php | 33 ++++--
include/staff/helptopics.inc.php | 41 ++++++--
include/staff/pages.inc.php | 37 +++++--
include/staff/plugins.inc.php | 35 +++++--
include/staff/roles.inc.php | 51 ++++++----
include/staff/settings-emails.inc.php | 2 +-
include/staff/settings-kb.inc.php | 2 +-
include/staff/settings-pages.inc.php | 2 +-
include/staff/settings-system.inc.php | 2 +-
include/staff/settings-tasks.inc.php | 2 +-
include/staff/settings-tickets.inc.php | 2 +-
include/staff/slaplans.inc.php | 32 ++++--
include/staff/staffmembers.inc.php | 133 +++++++++++++------------
include/staff/teams.inc.php | 44 +++++---
include/staff/templates.inc.php | 32 ++++--
include/staff/tickets.inc.php | 8 +-
scp/css/scp.css | 29 +++++-
scp/emailtest.php | 2 +-
24 files changed, 444 insertions(+), 221 deletions(-)
diff --git a/include/staff/apikeys.inc.php b/include/staff/apikeys.inc.php
index d244ea256..749db038e 100644
--- a/include/staff/apikeys.inc.php
+++ b/include/staff/apikeys.inc.php
@@ -40,14 +40,32 @@ else
$showing=__('No API keys found!');
?>
+<form action="apikeys.php" method="POST" name="keys">
-<div class="pull-left" style="width:700px;padding-top:5px;">
+<div class="pull-left" style="padding-top:5px;">
<h2><?php echo __('API Keys');?></h2>
</div>
<div class="pull-right flush-right" style="padding-top:5px;padding-right:5px;">
- <b><a href="apikeys.php?a=add" class="Icon newapi"><?php echo __('Add New API Key');?></a></b></div>
+ <a href="apikeys.php?a=add" class="green button action-button"><i class="icon-plus-sign"></i> <?php echo __('Add New API Key');?></a>
+ <span class="action-button" data-dropdown="#action-dropdown-more">
+ <i class="icon-caret-down pull-right"></i>
+ <span ><i class="icon-cog"></i> <?php echo __('More');?></span>
+ </span>
+ <div id="action-dropdown-more" class="action-dropdown anchor-right">
+ <ul id="actions">
+ <li><a class="confirm" data-name="enable" href="apikeys.php?a=enable">
+ <i class="icon-ok-sign icon-fixed-width"></i>
+ <?php echo __('Enable'); ?></a></li>
+ <li><a class="confirm" data-name="disable" href="apikeys.php?a=disable">
+ <i class="icon-ban-circle icon-fixed-width"></i>
+ <?php echo __('Disable'); ?></a></li>
+ <li class="danger"><a class="confirm" data-name="delete" href="apikeys.php?a=delete">
+ <i class="icon-trash icon-fixed-width"></i>
+ <?php echo __('Delete'); ?></a></li>
+ </ul>
+ </div>
+</div>
<div class="clear"></div>
-<form action="apikeys.php" method="POST" name="keys">
<?php csrf_token(); ?>
<input type="hidden" name="do" value="mass_process" >
<input type="hidden" id="action" name="a" value="" >
@@ -105,11 +123,7 @@ else
if($res && $num): //Show options..
echo '<div> '.__('Page').':'.$pageNav->getPageLinks().' </div>';
?>
-<p class="centered" id="actions">
- <input class="button" type="submit" name="enable" value="<?php echo __('Enable');?>" >
- <input class="button" type="submit" name="disable" value="<?php echo __('Disable');?>">
- <input class="button" type="submit" name="delete" value="<?php echo __('Delete');?>">
-</p>
+
<?php
endif;
?>
diff --git a/include/staff/banlist.inc.php b/include/staff/banlist.inc.php
index 409343957..1415b6121 100644
--- a/include/staff/banlist.inc.php
+++ b/include/staff/banlist.inc.php
@@ -51,7 +51,7 @@ $query="$select $from $where ORDER BY $order_by LIMIT ".$pageNav->getStart().","
<h2><?php echo __('Banned Email Addresses');?>
<i class="help-tip icon-question-sign" href="#ban_list"></i>
</h2>
-<div class="pull-left" style="width:600;padding-top:5px;">
+<div class="pull-left" style="margin-bottom:5px;">
<form action="banlist.php" method="GET" name="filter">
<input type="hidden" name="a" value="filter" >
<div>
@@ -62,7 +62,28 @@ $query="$select $from $where ORDER BY $order_by LIMIT ".$pageNav->getStart().","
</div>
</form>
</div>
-<div class="pull-right flush-right" style="padding-right:5px;"><b><a href="banlist.php?a=add" class="Icon newstaff"><?php echo __('Ban New Email');?></a></b></div>
+<form action="banlist.php" method="POST" name="banlist">
+<div class="pull-right flush-right" style="margin-bottom:5px;">
+ <a href="banlist.php?a=add" class="red button action-button"><i class="icon-ban-circle"></i> <?php echo __('Ban New Email');?></a>
+
+ <span class="action-button" data-dropdown="#action-dropdown-more">
+ <i class="icon-caret-down pull-right"></i>
+ <span ><i class="icon-cog"></i> <?php echo __('More');?></span>
+ </span>
+ <div id="action-dropdown-more" class="action-dropdown anchor-right">
+ <ul id="actions">
+ <li><a class="confirm" data-name="enable" href="banlist.php?a=enable">
+ <i class="icon-ok-sign icon-fixed-width"></i>
+ <?php echo __('Enable'); ?></a></li>
+ <li><a class="confirm" data-name="disable" href="banlist.php?a=disable">
+ <i class="icon-ban-circle icon-fixed-width"></i>
+ <?php echo __('Disable'); ?></a></li>
+ <li><a class="confirm" data-name="delete" href="banlist.php?a=delete">
+ <i class="icon-undo icon-fixed-width"></i>
+ <?php echo __('Remove'); ?></a></li>
+ </ul>
+ </div>
+</div>
<div class="clear"></div>
<?php
if(($res=db_query($query)) && ($num=db_num_rows($res)))
@@ -74,7 +95,6 @@ if($search)
$showing=__('Search Results').': '.$showing;
?>
-<form action="banlist.php" method="POST" name="banlist">
<?php csrf_token(); ?>
<input type="hidden" name="do" value="mass_process" >
<input type="hidden" id="action" name="a" value="" >
@@ -129,13 +149,7 @@ if($search)
if($res && $num): //Show options..
echo '<div> '.__('Page').':'.$pageNav->getPageLinks().' </div>';
?>
-<p class="centered" id="actions">
- <input class="button" type="submit" name="enable" value="<?php echo __('Enable');?>" >
-
- <input class="button" type="submit" name="disable" value="<?php echo __('Disable');?>" >
-
- <input class="button" type="submit" name="delete" value="<?php echo __('Delete');?>">
-</p>
+
<?php
endif;
?>
diff --git a/include/staff/departments.inc.php b/include/staff/departments.inc.php
index c07f2d32b..6e5f35c2b 100644
--- a/include/staff/departments.inc.php
+++ b/include/staff/departments.inc.php
@@ -39,13 +39,29 @@ $qs += array('sort' => $_REQUEST['sort'], 'order' => $_REQUEST['order']);
$pageNav->setURL('departments.php', $qs);
$showing = $pageNav->showing().' '._N('department', 'departments', $count);
?>
-<div class="pull-left" style="width:700px;padding-top:5px;">
- <h2><?php echo __('Departments');?></h2>
- </div>
-<div class="pull-right flush-right" style="padding-top:5px;padding-right:5px;">
- <b><a href="departments.php?a=add" class="Icon newDepartment"><?php echo __('Add New Department');?></a></b></div>
-<div class="clear"></div>
<form action="departments.php" method="POST" name="depts">
+<div class="sticky bar">
+ <div class="content">
+ <div class="pull-left">
+ <h2><?php echo __('Departments');?></h2>
+ </div>
+ <div class="pull-right flush-right">
+ <a href="departments.php?a=add" class="green button action-button"><i class="icon-plus-sign"></i> <?php echo __('Add New Department');?></a>
+ <span class="action-button" data-dropdown="#action-dropdown-more">
+ <i class="icon-caret-down pull-right"></i>
+ <span ><i class="icon-cog"></i> <?php echo __('More');?></span>
+ </span>
+ <div id="action-dropdown-more" class="action-dropdown anchor-right">
+ <ul id="actions">
+ <li class="danger"><a class="confirm" data-name="delete" href="departments.php?a=delete">
+ <i class="icon-trash icon-fixed-width"></i>
+ <?php echo __('Delete'); ?></a></li>
+ </ul>
+ </div>
+ </div>
+ <div class="clear"></div>
+ </div>
+</div>
<?php csrf_token(); ?>
<input type="hidden" name="do" value="mass_process" >
<input type="hidden" id="action" name="a" value="" >
@@ -136,14 +152,9 @@ $showing = $pageNav->showing().' '._N('department', 'departments', $count);
</tfoot>
</table>
<?php
-if ($count): //Show options..
+if ($count):
echo '<div> '.__('Page').':'.$pageNav->getPageLinks().' </div>';
- ?>
- <p class="centered" id="actions">
- <input class="button" type="submit" name="delete" value="<?php echo
- __('Delete');
- ?>" >
- </p>
+?>
<?php
endif;
?>
diff --git a/include/staff/dynamic-forms.inc.php b/include/staff/dynamic-forms.inc.php
index 47754fd05..65bcc43c6 100644
--- a/include/staff/dynamic-forms.inc.php
+++ b/include/staff/dynamic-forms.inc.php
@@ -1,9 +1,25 @@
-<div class="pull-left" style="width:700;padding-top:5px;">
+<form action="forms.php" method="POST" name="forms">
+
+<div class="pull-left" style="padding-top:5px;">
<h2><?php echo __('Custom Forms'); ?></h2>
</div>
<div class="pull-right flush-right" style="padding-top:5px;padding-right:5px;">
-<b><a href="forms.php?a=add" class="Icon form-add"><?php
- echo __('Add New Custom Form'); ?></a></b></div>
+<a href="forms.php?a=add" class="green button action-button"><i class="icon-plus-sign"></i> <?php
+ echo __('Add New Custom Form'); ?></a>
+
+ <span class="action-button" data-dropdown="#action-dropdown-more">
+ <i class="icon-caret-down pull-right"></i>
+ <span ><i class="icon-cog"></i> <?php echo __('More');?></span>
+ </span>
+ <div id="action-dropdown-more" class="action-dropdown anchor-right">
+ <ul id="actions">
+ <li class="danger"><a class="confirm" data-name="delete" href="forms.php?a=delete">
+ <i class="icon-trash icon-fixed-width"></i>
+ <?php echo __('Delete'); ?></a></li>
+ </ul>
+ </div>
+
+</div>
<div class="clear"></div>
<?php
@@ -18,7 +34,6 @@ $pageNav->setURL('forms.php');
$showing=$pageNav->showing().' '._N('form','forms',$count);
?>
-<form action="forms.php" method="POST" name="forms">
<?php csrf_token(); ?>
<input type="hidden" name="do" value="mass_process" >
<input type="hidden" id="action" name="a" value="" >
@@ -98,9 +113,7 @@ $showing=$pageNav->showing().' '._N('form','forms',$count);
if ($count) //Show options..
echo '<div> '.__('Page').':'.$pageNav->getPageLinks().' </div>';
?>
-<p class="centered" id="actions">
- <input class="button" type="submit" name="delete" value="<?php echo __('Delete'); ?>">
-</p>
+
</form>
<div style="display:none;" class="dialog" id="confirm-action">
diff --git a/include/staff/dynamic-lists.inc.php b/include/staff/dynamic-lists.inc.php
index 6d294a587..a31784452 100644
--- a/include/staff/dynamic-lists.inc.php
+++ b/include/staff/dynamic-lists.inc.php
@@ -1,9 +1,24 @@
-<div class="pull-left" style="width:700;padding-top:5px;">
+<form action="lists.php" method="POST" name="lists">
+
+<div class="pull-left" style="padding-top:5px;">
<h2><?php echo __('Custom Lists'); ?></h2>
</div>
<div class="pull-right flush-right" style="padding-top:5px;padding-right:5px;">
- <b><a href="lists.php?a=add" class="Icon list-add"><?php
- echo __('Add New Custom List'); ?></a></b></div>
+ <a href="lists.php?a=add" class="green button action-button"><i class="icon-plus-sign"></i> <?php
+ echo __('Add New Custom List'); ?></a>
+
+ <span class="action-button" data-dropdown="#action-dropdown-more">
+ <i class="icon-caret-down pull-right"></i>
+ <span ><i class="icon-cog"></i> <?php echo __('More');?></span>
+ </span>
+ <div id="action-dropdown-more" class="action-dropdown anchor-right">
+ <ul id="actions">
+ <li class="danger"><a class="confirm" data-name="delete" href="lists.php?a=delete">
+ <i class="icon-trash icon-fixed-width"></i>
+ <?php echo __('Delete'); ?></a></li>
+ </ul>
+ </div>
+</div>
<div class="clear"></div>
<?php
@@ -14,7 +29,6 @@ $pageNav->setURL('lists.php');
$showing=$pageNav->showing().' '._N('custom list', 'custom lists', $count);
?>
-<form action="lists.php" method="POST" name="lists">
<?php csrf_token(); ?>
<input type="hidden" name="do" value="mass_process" >
<input type="hidden" id="action" name="a" value="" >
@@ -77,9 +91,6 @@ if ($count) //Show options..
echo '<div> '.__('Page').':'.$pageNav->getPageLinks().' </div>';
?>
-<p class="centered" id="actions">
- <input class="button" type="submit" name="delete" value="<?php echo __('Delete'); ?>">
-</p>
</form>
<div style="display:none;" class="dialog" id="confirm-action">
diff --git a/include/staff/emails.inc.php b/include/staff/emails.inc.php
index 5862d4a14..a64186b5f 100644
--- a/include/staff/emails.inc.php
+++ b/include/staff/emails.inc.php
@@ -39,13 +39,26 @@ $def_dept_id = $cfg->getDefaultDeptId();
$def_dept_name = $cfg->getDefaultDept()->getName();
$def_priority = $cfg->getDefaultPriority()->getDesc();
?>
-<div class="pull-left" style="width:700px;padding-top:5px;">
+<form action="emails.php" method="POST" name="emails">
+
+<div class="pull-left" style="padding-top:5px;">
<h2><?php echo __('Email Addresses');?></h2>
</div>
<div class="pull-right flush-right" style="padding-top:5px;padding-right:5px;">
- <b><a href="emails.php?a=add" class="Icon newEmail"><?php echo __('Add New Email');?></a></b></div>
+ <a href="emails.php?a=add" class="green button action-button"><i class="icon-plus-sign"></i> <?php echo __('Add New Email');?></a>
+ <span class="action-button" data-dropdown="#action-dropdown-more">
+ <i class="icon-caret-down pull-right"></i>
+ <span ><i class="icon-cog"></i> <?php echo __('More');?></span>
+ </span>
+ <div id="action-dropdown-more" class="action-dropdown anchor-right">
+ <ul id="actions">
+ <li class="danger"><a class="confirm" data-name="delete" href="emails.php?a=delete">
+ <i class="icon-trash icon-fixed-width"></i>
+ <?php echo __('Delete'); ?></a></li>
+ </ul>
+ </div>
+</div>
<div class="clear"></div>
-<form action="emails.php" method="POST" name="emails">
<?php csrf_token(); ?>
<input type="hidden" name="do" value="mass_process" >
<input type="hidden" id="action" name="a" value="" >
@@ -117,9 +130,7 @@ $def_priority = $cfg->getDefaultPriority()->getDesc();
if ($count):
echo '<div> '.__('Page').':'.$pageNav->getPageLinks().' </div>';
?>
-<p class="centered" id="actions">
- <input class="button" type="submit" name="delete" value="<?php echo __('Delete Email(s)');?>" >
-</p>
+
<?php
endif;
?>
diff --git a/include/staff/filters.inc.php b/include/staff/filters.inc.php
index ef04bf366..5d81d4e00 100644
--- a/include/staff/filters.inc.php
+++ b/include/staff/filters.inc.php
@@ -44,14 +44,35 @@ else
$showing=__('No filters found!');
?>
+<form action="filters.php" method="POST" name="filters">
-<div class="pull-left" style="width:700px;padding-top:5px;">
+<div class="pull-left" style="padding-top:5px;">
<h2><?php echo __('Ticket Filters');?></h2>
</div>
<div class="pull-right flush-right" style="padding-top:5px;padding-right:5px;">
- <b><a href="filters.php?a=add" class="Icon newTicketFilter"><?php echo __('Add New Filter');?></a></b></div>
+ <a href="filters.php?a=add" class="green button action-button"><i class="icon-plus-sign"></i> <?php echo __('Add New Filter');?></a>
+
+ <span class="action-button" data-dropdown="#action-dropdown-more">
+ <i class="icon-caret-down pull-right"></i>
+ <span ><i class="icon-cog"></i> <?php echo __('More');?></span>
+ </span>
+ <div id="action-dropdown-more" class="action-dropdown anchor-right">
+ <ul id="actions">
+ <li><a class="confirm" data-name="enable" href="filters.php?a=enable">
+ <i class="icon-ok-sign icon-fixed-width"></i>
+ <?php echo __('Enable'); ?></a></li>
+ <li><a class="confirm" data-name="disable" href="filters.php?a=disable">
+ <i class="icon-ban-circle icon-fixed-width"></i>
+ <?php echo __('Disable'); ?></a></li>
+ <li class="danger"><a class="confirm" data-name="delete" href="filters.php?a=delete">
+ <i class="icon-trash icon-fixed-width"></i>
+ <?php echo __('Delete'); ?></a></li>
+ </ul>
+ </div>
+
+
+</div>
<div class="clear"></div>
-<form action="filters.php" method="POST" name="filters">
<?php csrf_token(); ?>
<input type="hidden" name="do" value="mass_process" >
<input type="hidden" id="action" name="a" value="" >
@@ -114,11 +135,7 @@ else
if($res && $num): //Show options..
echo '<div> '.__('Page').':'.$pageNav->getPageLinks().' </div>';
?>
-<p class="centered" id="actions">
- <input class="button" type="submit" name="enable" value="<?php echo __('Enable');?>">
- <input class="button" type="submit" name="disable" value="<?php echo __('Disable');?>">
- <input class="button" type="submit" name="delete" value="<?php echo __('Delete');?>">
-</p>
+
<?php
endif;
?>
diff --git a/include/staff/helptopics.inc.php b/include/staff/helptopics.inc.php
index e9eda32bf..54d05a395 100644
--- a/include/staff/helptopics.inc.php
+++ b/include/staff/helptopics.inc.php
@@ -11,13 +11,39 @@ $showing = $pageNav->showing().' '._N('help topic', 'help topics', $count);
$order_by = ($cfg->getTopicSortMode() == 'm') ? 'sort' : 'topic';
?>
-<div class="pull-left" style="width:700px;padding-top:5px;">
+<form action="helptopics.php" method="POST" name="topics">
+
+<div class="pull-left" style="padding-top:5px;">
<h2><?php echo __('Help Topics');?></h2>
</div>
<div class="pull-right flush-right" style="padding-top:5px;padding-right:5px;">
- <b><a href="helptopics.php?a=add" class="Icon newHelpTopic"><?php echo __('Add New Help Topic');?></a></b></div>
+ <?php if ($cfg->getTopicSortMode() != 'a') { ?>
+ <input class="button no-confirm" type="submit" name="sort" value="Save"/>
+ <?php } ?>
+ <a href="helptopics.php?a=add" class="green button action-button"><i class="icon-plus-sign"></i> <?php echo __('Add New Help Topic');?></a>
+
+ <span class="action-button" data-dropdown="#action-dropdown-more">
+ <i class="icon-caret-down pull-right"></i>
+ <span ><i class="icon-cog"></i> <?php echo __('More');?></span>
+ </span>
+ <div id="action-dropdown-more" class="action-dropdown anchor-right">
+ <ul id="actions">
+ <li><a class="confirm" data-name="enable" href="helptopics.php?a=enable">
+ <i class="icon-ok-sign icon-fixed-width"></i>
+ <?php echo __('Enable'); ?></a></li>
+ <li><a class="confirm" data-name="disable" href="helptopics.php?a=disable">
+ <i class="icon-ban-circle icon-fixed-width"></i>
+ <?php echo __('Disable'); ?></a></li>
+ <li class="danger"><a class="confirm" data-name="delete" href="helptopics.php?a=delete">
+ <i class="icon-trash icon-fixed-width"></i>
+ <?php echo __('Delete'); ?></a></li>
+ </ul>
+ </div>
+
+
+
+</div>
<div class="clear"></div>
-<form action="helptopics.php" method="POST" name="topics">
<?php csrf_token(); ?>
<input type="hidden" name="do" value="mass_process" >
<input type="hidden" id="action" name="a" value="sort" >
@@ -126,14 +152,7 @@ $order_by = ($cfg->getTopicSortMode() == 'm') ? 'sort' : 'topic';
if ($count): //Show options..
echo '<div> '.__('Page').':'.$pageNav->getPageLinks().' </div>';
?>
-<p class="centered" id="actions">
-<?php if ($cfg->getTopicSortMode() != 'a') { ?>
- <input class="button no-confirm" type="submit" name="sort" value="Save"/>
-<?php } ?>
- <button class="button" type="submit" name="enable" value="Enable" ><?php echo __('Enable'); ?></button>
- <button class="button" type="submit" name="disable" value="Disable"><?php echo __('Disable'); ?></button>
- <button class="button" type="submit" name="delete" value="Delete"><?php echo __('Delete'); ?></button>
-</p>
+
<?php
endif;
?>
diff --git a/include/staff/pages.inc.php b/include/staff/pages.inc.php
index 2398c5e57..543b6bb78 100644
--- a/include/staff/pages.inc.php
+++ b/include/staff/pages.inc.php
@@ -31,19 +31,39 @@ $qs += array('sort' => $_REQUEST['sort'], 'order' => $_REQUEST['order']);
$pageNav->setURL('pages.php', $qs);
//Ok..lets roll...create the actual query
if ($total)
- $showing=$pageNav->showing()._N('site page','site pages', $num);
+ $showing=$pageNav->showing().' '._N('site page','site pages', $num);
else
$showing=__('No pages found!');
?>
+<form action="pages.php" method="POST" name="tpls">
-<div class="pull-left" style="width:700px;padding-top:5px;">
+<div class="pull-left" style="padding-top:5px;">
<h2><?php echo __('Site Pages'); ?>
<i class="help-tip icon-question-sign" href="#site_pages"></i>
</h2>
</div>
<div class="pull-right flush-right" style="padding-top:5px;padding-right:5px;">
- <b><a href="pages.php?a=add" class="Icon newPage"><?php echo __('Add New Page'); ?></a></b></div>
+ <a href="pages.php?a=add" class="green button action-button"><i class="icon-plus-sign"></i> <?php echo __('Add New Page'); ?></a>
+
+ <span class="action-button" data-dropdown="#action-dropdown-more">
+ <i class="icon-caret-down pull-right"></i>
+ <span ><i class="icon-cog"></i> <?php echo __('More');?></span>
+ </span>
+ <div id="action-dropdown-more" class="action-dropdown anchor-right">
+ <ul id="actions">
+ <li><a class="confirm" data-name="enable" href="pages.php?a=enable">
+ <i class="icon-ok-sign icon-fixed-width"></i>
+ <?php echo __('Enable'); ?></a></li>
+ <li><a class="confirm" data-name="disable" href="pages.php?a=disable">
+ <i class="icon-ban-circle icon-fixed-width"></i>
+ <?php echo __('Disable'); ?></a></li>
+ <li class="danger"><a class="confirm" data-name="delete" href="pages.php?a=delete">
+ <i class="icon-trash icon-fixed-width"></i>
+ <?php echo __('Delete'); ?></a></li>
+ </ul>
+ </div>
+</div>
<div class="clear"></div>
<form action="pages.php" method="POST" name="tpls">
<?php csrf_token(); ?>
@@ -63,7 +83,6 @@ else
</thead>
<tbody>
<?php
- $total=0;
$ids=($errors && is_array($_POST['ids']))?$_POST['ids']:null;
$defaultPages=$cfg->getDefaultPages();
foreach ($pages as $page) {
@@ -91,7 +110,7 @@ else
<tfoot>
<tr>
<td colspan="6">
- <?php if($res && $num){ ?>
+ <?php if($total){ ?>
<?php echo __('Select'); ?>:
<a id="selectAll" href="#ckb"><?php echo __('All'); ?></a>
<a id="selectNone" href="#ckb"><?php echo __('None'); ?></a>
@@ -104,14 +123,10 @@ else
</tfoot>
</table>
<?php
-if($res && $num): //Show options..
+if($total): //Show options..
echo '<div> '.__('Page').':'.$pageNav->getPageLinks().' </div>';
?>
-<p class="centered" id="actions">
- <input class="button" type="submit" name="enable" value="<?php echo __('Enable'); ?>" >
- <input class="button" type="submit" name="disable" value="<?php echo __('Disable'); ?>" >
- <input class="button" type="submit" name="delete" value="<?php echo __('Delete'); ?>" >
-</p>
+
<?php
endif;
?>
diff --git a/include/staff/plugins.inc.php b/include/staff/plugins.inc.php
index 7e05195ab..bbb25bd04 100644
--- a/include/staff/plugins.inc.php
+++ b/include/staff/plugins.inc.php
@@ -1,9 +1,30 @@
-<div class="pull-left" style="width:700;padding-top:5px;">
+<form action="plugins.php" method="POST" name="forms">
+
+ <div class="pull-left" style="padding-top:5px;">
<h2><?php echo __('Currently Installed Plugins'); ?></h2>
</div>
<div class="pull-right flush-right" style="padding-top:5px;padding-right:5px;">
- <b><a href="plugins.php?a=add" class="Icon form-add"><?php
- echo __('Add New Plugin'); ?></a></b></div>
+ <a href="plugins.php?a=add" class="green button action-button"><i class="icon-plus-sign"></i> <?php
+ echo __('Add New Plugin'); ?></a>
+
+ <span class="action-button" data-dropdown="#action-dropdown-more">
+ <i class="icon-caret-down pull-right"></i>
+ <span ><i class="icon-cog"></i> <?php echo __('More');?></span>
+ </span>
+ <div id="action-dropdown-more" class="action-dropdown anchor-right">
+ <ul id="actions">
+ <li><a class="confirm" data-name="enable" href="plugins.php?a=enable">
+ <i class="icon-ok-sign icon-fixed-width"></i>
+ <?php echo __('Enable'); ?></a></li>
+ <li><a class="confirm" data-name="disable" href="plugins.php?a=disable">
+ <i class="icon-ban-circle icon-fixed-width"></i>
+ <?php echo __('Disable'); ?></a></li>
+ <li class="danger"><a class="confirm" data-name="delete" href="plugins.php?a=delete">
+ <i class="icon-trash icon-fixed-width"></i>
+ <?php echo __('Delete'); ?></a></li>
+ </ul>
+ </div>
+</div>
<div class="clear"></div>
<?php
@@ -23,7 +44,7 @@ $showing=$pageNav->showing().' '._N('plugin', 'plugins', $count);
<tr>
<th width="7"> </th>
<th><?php echo __('Plugin Name'); ?></th>
- <th><?php echo __('Status'); ?></td>
+ <th><?php echo __('Status'); ?></th>
<th><?php echo __('Date Installed'); ?></th>
</tr>
</thead>
@@ -63,11 +84,7 @@ foreach ($ost->plugins->allInstalled() as $p) {
if ($count) //Show options..
echo '<div> '.__('Page').':'.$pageNav->getPageLinks().' </div>';
?>
-<p class="centered" id="actions">
- <input class="button" type="submit" name="delete" value="<?php echo __('Delete'); ?>">
- <input class="button" type="submit" name="enable" value="<?php echo __('Enable'); ?>">
- <input class="button" type="submit" name="disable" value="<?php echo __('Disable'); ?>">
-</p>
+
</form>
<div style="display:none;" class="dialog" id="confirm-action">
diff --git a/include/staff/roles.inc.php b/include/staff/roles.inc.php
index 49ba6d87c..c568616c6 100644
--- a/include/staff/roles.inc.php
+++ b/include/staff/roles.inc.php
@@ -1,11 +1,33 @@
-<div class="pull-left" style="width:700;padding-top:5px;">
- <h2><?php echo __('Roles'); ?></h2>
+<form action="roles.php" method="POST" name="roles">
+<div class="sticky bar">
+ <div class="content">
+ <div class="pull-left">
+ <h2><?php echo __('Roles'); ?></h2>
+ </div>
+ <div class="pull-right flush-right">
+ <a href="roles.php?a=add" class="green button action-button"><i class="icon-plus-sign"></i> <?php
+echo __('Add New Role'); ?></a>
+ <span class="action-button" data-dropdown="#action-dropdown-more">
+ <i class="icon-caret-down pull-right"></i>
+ <span ><i class="icon-cog"></i> <?php echo __('More');?></span>
+ </span>
+ <div id="action-dropdown-more" class="action-dropdown anchor-right">
+ <ul id="actions">
+ <li><a class="confirm" data-name="enable" href="roles.php?a=enable">
+ <i class="icon-ok-sign icon-fixed-width"></i>
+ <?php echo __('Enable'); ?></a></li>
+ <li><a class="confirm" data-name="disable" href="roles.php?a=disable">
+ <i class="icon-ban-circle icon-fixed-width"></i>
+ <?php echo __('Disable'); ?></a></li>
+ <li class="danger"><a class="confirm" data-name="delete" href="roles.php?a=delete">
+ <i class="icon-trash icon-fixed-width"></i>
+ <?php echo __('Delete'); ?></a></li>
+ </ul>
+ </div>
+ </div>
+ <div class="clear"></div>
+ </div>
</div>
-<div class="pull-right flush-right" style="padding-top:5px;padding-right:5px;">
- <b><a href="roles.php?a=add" class="Icon list-add"><?php
- echo __('Add New Role'); ?></a></b></div>
-<div class="clear"></div>
-
<?php
$page = ($_GET['p'] && is_numeric($_GET['p'])) ? $_GET['p'] : 1;
$count = Role::objects()->count();
@@ -13,9 +35,7 @@ $pageNav = new Pagenate($count, $page, PAGE_LIMIT);
$pageNav->setURL('roles.php');
$showing=$pageNav->showing().' '._N('role', 'roles', $count);
-?>
-<form action="roles.php" method="POST" name="roles">
-<?php csrf_token(); ?>
+csrf_token(); ?>
<input type="hidden" name="do" value="mass_process" >
<input type="hidden" id="action" name="a" value="" >
<table class="list" border="0" cellspacing="1" cellpadding="0" width="940">
@@ -80,17 +100,6 @@ $showing=$pageNav->showing().' '._N('role', 'roles', $count);
if ($count) //Show options..
echo '<div> '.__('Page').':'.$pageNav->getPageLinks().' </div>';
?>
-
-<p class="centered" id="actions">
- <input class="button" type="submit" name="enable" value="<?php echo
- __('Enable'); ?>">
-
- <input class="button" type="submit" name="disable" value="<?php echo
- __('Disable'); ?>">
-
- <input class="button" type="submit" name="delete" value="<?php echo
- __('Delete'); ?>">
-</p>
</form>
<div style="display:none;" class="dialog" id="confirm-action">
diff --git a/include/staff/settings-emails.inc.php b/include/staff/settings-emails.inc.php
index 5e977a706..06b631664 100644
--- a/include/staff/settings-emails.inc.php
+++ b/include/staff/settings-emails.inc.php
@@ -172,7 +172,7 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
</tr>
</tbody>
</table>
-<p style="padding-left:250px;">
+<p style="text-align:center;">
<input class="button" type="submit" name="submit" value="<?php echo __('Save Changes');?>">
<input class="button" type="reset" name="reset" value="<?php echo __('Reset Changes');?>">
</p>
diff --git a/include/staff/settings-kb.inc.php b/include/staff/settings-kb.inc.php
index 941b08e30..cd55261ed 100644
--- a/include/staff/settings-kb.inc.php
+++ b/include/staff/settings-kb.inc.php
@@ -39,7 +39,7 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
</tr>
</tbody>
</table>
-<p style="padding-left:210px;">
+<p style="text-align:center;">
<input class="button" type="submit" name="submit" value="<?php echo __('Save Changes'); ?>">
<input class="button" type="reset" name="reset" value="<?php echo __('Reset Changes'); ?>">
</p>
diff --git a/include/staff/settings-pages.inc.php b/include/staff/settings-pages.inc.php
index 4d9910b4e..586a7087e 100644
--- a/include/staff/settings-pages.inc.php
+++ b/include/staff/settings-pages.inc.php
@@ -182,7 +182,7 @@ $pages = Page::getPages();
</tr>
</tbody>
</table>
-<p style="padding-left:250px;">
+<p style="text-align:center;">
<input class="button" type="submit" name="submit-button" value="<?php
echo __('Save Changes'); ?>">
<input class="button" type="reset" name="reset" value="<?php
diff --git a/include/staff/settings-system.inc.php b/include/staff/settings-system.inc.php
index cc268739c..809998a5f 100644
--- a/include/staff/settings-system.inc.php
+++ b/include/staff/settings-system.inc.php
@@ -354,7 +354,7 @@ $gmtime = Misc::gmtime();
</tr>
</tbody>
</table>
-<p style="padding-left:250px;">
+<p style="text-align:center;">
<input class="button" type="submit" name="submit" value="<?php echo __('Save Changes');?>">
<input class="button" type="reset" name="reset" value="<?php echo __('Reset Changes');?>">
</p>
diff --git a/include/staff/settings-tasks.inc.php b/include/staff/settings-tasks.inc.php
index 83b5ac067..dff1b8d79 100644
--- a/include/staff/settings-tasks.inc.php
+++ b/include/staff/settings-tasks.inc.php
@@ -286,7 +286,7 @@ if(!($maxfileuploads=ini_get('max_file_uploads')))
</table>
</div>
</div>
-<p style="padding-left:250px;">
+<p style="text-align:center;">
<input class="button" type="submit" name="submit" value="<?php echo __('Save Changes');?>">
<input class="button" type="reset" name="reset" value="<?php echo __('Reset Changes');?>">
</p>
diff --git a/include/staff/settings-tickets.inc.php b/include/staff/settings-tickets.inc.php
index e4f00e2dc..c02f437f7 100644
--- a/include/staff/settings-tickets.inc.php
+++ b/include/staff/settings-tickets.inc.php
@@ -230,7 +230,7 @@ if(!($maxfileuploads=ini_get('max_file_uploads')))
<?php include STAFFINC_DIR . 'settings-alerts.inc.php'; ?>
</div>
-<p style="padding-left:250px;">
+<p style="text-align:center;">
<input class="button" type="submit" name="submit" value="<?php echo __('Save Changes');?>">
<input class="button" type="reset" name="reset" value="<?php echo __('Reset Changes');?>">
</p>
diff --git a/include/staff/slaplans.inc.php b/include/staff/slaplans.inc.php
index 2f1b3904e..2e018639d 100644
--- a/include/staff/slaplans.inc.php
+++ b/include/staff/slaplans.inc.php
@@ -39,13 +39,33 @@ $pageNav->setURL('slas.php', $qs);
$showing = $pageNav->showing().' '._N('SLA plan', 'SLA plans', $count);
$qstr .= '&order='.($order=='DESC' ? 'ASC' : 'DESC');
?>
-<div class="pull-left" style="width:700px;padding-top:5px;">
+<form action="slas.php" method="POST" name="slas">
+
+<div class="pull-left" style="padding-top:5px;">
<h2><?php echo __('Service Level Agreements');?></h2>
</div>
<div class="pull-right flush-right" style="padding-top:5px;padding-right:5px;">
- <b><a href="slas.php?a=add" class="Icon newsla"><?php echo __('Add New SLA Plan');?></a></b></div>
+ <a href="slas.php?a=add" class="green button action-button"><i class="icon-plus-sign"></i> <?php echo __('Add New SLA Plan');?></a>
+
+ <span class="action-button" data-dropdown="#action-dropdown-more">
+ <i class="icon-caret-down pull-right"></i>
+ <span ><i class="icon-cog"></i> <?php echo __('More');?></span>
+ </span>
+ <div id="action-dropdown-more" class="action-dropdown anchor-right">
+ <ul id="actions">
+ <li><a class="confirm" data-name="enable" href="slas.php?a=enable">
+ <i class="icon-ok-sign icon-fixed-width"></i>
+ <?php echo __('Enable'); ?></a></li>
+ <li><a class="confirm" data-name="disable" href="slas.php?a=disable">
+ <i class="icon-ban-circle icon-fixed-width"></i>
+ <?php echo __('Disable'); ?></a></li>
+ <li class="danger"><a class="confirm" data-name="delete" href="slas.php?a=delete">
+ <i class="icon-trash icon-fixed-width"></i>
+ <?php echo __('Delete'); ?></a></li>
+ </ul>
+ </div>
+</div>
<div class="clear"></div>
-<form action="slas.php" method="POST" name="slas">
<?php csrf_token(); ?>
<input type="hidden" name="do" value="mass_process" >
<input type="hidden" id="action" name="a" value="" >
@@ -119,11 +139,7 @@ $qstr .= '&order='.($order=='DESC' ? 'ASC' : 'DESC');
if ($count): //Show options..
echo '<div> '.__('Page').':'.$pageNav->getPageLinks().' </div>';
?>
-<p class="centered" id="actions">
- <input class="button" type="submit" name="enable" value="<?php echo __('Enable');?>" >
- <input class="button" type="submit" name="disable" value="<?php echo __('Disable');?>" >
- <input class="button" type="submit" name="delete" value="<?php echo __('Delete');?>" >
-</p>
+
<?php
endif;
?>
diff --git a/include/staff/staffmembers.inc.php b/include/staff/staffmembers.inc.php
index a9b6a8719..d2a5c3835 100644
--- a/include/staff/staffmembers.inc.php
+++ b/include/staff/staffmembers.inc.php
@@ -80,75 +80,76 @@ $qstr .= '&order='.($order=='-' ? 'ASC' : 'DESC');
// add limits.
$agents->limit($pageNav->getLimit())->offset($pageNav->getStart());
?>
-<h2><?php echo __('Agents');?></h2>
-
-<div class="pull-left">
- <form action="staff.php" method="GET" name="filter">
- <input type="hidden" name="a" value="filter" >
- <select name="did" id="did">
- <option value="0">— <?php echo __('All Department');?> —</option>
- <?php
- if (($depts=Dept::getDepartments())) {
- foreach ($depts as $id => $name) {
- $sel=($_REQUEST['did'] && $_REQUEST['did']==$id)?'selected="selected"':'';
- echo sprintf('<option value="%d" %s>%s</option>',$id,$sel,$name);
- }
- }
- ?>
- </select>
- <select name="tid" id="tid">
- <option value="0">— <?php echo __('All Teams');?> —</option>
- <?php
- if (($teams=Team::getTeams())) {
- foreach ($teams as $id => $name) {
- $sel=($_REQUEST['tid'] && $_REQUEST['tid']==$id)?'selected="selected"':'';
- echo sprintf('<option value="%d" %s>%s</option>',$id,$sel,$name);
- }
- }
- ?>
- </select>
- <input type="submit" name="submit" class="small button" value="<?php echo __('Apply');?>"/>
- </form>
- </div>
-
- <form id="mass-actions" action="staff.php" method="POST" name="staff" >
-
- <div class="pull-right">
- <a class="green button action-button" href="staff.php?a=add">
- <i class="icon-plus-sign"></i>
- <?php echo __('Add New Agent'); ?>
- </a>
- <span class="action-button" data-dropdown="#action-dropdown-more">
- <i class="icon-caret-down pull-right"></i>
- <span ><i class="icon-cog"></i> <?php echo __('More');?></span>
- </span>
- <div id="action-dropdown-more" class="action-dropdown anchor-right">
- <ul id="actions">
- <li><a class="confirm" data-name="enable" href="staff.php?a=enable">
- <i class="icon-ok-sign icon-fixed-width"></i>
- <?php echo __('Enable'); ?></a></li>
- <li><a class="confirm" data-name="disable" href="staff.php?a=disable">
- <i class="icon-ban-circle icon-fixed-width"></i>
- <?php echo __('Disable'); ?></a></li>
- <li><a class="dialog-first" data-action="permissions" href="#staff/reset-permissions">
- <i class="icon-sitemap icon-fixed-width"></i>
- <?php echo __('Reset Permissions'); ?></a></li>
- <li><a class="dialog-first" data-action="department" href="#staff/change-department">
- <i class="icon-truck icon-fixed-width"></i>
- <?php echo __('Change Department'); ?></a></li>
- <!-- TODO: Implement "Reset Access" mass action
- <li><a class="dialog-first" href="#staff/reset-access">
- <i class="icon-puzzle-piece icon-fixed-width"></i>
- <?php echo __('Reset Access'); ?></a></li>
- -->
- <li class="danger"><a class="confirm" data-name="delete" href="staff.php?a=delete">
- <i class="icon-trash icon-fixed-width"></i>
- <?php echo __('Delete'); ?></a></li>
- </ul>
+<div class="sticky bar">
+ <div class="content">
+ <h2 class="inline"><?php echo __('Agents');?></h2>
+ <div class="pull-left inline">
+ <form action="staff.php" method="GET" name="filter">
+ <input type="hidden" name="a" value="filter" >
+ <select name="did" id="did">
+ <option value="0">— <?php echo __('All Department');?> —</option>
+ <?php
+ if (($depts=Dept::getDepartments())) {
+ foreach ($depts as $id => $name) {
+ $sel=($_REQUEST['did'] && $_REQUEST['did']==$id)?'selected="selected"':'';
+ echo sprintf('<option value="%d" %s>%s</option>',$id,$sel,$name);
+ }
+ }
+ ?>
+ </select>
+ <select name="tid" id="tid">
+ <option value="0">— <?php echo __('All Teams');?> —</option>
+ <?php
+ if (($teams=Team::getTeams())) {
+ foreach ($teams as $id => $name) {
+ $sel=($_REQUEST['tid'] && $_REQUEST['tid']==$id)?'selected="selected"':'';
+ echo sprintf('<option value="%d" %s>%s</option>',$id,$sel,$name);
+ }
+ }
+ ?>
+ </select>
+ <input type="submit" name="submit" class="small button" value="<?php echo __('Apply');?>"/>
+ </form>
+ </div>
+ <div class="pull-right">
+ <a class="green button action-button" href="staff.php?a=add">
+ <i class="icon-plus-sign"></i>
+ <?php echo __('Add New Agent'); ?>
+ </a>
+ <span class="action-button" data-dropdown="#action-dropdown-more">
+ <i class="icon-caret-down pull-right"></i>
+ <span ><i class="icon-cog"></i> <?php echo __('More');?></span>
+ </span>
+ <div id="action-dropdown-more" class="action-dropdown anchor-right">
+ <ul id="actions">
+ <li><a class="confirm" data-name="enable" href="staff.php?a=enable">
+ <i class="icon-ok-sign icon-fixed-width"></i>
+ <?php echo __('Enable'); ?></a></li>
+ <li><a class="confirm" data-name="disable" href="staff.php?a=disable">
+ <i class="icon-ban-circle icon-fixed-width"></i>
+ <?php echo __('Disable'); ?></a></li>
+ <li><a class="dialog-first" data-action="permissions" href="#staff/reset-permissions">
+ <i class="icon-sitemap icon-fixed-width"></i>
+ <?php echo __('Reset Permissions'); ?></a></li>
+ <li><a class="dialog-first" data-action="department" href="#staff/change-department">
+ <i class="icon-truck icon-fixed-width"></i>
+ <?php echo __('Change Department'); ?></a></li>
+ <!-- TODO: Implement "Reset Access" mass action
+ <li><a class="dialog-first" href="#staff/reset-access">
+ <i class="icon-puzzle-piece icon-fixed-width"></i>
+ <?php echo __('Reset Access'); ?></a></li>
+ -->
+ <li class="danger"><a class="confirm" data-name="delete" href="staff.php?a=delete">
+ <i class="icon-trash icon-fixed-width"></i>
+ <?php echo __('Delete'); ?></a></li>
+ </ul>
+ </div>
+ </div>
+ <div class="clear" style="padding: 3px 0"></div>
</div>
</div>
-<div class="clear" style="padding: 3px 0"></div>
+<form id="mass-actions" action="staff.php" method="POST" name="staff" >
<?php csrf_token(); ?>
<input type="hidden" name="do" value="mass_process" >
diff --git a/include/staff/teams.inc.php b/include/staff/teams.inc.php
index b2c0947cd..8296b06c6 100644
--- a/include/staff/teams.inc.php
+++ b/include/staff/teams.inc.php
@@ -43,15 +43,37 @@ $qstr .= '&order='.urlencode($order=='DESC' ? 'ASC' : 'DESC');
?>
-<div class="pull-left" style="width:700px;padding-top:5px;">
- <h2><?php echo __('Teams');?>
- <i class="help-tip icon-question-sign" href="#teams"></i>
- </h2>
- </div>
-<div class="pull-right flush-right" style="padding-top:5px;padding-right:5px;">
- <b><a href="teams.php?a=add" class="Icon newteam"><?php echo __('Add New Team');?></a></b></div>
-<div class="clear"></div>
<form action="teams.php" method="POST" name="teams">
+<div class="sticky bar">
+ <div class="content">
+ <div class="pull-left">
+ <h2><?php echo __('Teams');?>
+ <i class="help-tip icon-question-sign notsticky" href="#teams"></i>
+ </h2>
+ </div>
+ <div class="pull-right flush-right">
+ <a href="teams.php?a=add" class="green button action-button"><i class="icon-plus-sign"></i> <?php echo __('Add New Team');?></a>
+ <span class="action-button" data-dropdown="#action-dropdown-more">
+ <i class="icon-caret-down pull-right"></i>
+ <span ><i class="icon-cog"></i> <?php echo __('More');?></span>
+ </span>
+ <div id="action-dropdown-more" class="action-dropdown anchor-right">
+ <ul id="actions">
+ <li><a class="confirm" data-name="enable" href="teams.php?a=enable">
+ <i class="icon-ok-sign icon-fixed-width"></i>
+ <?php echo __('Enable'); ?></a></li>
+ <li><a class="confirm" data-name="disable" href="teams.php?a=disable">
+ <i class="icon-ban-circle icon-fixed-width"></i>
+ <?php echo __('Disable'); ?></a></li>
+ <li class="danger"><a class="confirm" data-name="delete" href="teams.php?a=delete">
+ <i class="icon-trash icon-fixed-width"></i>
+ <?php echo __('Delete'); ?></a></li>
+ </ul>
+ </div>
+ </div>
+ <div class="clear"></div>
+ </div>
+</div>
<?php csrf_token(); ?>
<input type="hidden" name="do" value="mass_process" >
<input type="hidden" id="action" name="a" value="" >
@@ -131,11 +153,7 @@ $qstr .= '&order='.urlencode($order=='DESC' ? 'ASC' : 'DESC');
if ($count): //Show options..
echo '<div> '.__('Page').':'.$pageNav->getPageLinks().' </div>';
?>
-<p class="centered" id="actions">
- <input class="button" type="submit" name="enable" value="<?php echo __('Enable');?>" >
- <input class="button" type="submit" name="disable" value="<?php echo __('Disable');?>" >
- <input class="button" type="submit" name="delete" value="<?php echo __('Delete');?>" >
-</p>
+
<?php
endif;
?>
diff --git a/include/staff/templates.inc.php b/include/staff/templates.inc.php
index e83f2a526..a64906211 100644
--- a/include/staff/templates.inc.php
+++ b/include/staff/templates.inc.php
@@ -42,14 +42,34 @@ else
$showing=__('No templates found!');
?>
+<form action="templates.php" method="POST" name="tpls">
-<div class="pull-left" style="width:700px;padding-top:5px;">
+<div class="pull-left" style="padding-top:5px;">
<h2><?php echo __('Email Template Sets'); ?></h2>
</div>
<div class="pull-right flush-right" style="padding-top:5px;padding-right:5px;">
- <b><a href="templates.php?a=add" class="Icon newEmailTemplate"><?php echo __('Add New Template Set'); ?></a></b></div>
+ <a href="templates.php?a=add" class="green button action-button"><i class="icon-plus-sign"></i> <?php echo __('Add New Template Set'); ?></a>
+
+ <span class="action-button" data-dropdown="#action-dropdown-more">
+ <i class="icon-caret-down pull-right"></i>
+ <span ><i class="icon-cog"></i> <?php echo __('More');?></span>
+ </span>
+ <div id="action-dropdown-more" class="action-dropdown anchor-right">
+ <ul id="actions">
+ <li><a class="confirm" data-name="enable" href="templates.php?a=enable">
+ <i class="icon-ok-sign icon-fixed-width"></i>
+ <?php echo __('Enable'); ?></a></li>
+ <li><a class="confirm" data-name="disable" href="templates.php?a=disable">
+ <i class="icon-ban-circle icon-fixed-width"></i>
+ <?php echo __('Disable'); ?></a></li>
+ <li class="danger"><a class="confirm" data-name="delete" href="templates.php?a=delete">
+ <i class="icon-trash icon-fixed-width"></i>
+ <?php echo __('Delete'); ?></a></li>
+ </ul>
+ </div>
+
+</div>
<div class="clear"></div>
-<form action="templates.php" method="POST" name="tpls">
<?php csrf_token(); ?>
<input type="hidden" name="do" value="mass_process" >
<input type="hidden" id="action" name="a" value="" >
@@ -113,11 +133,7 @@ else
if($res && $num): //Show options..
echo '<div> '.__('Page').':'.$pageNav->getPageLinks().' </div>';
?>
-<p class="centered" id="actions">
- <input class="button" type="submit" name="enable" value="<?php echo __('Enable');?>" >
- <input class="button" type="submit" name="disable" value="<?php echo __('Disable');?>" >
- <input class="button" type="submit" name="delete" value="<?php echo __('Delete');?>" >
-</p>
+
<?php
endif;
?>
diff --git a/include/staff/tickets.inc.php b/include/staff/tickets.inc.php
index b7b1983d1..8d6c2bc4a 100644
--- a/include/staff/tickets.inc.php
+++ b/include/staff/tickets.inc.php
@@ -341,12 +341,14 @@ $selected = $mode == $_SESSION[$queue_sort_key]; ?>
});
return false;">
<input type="hidden" name="a" value="search">
- <input type="text" id="basic-ticket-search" name="query"
+ <input type="hidden" name="search-type" value=""/>
+ <div class="attached input">
+ <input type="text" id="basic-ticket-search" name="query"
autofocus size="30" value="<?php echo Format::htmlchars($_REQUEST['query'], true); ?>"
autocomplete="off" autocorrect="off" autocapitalize="off">
- <input type="hidden" name="search-type" value=""/>
- <button type="submit" class="attached button"><i class="icon-search"></i>
+ <button type="submit" class="attached button"><i class="icon-search"></i>
</button>
+ </div>
<a href="#" onclick="javascript:
$.dialog('ajax.php/tickets/search', 201);"
>[<?php echo __('advanced'); ?>]</a>
diff --git a/scp/css/scp.css b/scp/css/scp.css
index a65fb8294..c35426aff 100644
--- a/scp/css/scp.css
+++ b/scp/css/scp.css
@@ -1424,7 +1424,7 @@ caption:hover > i.help-tip {
}
h2 > i.help-tip {
- vertical-align: baseline;
+ vertical-align: middle;
font-size: 1.1em;
}
.form_table th h4 i.help-tip {
@@ -1753,7 +1753,7 @@ input[type="button"],
.action-button,
.button {
cursor: pointer;
- box-sizing: content-box !important;
+ box-sizing: content-box;
display:inline-block;
vertical-align:bottom;
margin:0 4px;
@@ -1790,7 +1790,6 @@ select + .button {
vertical-align: middle;
}
-
.white.button {
background-color: rgba(255,255,255,0.6);
border-color: #555;
@@ -1809,6 +1808,19 @@ select + .button {
border-left: none;
padding: 0 9px;
}
+.input.attached {
+ height: 24px;
+ box-sizing: border-box;
+ display: inline-block;
+}
+.input.attached input {
+ height: 100%;
+ box-sizing: border-box;
+}
+.input.attached .button.attached {
+ height: 100%;
+ box-sizing: border-box;
+}
.green.button:hover {
background-color: inherit;
@@ -2321,7 +2333,7 @@ button a:hover {
tr:hover i.help-tip,
tr i.help-tip.warning {
- opacity: 1;
+ opacity: 0.8 !important;
color: #ffc20f;
}
@@ -2471,6 +2483,13 @@ td.indented {
.sticky.bar.fixed .notsticky {
display: none !important;
}
+
+.sticky.bar.fixed .inline {
+ float:left;
+ display:inline;
+ margin:5px 10px 0 0;
+}
+
.sticky.bar.opaque {
background-color: white;
}
@@ -2682,7 +2701,7 @@ table.grid.form caption {
margin: -10px 0;
margin-bottom: 5px;
padding: 8px;
- box-shadow: inset 0 4px 12px -11px black;
+ box-shadow: inset 0 4px 12px -10px black;
border-bottom: 1px dotted #aaa;
border-radius: 0 0 5px 5px;
}
diff --git a/scp/emailtest.php b/scp/emailtest.php
index cd9fbae9d..5bd65e319 100644
--- a/scp/emailtest.php
+++ b/scp/emailtest.php
@@ -126,7 +126,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</tr>
</tbody>
</table>
-<p style="padding-left:225px;">
+<p style="text-align:center;">
<input type="submit" name="submit" value="<?php echo __('Send Message');?>">
<input type="reset" name="reset" value="<?php echo __('Reset');?>">
<input type="button" name="cancel" value="<?php echo __('Cancel');?>" onclick='window.location.href="emails.php"'>
--
GitLab