From 40a7f1ce4372d202889ef9d4128a600620cf78fb Mon Sep 17 00:00:00 2001
From: Nathan Febuary <nathan@bedheadcreative.com>
Date: Wed, 29 Jul 2015 18:13:19 -0500
Subject: [PATCH] Changes to most pages, buttons, headers, titles, dropdowns,
and tabs other various UI issues.
---
include/client/profile.inc.php | 2 +-
include/client/view.inc.php | 2 +-
include/ost-sampleconfig.php | 129 -------------
include/staff/apikey.inc.php | 3 +-
include/staff/apikeys.inc.php | 61 +++---
include/staff/banlist.inc.php | 205 +++++++++++----------
include/staff/banrule.inc.php | 4 +-
include/staff/cannedresponse.inc.php | 2 +-
include/staff/cannedresponses.inc.php | 52 ++++--
include/staff/categories.inc.php | 61 +++---
include/staff/dashboard.inc.php | 83 +++++++++
include/staff/department.inc.php | 8 +-
include/staff/departments.inc.php | 1 -
include/staff/directory.inc.php | 27 ++-
include/staff/dynamic-form.inc.php | 9 +-
include/staff/dynamic-forms.inc.php | 42 +++--
include/staff/dynamic-list.inc.php | 9 +-
include/staff/dynamic-lists.inc.php | 40 ++--
include/staff/email.inc.php | 10 +-
include/staff/emails.inc.php | 43 +++--
include/staff/faq-categories.inc.php | 3 +
include/staff/filter.inc.php | 8 +-
include/staff/filters.inc.php | 60 +++---
include/staff/helptopic.inc.php | 8 +-
include/staff/helptopics.inc.php | 86 +++++----
include/staff/org-view.inc.php | 12 +-
include/staff/orgs.inc.php | 84 +++++----
include/staff/page.inc.php | 9 +-
include/staff/pages.inc.php | 66 ++++---
include/staff/plugins.inc.php | 58 +++---
include/staff/profile.inc.php | 10 +-
include/staff/role.inc.php | 8 +-
include/staff/roles.inc.php | 1 -
include/staff/settings-alerts.inc.php | 9 +-
include/staff/settings-autoresp.inc.php | 3 +-
include/staff/settings-emails.inc.php | 1 -
include/staff/settings-kb.inc.php | 1 -
include/staff/settings-pages.inc.php | 184 +++++++++---------
include/staff/settings-system.inc.php | 1 -
include/staff/settings-tickets.inc.php | 2 -
include/staff/slaplan.inc.php | 8 +-
include/staff/slaplans.inc.php | 62 ++++---
include/staff/staff.inc.php | 10 +-
include/staff/staffmembers.inc.php | 128 +++++++------
include/staff/syslogs.inc.php | 64 ++++---
include/staff/tasks.inc.php | 32 ++--
include/staff/team.inc.php | 9 +-
include/staff/teams.inc.php | 1 -
include/staff/template.inc.php | 8 +-
include/staff/templates.inc.php | 63 ++++---
include/staff/templates/task-view.tmpl.php | 17 +-
include/staff/templates/tickets.tmpl.php | 18 +-
include/staff/templates/users.tmpl.php | 24 ++-
include/staff/ticket-edit.inc.php | 32 ++--
include/staff/ticket-open.inc.php | 13 +-
include/staff/ticket-view.inc.php | 10 +-
include/staff/tickets.inc.php | 19 +-
include/staff/user-view.inc.php | 2 +-
include/staff/users.inc.php | 139 +++++++-------
scp/css/scp.css | 43 +++--
scp/dashboard.php | 50 +----
scp/js/dashboard.inc.js | 4 +-
scp/js/scp.js | 14 +-
63 files changed, 1140 insertions(+), 1037 deletions(-)
delete mode 100644 include/ost-sampleconfig.php
create mode 100644 include/staff/dashboard.inc.php
diff --git a/include/client/profile.inc.php b/include/client/profile.inc.php
index 713551110..5a72f5710 100644
--- a/include/client/profile.inc.php
+++ b/include/client/profile.inc.php
@@ -54,7 +54,7 @@ $selected = ($info['lang'] == $l['code']) ? 'selected="selected"' : ''; ?>
<?php }
if ($acct->isPasswdResetEnabled()) { ?>
<tr>
- <td colspan=2">
+ <td colspan="2">
<div><hr><h3><?php echo __('Access Credentials'); ?></h3></div>
</td>
</tr>
diff --git a/include/client/view.inc.php b/include/client/view.inc.php
index 97c3bb8ef..610bd2e92 100644
--- a/include/client/view.inc.php
+++ b/include/client/view.inc.php
@@ -17,7 +17,7 @@ if ($thisclient && $thisclient->isGuest()
<div id="msg_info">
<i class="icon-compass icon-2x pull-left"></i>
- <strong><?php echo __('Looking for your other tickets?'); ?></strong></br>
+ <strong><?php echo __('Looking for your other tickets?'); ?></strong><br />
<a href="<?php echo ROOT_PATH; ?>login.php?e=<?php
echo urlencode($thisclient->getEmail());
?>" style="text-decoration:underline"><?php echo __('Sign In'); ?></a>
diff --git a/include/ost-sampleconfig.php b/include/ost-sampleconfig.php
deleted file mode 100644
index 0b2640069..000000000
--- a/include/ost-sampleconfig.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/*********************************************************************
- ost-config.php
-
- Static osTicket configuration file. Mainly useful for mysql login info.
- Created during installation process and shouldn't change even on upgrades.
-
- Peter Rotich <peter@osticket.com>
- Copyright (c) 2006-2010 osTicket
- http://www.osticket.com
-
- Released under the GNU General Public License WITHOUT ANY WARRANTY.
- See LICENSE.TXT for details.
-
- vim: expandtab sw=4 ts=4 sts=4:
- $Id: $
-**********************************************************************/
-
-#Disable direct access.
-if(!strcasecmp(basename($_SERVER['SCRIPT_NAME']),basename(__FILE__)) || !defined('INCLUDE_DIR'))
- die('kwaheri rafiki!');
-
-#Install flag
-define('OSTINSTALLED',FALSE);
-if(OSTINSTALLED!=TRUE){
- if(!file_exists(ROOT_DIR.'setup/install.php')) die('Error: Contact system admin.'); //Something is really wrong!
- //Invoke the installer.
- header('Location: '.ROOT_PATH.'setup/install.php');
- exit;
-}
-
-# Encrypt/Decrypt secret key - randomly generated during installation.
-define('SECRET_SALT','%CONFIG-SIRI');
-
-#Default admin email. Used only on db connection issues and related alerts.
-define('ADMIN_EMAIL','%ADMIN-EMAIL');
-
-# Database Options
-# ---------------------------------------------------
-# Mysql Login info
-define('DBTYPE','mysql');
-define('DBHOST','%CONFIG-DBHOST');
-define('DBNAME','%CONFIG-DBNAME');
-define('DBUSER','%CONFIG-DBUSER');
-define('DBPASS','%CONFIG-DBPASS');
-
-# Table prefix
-define('TABLE_PREFIX','%CONFIG-PREFIX');
-
-#
-# SSL Options
-# ---------------------------------------------------
-# SSL options for MySQL can be enabled by adding a certificate allowed by
-# the database server here. To use SSL, you must have a client certificate
-# signed by a CA (certificate authority). You can easily create this
-# yourself with the EasyRSA suite. Give the public CA certificate, and both
-# the public and private parts of your client certificate below.
-#
-# Once configured, you can ask MySQL to require the certificate for
-# connections:
-#
-# > create user osticket;
-# > grant all on osticket.* to osticket require subject '<subject>';
-#
-# More information (to-be) available in doc/security/hardening.md
-
-# define('DBSSLCA','/path/to/ca.crt');
-# define('DBSSLCERT','/path/to/client.crt');
-# define('DBSSLKEY','/path/to/client.key');
-
-#
-# Mail Options
-# ---------------------------------------------------
-# Option: MAIL_EOL (default: \n)
-#
-# Some mail setups do not handle emails with \r\n (CRLF) line endings for
-# headers and base64 and quoted-response encoded bodies. This is an error
-# and a violation of the internet mail RFCs. However, because this is also
-# outside the control of both osTicket development and many server
-# administrators, this option can be adjusted for your setup. Many folks who
-# experience blank or garbled email from osTicket can adjust this setting to
-# use "\n" (LF) instead of the CRLF default.
-#
-# References:
-# http://www.faqs.org/rfcs/rfc2822.html
-# https://github.com/osTicket/osTicket-1.8/issues/202
-# https://github.com/osTicket/osTicket-1.8/issues/700
-# https://github.com/osTicket/osTicket-1.8/issues/759
-# https://github.com/osTicket/osTicket-1.8/issues/1217
-
-# define(MAIL_EOL, "\r\n");
-
-#
-# HTTP Server Options
-# ---------------------------------------------------
-# Option: ROOT_PATH (default: <auto detect>, fallback: /)
-#
-# If you have a strange HTTP server configuration and osTicket cannot
-# discover the URL path of where your osTicket is installed, define
-# ROOT_PATH here.
-#
-# The ROOT_PATH is the part of the URL used to access your osTicket
-# helpdesk before the '/scp' part and after the hostname. For instance, for
-# http://mycompany.com/support', the ROOT_PATH should be '/support/'
-#
-# ROOT_PATH *must* end with a forward-slash!
-
-# define('ROOT_PATH', '/support/');
-
-#
-# Session Storage Options
-# ---------------------------------------------------
-# Option: SESSION_BACKEND (default: db)
-#
-# osTicket supports Memcache as a session storage backend if the `memcache`
-# pecl extesion is installed. This also requires MEMCACHE_SERVERS to be
-# configured as well.
-#
-# MEMCACHE_SERVERS can be defined as a comma-separated list of host:port
-# specifications. If more than one server is listed, the session is written
-# to all of the servers for redundancy.
-#
-# Values: 'db' (default)
-# 'memcache' (Use Memcache servers)
-# 'system' (use PHP settings as configured (not recommended!))
-#
-# define('SESSION_BACKEND', 'memcache');
-# define('MEMCACHE_SERVERS', 'server1:11211,server2:11211');
-?>
diff --git a/include/staff/apikey.inc.php b/include/staff/apikey.inc.php
index 5096c5150..827c45871 100644
--- a/include/staff/apikey.inc.php
+++ b/include/staff/apikey.inc.php
@@ -22,14 +22,13 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<input type="hidden" name="do" value="<?php echo $action; ?>">
<input type="hidden" name="a" value="<?php echo Format::htmlchars($_REQUEST['a']); ?>">
<input type="hidden" name="id" value="<?php echo $info['id']; ?>">
- <h2><?php echo __('API Key');?>
+ <h2><?php echo $title; ?>
<i class="help-tip icon-question-sign" href="#api_key"></i>
</h2>
<table class="form_table" width="940" border="0" cellspacing="0" cellpadding="2">
<thead>
<tr>
<th colspan="2">
- <h4><?php echo $title; ?></h4>
<em><?php echo __('API Key is auto-generated. Delete and re-add to change the key.');?></em>
</th>
</tr>
diff --git a/include/staff/apikeys.inc.php b/include/staff/apikeys.inc.php
index 749db038e..5e3d24b4b 100644
--- a/include/staff/apikeys.inc.php
+++ b/include/staff/apikeys.inc.php
@@ -41,36 +41,47 @@ else
?>
<form action="apikeys.php" method="POST" name="keys">
-
-<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;">
- <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 class="sticky bar opaque">
+ <div class="content">
+ <div class="pull-left flush-left">
+ <h2><?php echo __('API Keys');?></h2>
+ </div>
+ <div class="pull-right">
+ <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>
</div>
-</div>
-<div class="clear"></div>
+ <div class="clear"></div>
<?php 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">
- <caption><?php echo $showing; ?></caption>
<thead>
<tr>
<th width="7"> </th>
diff --git a/include/staff/banlist.inc.php b/include/staff/banlist.inc.php
index 1415b6121..9fb46b64e 100644
--- a/include/staff/banlist.inc.php
+++ b/include/staff/banlist.inc.php
@@ -48,113 +48,118 @@ $qstr.='&order='.($order=='DESC'?'ASC':'DESC');
$query="$select $from $where ORDER BY $order_by LIMIT ".$pageNav->getStart().",".$pageNav->getLimit();
//echo $query;
?>
-<h2><?php echo __('Banned Email Addresses');?>
- <i class="help-tip icon-question-sign" href="#ban_list"></i>
- </h2>
-<div class="pull-left" style="margin-bottom:5px;">
- <form action="banlist.php" method="GET" name="filter">
- <input type="hidden" name="a" value="filter" >
- <div>
- <?php echo __('Query');?>:
- <input name="q" type="search" size="30" autofocus
- value="<?php echo Format::htmlchars($_REQUEST['q']); ?>">
- <input type="submit" name="submit" value="<?php echo __('Search');?>"/>
- </div>
- </form>
- </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 id='basic_search'>
+ <div style="height:25px">
+ <form action="banlist.php" method="GET" name="filter">
+ <input type="hidden" name="a" value="filter" >
+ <div class="attached input">
+ <input name="q" type="search" class="basic-search" size="30" autofocus
+ value="<?php echo Format::htmlchars($_REQUEST['q']); ?>">
+ <button type="submit" class="attached button"><i class="icon-search"></i></button>
+ </div>
+ </form>
</div>
</div>
<div class="clear"></div>
-<?php
-if(($res=db_query($query)) && ($num=db_num_rows($res)))
- $showing=$pageNav->showing();
-else
- $showing=__('No banned emails matching the query found!');
+<form action="banlist.php" method="POST" name="banlist">
+ <div style="margin-bottom:20px; padding-top:5px;">
+ <div class="sticky bar opaque">
+ <div class="content">
+ <div class="pull-left flush-left">
+ <h2><?php echo __('Banned Email Addresses');?>
+ <i class="help-tip icon-question-sign" href="#ban_list"></i>
+ </h2>
+ </div>
+ <div class="pull-right flush-right">
+ <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>
+ </div>
+ </div>
+ <div class="clear"></div>
+ <?php
+ if(($res=db_query($query)) && ($num=db_num_rows($res)))
+ $showing=$pageNav->showing();
+ else
+ $showing=__('No banned emails matching the query found!');
-if($search)
- $showing=__('Search Results').': '.$showing;
+ if($search)
+ $showing=__('Search Results').': '.$showing;
-?>
- <?php 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">
- <caption><?php echo $showing; ?></caption>
- <thead>
- <tr>
- <th width="7px"> </th>
- <th width="350"><a <?php echo $email_sort; ?> href="staff.php?<?php echo $qstr; ?>&sort=email"><?php echo __('Email Address');?></a></th>
- <th width="200"><a <?php echo $status_sort; ?> href="staff.php?<?php echo $qstr; ?>&sort=status"><?php echo __('Ban Status');?></a></th>
- <th width="120"><a <?php echo $created_sort; ?> href="staff.php?<?php echo $qstr; ?>&sort=created"><?php echo __('Date Added');?></a></th>
- <th width="120"><a <?php echo $updated_sort; ?> href="staff.php?<?php echo $qstr; ?>&sort=updated"><?php echo __('Last Updated');?></a></th>
- </tr>
- </thead>
- <tbody>
+ ?>
+ <?php 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">
+ <thead>
+ <tr>
+ <th width="7px"> </th>
+ <th width="350"><a <?php echo $email_sort; ?> href="staff.php?<?php echo $qstr; ?>&sort=email"><?php echo __('Email Address');?></a></th>
+ <th width="200"><a <?php echo $status_sort; ?> href="staff.php?<?php echo $qstr; ?>&sort=status"><?php echo __('Ban Status');?></a></th>
+ <th width="120"><a <?php echo $created_sort; ?> href="staff.php?<?php echo $qstr; ?>&sort=created"><?php echo __('Date Added');?></a></th>
+ <th width="120"><a <?php echo $updated_sort; ?> href="staff.php?<?php echo $qstr; ?>&sort=updated"><?php echo __('Last Updated');?></a></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php
+ if($res && db_num_rows($res)):
+ $ids=($errors && is_array($_POST['ids']))?$_POST['ids']:null;
+ while ($row = db_fetch_array($res)) {
+ $sel=false;
+ if($ids && in_array($row['id'],$ids))
+ $sel=true;
+ ?>
+ <tr id="<?php echo $row['id']; ?>">
+ <td width=7px>
+ <input type="checkbox" class="ckb" name="ids[]" value="<?php echo $row['id']; ?>" <?php echo $sel?'checked="checked"':''; ?>>
+ </td>
+ <td> <a href="banlist.php?id=<?php echo $row['id']; ?>"><?php echo Format::htmlchars($row['val']); ?></a></td>
+ <td> <?php echo $row['isactive']?__('Active'):'<b>'.__('Disabled').'</b>'; ?></td>
+ <td><?php echo Format::date($row['created']); ?></td>
+ <td><?php echo Format::datetime($row['updated']); ?> </td>
+ </tr>
+ <?php
+ } //end of while.
+ endif; ?>
+ <tfoot>
+ <tr>
+ <td colspan="5">
+ <?php if($res && $num){ ?>
+ <?php echo __('Select');?>:
+ <a id="selectAll" href="#ckb"><?php echo __('All');?></a>
+ <a id="selectNone" href="#ckb"><?php echo __('None');?></a>
+ <a id="selectToggle" href="#ckb"><?php echo __('Toggle');?></a>
+ <?php }else{
+ echo __('No banned emails found!');
+ } ?>
+ </td>
+ </tr>
+ </tfoot>
+ </table>
<?php
- if($res && db_num_rows($res)):
- $ids=($errors && is_array($_POST['ids']))?$_POST['ids']:null;
- while ($row = db_fetch_array($res)) {
- $sel=false;
- if($ids && in_array($row['id'],$ids))
- $sel=true;
- ?>
- <tr id="<?php echo $row['id']; ?>">
- <td width=7px>
- <input type="checkbox" class="ckb" name="ids[]" value="<?php echo $row['id']; ?>" <?php echo $sel?'checked="checked"':''; ?>>
- </td>
- <td> <a href="banlist.php?id=<?php echo $row['id']; ?>"><?php echo Format::htmlchars($row['val']); ?></a></td>
- <td> <?php echo $row['isactive']?__('Active'):'<b>'.__('Disabled').'</b>'; ?></td>
- <td><?php echo Format::date($row['created']); ?></td>
- <td><?php echo Format::datetime($row['updated']); ?> </td>
- </tr>
- <?php
- } //end of while.
- endif; ?>
- <tfoot>
- <tr>
- <td colspan="5">
- <?php if($res && $num){ ?>
- <?php echo __('Select');?>:
- <a id="selectAll" href="#ckb"><?php echo __('All');?></a>
- <a id="selectNone" href="#ckb"><?php echo __('None');?></a>
- <a id="selectToggle" href="#ckb"><?php echo __('Toggle');?></a>
- <?php }else{
- echo __('No banned emails found!');
- } ?>
- </td>
- </tr>
- </tfoot>
-</table>
-<?php
-if($res && $num): //Show options..
- echo '<div> '.__('Page').':'.$pageNav->getPageLinks().' </div>';
-?>
-
-<?php
-endif;
-?>
+ if($res && $num): //Show options..
+ echo '<div> '.__('Page').':'.$pageNav->getPageLinks().' </div>';
+ ?>
+ <?php
+ endif;
+ ?>
</form>
-
<div style="display:none;" class="dialog" id="confirm-action">
<h3><?php echo __('Please Confirm');?></h3>
<a class="close" href=""><i class="icon-remove-circle"></i></a>
diff --git a/include/staff/banrule.inc.php b/include/staff/banrule.inc.php
index 4f98cd148..1e433ee89 100644
--- a/include/staff/banrule.inc.php
+++ b/include/staff/banrule.inc.php
@@ -24,14 +24,14 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<input type="hidden" name="do" value="<?php echo $action; ?>">
<input type="hidden" name="a" value="<?php echo Format::htmlchars($_REQUEST['a']); ?>">
<input type="hidden" name="id" value="<?php echo $info['id']; ?>">
- <h2><?php echo __('Manage Email Ban Rule');?>
+
+ <h2><?php echo $title; ?>
<i class="help-tip icon-question-sign" href="#ban_list"></i>
</h2>
<table class="form_table" width="940" border="0" cellspacing="0" cellpadding="2">
<thead>
<tr>
<th colspan="2">
- <h4><?php echo $title; ?></h4>
<em><?php echo __('Valid email address required');?></em>
</th>
</tr>
diff --git a/include/staff/cannedresponse.inc.php b/include/staff/cannedresponse.inc.php
index 930052225..72fa3c504 100644
--- a/include/staff/cannedresponse.inc.php
+++ b/include/staff/cannedresponse.inc.php
@@ -118,7 +118,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<div id="msg_warning"><?php echo __('Canned response is in use by email filter(s)');?>: <?php
echo implode(', ', $canned->getFilters()); ?></div>
<?php } ?>
-<p style="padding-left:225px;">
+<p style="text-align:center;">
<input type="submit" name="submit" value="<?php echo $submit_text; ?>">
<input type="reset" name="reset" value="<?php echo __('Reset'); ?>" onclick="javascript:
$(this.form).find('textarea.richtext')
diff --git a/include/staff/cannedresponses.inc.php b/include/staff/cannedresponses.inc.php
index bca9ee17c..46b89958c 100644
--- a/include/staff/cannedresponses.inc.php
+++ b/include/staff/cannedresponses.inc.php
@@ -50,18 +50,50 @@ else
$showing=__('No premade responses found!');
?>
-<div class="pull-left" style="width:700px;padding-top:5px;">
- <h2><?php echo __('Canned Responses');?></h2>
- </div>
-<div class="pull-right flush-right" style="padding-top:5px;padding-right:5px;">
- <b><a href="canned.php?a=add" class="Icon newReply"><?php echo __('Add New Response');?></a></b></div>
-<div class="clear"></div>
<form action="canned.php" method="POST" name="canned">
+
+<div class="sticky bar opaque">
+ <div class="content">
+ <div class="pull-left flush-left">
+ <h2><?php echo __('Canned Responses');?></h2>
+ </div>
+ <div class="pull-right flush-right">
+ <a href="canned.php?a=add" class="green button"><i class="icon-plus-sign"></i> <?php echo __('Add New Response');?></a>
+
+ <span class="action-button" data-dropdown="#action-dropdown-more" style="/*DELME*/ vertical-align:top; margin-bottom:0">
+ <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="canned.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="canned.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="canned.php?a=delete">
+ <i class="icon-trash icon-fixed-width"></i>
+ <?php echo __( 'Delete'); ?>
+ </a>
+ </li>
+ </ul>
+ </div>
+ </div>
+ </div>
+</div>
+<div class="clear"></div>
<?php 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">
- <caption><?php echo $showing; ?></caption>
<thead>
<tr>
<th width="7"> </th>
@@ -116,11 +148,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/categories.inc.php b/include/staff/categories.inc.php
index 509228e0a..7826e21c7 100644
--- a/include/staff/categories.inc.php
+++ b/include/staff/categories.inc.php
@@ -36,36 +36,43 @@ else
$showing=__('No FAQ categories found!');
?>
-<div class="pull-right flush-right">
- <a href="categories.php?a=add" class="green button">
- <i class="icon-plus-sign"></i> <?php echo __('Add New Category');?>
- </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-form-id="mass-actions" data-name="delete" href="categories.php?a=delete">
- <i class="icon-trash icon-fixed-width"></i>
- <?php echo __('Delete'); ?></a></li>
- </ul>
- </div>
-</div>
-
-<div class="pull-left">
- <h2><?php echo __('FAQ Categories');?></h2>
-</div>
-
-
-<div class="clear"></div>
<form action="categories.php" method="POST" id="mass-actions">
- <?php csrf_token(); ?>
- <input type="hidden" name="do" value="mass_process" >
- <input type="hidden" id="action" name="a" value="" >
+ <div class="sticky bar opaque">
+ <div class="content">
+ <div class="pull-left flush-left">
+ <h2><?php echo __('FAQ Categories');?></h2>
+ </div>
+ <div class="pull-right flush-right">
+ <a href="categories.php?a=add" class="green button">
+ <i class="icon-plus-sign"></i>
+ <?php echo __( 'Add New Category');?>
+ </a>
+ <div class="pull-right flush-right">
+
+ <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-form-id="mass-actions" data-name="delete" href="categories.php?a=delete">
+ <i class="icon-trash icon-fixed-width"></i>
+ <?php echo __( 'Delete'); ?>
+ </a>
+ </li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="clear"></div>
+ <?php 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">
- <caption><?php echo $showing; ?></caption>
<thead>
<tr>
<th width="7"> </th>
diff --git a/include/staff/dashboard.inc.php b/include/staff/dashboard.inc.php
new file mode 100644
index 000000000..7e760cab2
--- /dev/null
+++ b/include/staff/dashboard.inc.php
@@ -0,0 +1,83 @@
+<script type="text/javascript" src="js/raphael-min.js"></script>
+<script type="text/javascript" src="js/g.raphael.js"></script>
+<script type="text/javascript" src="js/g.line-min.js"></script>
+<script type="text/javascript" src="js/g.dot-min.js"></script>
+<script type="text/javascript" src="js/bootstrap-tab.js"></script>
+<script type="text/javascript" src="js/dashboard.inc.js"></script>
+
+<!--<link rel="stylesheet" type="text/css" href="css/bootstrap.css"/>-->
+<link rel="stylesheet" type="text/css" href="css/dashboard.css"/>
+
+<div id="basic_search">
+ <div style="min-height:25px;">
+ <!--<p><?php //echo __('Select the starting time and period for the system activity graph');?></p>-->
+ <form class="form-inline" id="timeframe-form">
+ <i class="help-tip icon-question-sign" href="#report_timeframe"></i>
+ <label>
+ <?php echo __( 'Report timeframe'); ?>:
+ <input type="text" class="dp input-medium search-query" name="start" placeholder="<?php echo __('Last month');?>" />
+ </label>
+ <label>
+ <?php echo __( 'period');?>:
+ <select name="period">
+ <option value="now" selected="selected">
+ <?php echo __( 'Up to today');?>
+ </option>
+ <option value="+7 days">
+ <?php echo __( 'One Week');?>
+ </option>
+ <option value="+14 days">
+ <?php echo __( 'Two Weeks');?>
+ </option>
+ <option value="+1 month">
+ <?php echo __( 'One Month');?>
+ </option>
+ <option value="+3 months">
+ <?php echo __( 'One Quarter');?>
+ </option>
+ </select>
+ </label>
+ <button class="green button action-button muted" type="submit">
+ <?php echo __( 'Refresh');?>
+ </button>
+ </form>
+ </div>
+</div>
+<div class="clear"></div>
+<div style="margin-bottom:20px; padding-top:5px;">
+ <div class="pull-left flush-left">
+ <h2><?php echo __('Ticket Activity');
+ ?> <i class="help-tip icon-question-sign" href="#ticket_activity"></i></h2>
+ </div>
+</div>
+<div class="clear"></div>
+<!-- Create a graph and fetch some data to create pretty dashboard -->
+<div style="position:relative">
+ <div id="line-chart-here" style="height:300px"></div>
+ <div style="position:absolute;right:0;top:0" id="line-chart-legend"></div>
+</div>
+
+<hr/>
+<h2><?php echo __('Statistics'); ?> <i class="help-tip icon-question-sign" href="#statistics"></i></h2>
+<p><?php echo __('Statistics of tickets organized by department, help topic, and agent.');?></p>
+<ul class="tabs">
+ <li class="active">
+ <a href="#departments"><?php echo __('Departments'); ?></a>
+ </li>
+ <li>
+ <a href="#topics"><?php echo __('Topics'); ?></a>
+ </li>
+ <li>
+ <a href="#agents"><?php echo __('Agents'); ?></a>
+ </li>
+</ul>
+<!--============= DEPARTMENTS ==============-->
+<div class="tab_content" id="departments">Department content goes here</div>
+<!--============= TOPICS ==============-->
+<div class="tab_content hidden" id="topics">Topics content goes here</div>
+<!--============= AGENTS ==============-->
+<div class="tab_content hidden" id="agents">Agents content goes here</div>
+
+<div id="table-here"></div>
+
+<?php
diff --git a/include/staff/department.inc.php b/include/staff/department.inc.php
index 62882a14c..d65c99a0d 100644
--- a/include/staff/department.inc.php
+++ b/include/staff/department.inc.php
@@ -3,7 +3,7 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin()) die('Access
$info = $qs = array();
if($dept && $_REQUEST['a']!='add') {
//Editing Department.
- $title=__('Update Department');
+ $title=__('Update Department –');
$action='update';
$submit_text=__('Save Changes');
$info = $dept->getInfo();
@@ -31,7 +31,10 @@ $info = Format::htmlchars(($errors && $_POST) ? $_POST : $info);
<input type="hidden" name="do" value="<?php echo $action; ?>">
<input type="hidden" name="a" value="<?php echo Format::htmlchars($_REQUEST['a']); ?>">
<input type="hidden" name="id" value="<?php echo $info['id']; ?>">
- <h2><?php echo __('Department');?></h2>
+<h2><?php echo $title; ?>
+ <?php if ($info) { ?> <span class="ltr"><?php echo $info['name']; ?></span>
+ <?php } ?>
+</h2>
<ul class="clean tabs">
<li class="active"><a href="#settings">
<i class="icon-file"></i> <?php echo __('Settings'); ?></a></li>
@@ -43,7 +46,6 @@ $info = Format::htmlchars(($errors && $_POST) ? $_POST : $info);
<thead>
<tr>
<th colspan="2">
- <h4><?php echo $title; ?></h4>
<em><?php echo __('Department Information');?></em>
</th>
</tr>
diff --git a/include/staff/departments.inc.php b/include/staff/departments.inc.php
index 6e3076fc9..09711227c 100644
--- a/include/staff/departments.inc.php
+++ b/include/staff/departments.inc.php
@@ -66,7 +66,6 @@ $showing = $pageNav->showing().' '._N('department', 'departments', $count);
<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">
- <caption><?php echo $showing; ?></caption>
<thead>
<tr>
<th width="7px"> </th>
diff --git a/include/staff/directory.inc.php b/include/staff/directory.inc.php
index 361c90121..b6996e25a 100644
--- a/include/staff/directory.inc.php
+++ b/include/staff/directory.inc.php
@@ -74,9 +74,9 @@ $pageNav->paginate($agents);
$qstr.='&order='.($order=='DESC' ? 'ASC' : 'DESC');
?>
-<h2><?php echo __('Agents');?>
- <i class="help-tip icon-question-sign" href="#staff_members"></i></h2>
-<div class="pull-left" style="width:700px">
+
+<div id="basic_search">
+ <div style="min-height:25px;">
<form action="directory.php" method="GET" name="filter">
<input type="text" name="q" value="<?php echo Format::htmlchars($_REQUEST['q']); ?>" >
<select name="did" id="did">
@@ -93,15 +93,22 @@ $qstr.='&order='.($order=='DESC' ? 'ASC' : 'DESC');
<i class="help-tip icon-question-sign" href="#apply_filtering_criteria"></i>
</form>
</div>
+</div>
<div class="clear"></div>
-<?php
-if ($agents->exists(true))
- $showing=$pageNav->showing();
-else
- $showing=__('No agents found!');
-?>
+<div style="margin-bottom:20px; padding-top:5px;">
+ <div class="pull-left flush-left">
+ <h2><?php echo __('Agents');?>
+ <i class="help-tip icon-question-sign" href="#staff_members"></i>
+ </h2>
+ </div>
+</div>
+ <?php
+ if ($agents->exists(true))
+ $showing=$pageNav->showing();
+ else
+ $showing=__('No agents found!');
+ ?>
<table class="list" border="0" cellspacing="1" cellpadding="0" width="940">
- <caption><?php echo $showing; ?></caption>
<thead>
<tr>
<th width="160"><a <?php echo $name_sort; ?> href="directory.php?<?php echo $qstr; ?>&sort=name"><?php echo __('Name');?></a></th>
diff --git a/include/staff/dynamic-form.inc.php b/include/staff/dynamic-form.inc.php
index ed2ec1e4c..4b1bcde2a 100644
--- a/include/staff/dynamic-form.inc.php
+++ b/include/staff/dynamic-form.inc.php
@@ -2,7 +2,7 @@
$info=array();
if($form && $_REQUEST['a']!='add') {
- $title = __('Update form section');
+ $title = __('Update form section –');
$action = 'update';
$url = "?id=".urlencode($_REQUEST['id']);
$submit_text=__('Save Changes');
@@ -36,12 +36,15 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<input type="hidden" name="do" value="<?php echo $action; ?>">
<input type="hidden" name="a" value="<?php echo $action; ?>">
<input type="hidden" name="id" value="<?php echo $info['id']; ?>">
- <h2><?php echo $form ? Format::htmlchars($form->getTitle()) : __('Custom Form'); ?></h2>
+
+ <h2><?php echo $title; ?>
+ <?php if ($form) { ?> <span class="ltr"><?php echo $form->getTitle(); ?></span>
+ <?php } ?>
+ </h2>
<table class="form_table" width="940" border="0" cellspacing="0" cellpadding="2">
<thead>
<tr>
<th colspan="2">
- <h4><?php echo $title; ?></h4>
<em><?php echo __(
'Forms are used to allow for collection of custom data'
); ?></em>
diff --git a/include/staff/dynamic-forms.inc.php b/include/staff/dynamic-forms.inc.php
index 65bcc43c6..fbb7e75ad 100644
--- a/include/staff/dynamic-forms.inc.php
+++ b/include/staff/dynamic-forms.inc.php
@@ -1,24 +1,29 @@
<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;">
-<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 class="sticky bar opaque">
+ <div class="content">
+ <div class="pull-left flush-left">
+ <h2><?php echo __('Custom Forms'); ?></h2>
+ </div>
+ <div class="pull-right flush-right">
+ <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>
-
</div>
<div class="clear"></div>
@@ -66,7 +71,6 @@ $showing=$pageNav->showing().' '._N('form','forms',$count);
<?php } ?>
</tbody>
<tbody>
- <caption><?php echo $showing; ?></caption>
<thead>
<tr>
<th width="7"> </th>
diff --git a/include/staff/dynamic-list.inc.php b/include/staff/dynamic-list.inc.php
index cfc87a59d..58d19a092 100644
--- a/include/staff/dynamic-list.inc.php
+++ b/include/staff/dynamic-list.inc.php
@@ -24,9 +24,11 @@ $info=Format::htmlchars(($errors && $_POST) ? array_merge($info,$_POST) : $info)
<input type="hidden" name="do" value="<?php echo $action; ?>">
<input type="hidden" name="a" value="<?php echo Format::htmlchars($_REQUEST['a']); ?>">
<input type="hidden" name="id" value="<?php echo $info['id']; ?>">
- <h2><?php echo __('Custom List'); ?>
- <?php echo $list ? $list->getName() : __('Add new list'); ?></h2>
-
+ <h2><?php echo $title; ?>
+ <?php if ($list) { ?>
+ – <span class="ltr"><?php echo $list ? $list->getName() : __('Custom list'); ?></span>
+ <?php } ?>
+ </h2>
<ul class="clean tabs" id="list-tabs">
<li <?php if (!$list) echo 'class="active"'; ?>><a href="#definition">
<i class="icon-plus"></i> <?php echo __('Definition'); ?></a></li>
@@ -43,7 +45,6 @@ $info=Format::htmlchars(($errors && $_POST) ? array_merge($info,$_POST) : $info)
<thead>
<tr>
<th colspan="2">
- <h4><?php echo $title; ?></h4>
<em><?php echo __(
'Custom lists are used to provide drop-down lists for custom forms.'
); ?> <i class="help-tip icon-question-sign" href="#custom_lists"></i></em>
diff --git a/include/staff/dynamic-lists.inc.php b/include/staff/dynamic-lists.inc.php
index a31784452..93197c79d 100644
--- a/include/staff/dynamic-lists.inc.php
+++ b/include/staff/dynamic-lists.inc.php
@@ -1,22 +1,29 @@
<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;">
- <a href="lists.php?a=add" class="green button action-button"><i class="icon-plus-sign"></i> <?php
- echo __('Add New Custom List'); ?></a>
+<div class="sticky bar opaque">
+ <div class="content">
+ <div class="pull-left flush-left">
+ <h2><?php echo __('Custom Lists'); ?></h2>
+ </div>
+ <div class="pull-right flush-right">
+ <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>
+ <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>
</div>
<div class="clear"></div>
@@ -33,7 +40,6 @@ $showing=$pageNav->showing().' '._N('custom list', 'custom lists', $count);
<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">
- <caption>Custom Lists</caption>
<thead>
<tr>
<th width="7"> </th>
diff --git a/include/staff/email.inc.php b/include/staff/email.inc.php
index 5cc183baa..904b00181 100644
--- a/include/staff/email.inc.php
+++ b/include/staff/email.inc.php
@@ -2,7 +2,7 @@
if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin()) die('Access Denied');
$info = $qs = array();
if($email && $_REQUEST['a']!='add'){
- $title=__('Update Email');
+ $title=__('Update Email Address –');
$action='update';
$submit_text=__('Save Changes');
$info=$email->getInfo();
@@ -18,7 +18,7 @@ if($email && $_REQUEST['a']!='add'){
$qs += array('id' => $email->getId());
}else {
- $title=__('Add New Email');
+ $title=__('Add New Email Address');
$action='create';
$submit_text=__('Submit');
$info['ispublic']=isset($info['ispublic'])?$info['ispublic']:1;
@@ -34,7 +34,10 @@ if($email && $_REQUEST['a']!='add'){
}
$info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
?>
-<h2><?php echo __('Email Address');?></h2>
+<h2><?php echo $title; ?>
+ <?php if ($info) { ?> <span class="ltr"><?php echo $info['email']; ?></span>
+ <?php } ?>
+</h2>
<form action="emails.php?<?php echo Http::build_query($qs); ?>" method="post" id="save">
<?php csrf_token(); ?>
<input type="hidden" name="do" value="<?php echo $action; ?>">
@@ -44,7 +47,6 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<thead>
<tr>
<th colspan="2">
- <h4><?php echo $title; ?></h4>
<em><strong><?php echo __('Email Information and Settings');?></strong></em>
</th>
</tr>
diff --git a/include/staff/emails.inc.php b/include/staff/emails.inc.php
index cad6b890a..30742a493 100644
--- a/include/staff/emails.inc.php
+++ b/include/staff/emails.inc.php
@@ -40,30 +40,35 @@ $def_dept_name = $cfg->getDefaultDept()->getName();
$def_priority = $cfg->getDefaultPriority()->getDesc();
?>
<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;">
- <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 class="sticky bar opaque">
+ <div class="content">
+ <div class="pull-left flush-left">
+ <h2><?php echo __('Email Addresses');?></h2>
+ </div>
+ <div class="pull-right flush-right">
+ <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>
</div>
-</div>
-<div class="clear"></div>
+ <div class="clear"></div>
<?php 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">
- <caption><?php echo $showing; ?></caption>
<thead>
<tr>
<th width="7"> </th>
diff --git a/include/staff/faq-categories.inc.php b/include/staff/faq-categories.inc.php
index 1faf2e74f..2a3d56c58 100644
--- a/include/staff/faq-categories.inc.php
+++ b/include/staff/faq-categories.inc.php
@@ -93,7 +93,10 @@ foreach ($topics as $T) {
</div>
</form>
+<div style="margin-bottom:20px; padding-top:5px;">
+ <div class="flush-left">
<h2><?php echo __('Frequently Asked Questions');?></h2>
+ </div></div>
<hr>
<div>
<?php
diff --git a/include/staff/filter.inc.php b/include/staff/filter.inc.php
index aa958eb12..c159817af 100644
--- a/include/staff/filter.inc.php
+++ b/include/staff/filter.inc.php
@@ -6,7 +6,7 @@ $match_types=Filter::getSupportedMatchTypes();
$info = $qs = array();
if($filter && $_REQUEST['a']!='add'){
- $title=__('Update Filter');
+ $title=__('Update Filter –');
$action='update';
$submit_text=__('Save Changes');
$info=array_merge($filter->getInfo(),$filter->getFlatRules());
@@ -26,12 +26,14 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<input type="hidden" name="do" value="<?php echo $action; ?>">
<input type="hidden" name="a" value="<?php echo Format::htmlchars($_REQUEST['a']); ?>">
<input type="hidden" name="id" value="<?php echo $info['id']; ?>">
- <h2><?php echo __('Ticket Filter');?></h2>
+ <h2><?php echo $title; ?>
+ <?php if ($info) { ?> <span class="ltr"><?php echo $info['name']; ?></span>
+ <?php } ?>
+</h2>
<table class="form_table" width="940" border="0" cellspacing="0" cellpadding="2">
<thead>
<tr>
<th colspan="2">
- <h4><?php echo $title; ?></h4>
<em><?php echo __('Filters are executed based on execution order. Filter can target specific ticket source.');?></em>
</th>
</tr>
diff --git a/include/staff/filters.inc.php b/include/staff/filters.inc.php
index 5d81d4e00..343074de2 100644
--- a/include/staff/filters.inc.php
+++ b/include/staff/filters.inc.php
@@ -45,39 +45,47 @@ else
?>
<form action="filters.php" method="POST" name="filters">
-
-<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;">
- <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 class="sticky bar opaque">
+ <div class="content">
+ <div class="pull-left flush-left">
+ <h2><?php echo __('Ticket Filters');?></h2>
+ </div>
+ <div class="pull-right flush-right">
+ <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>
-
-
</div>
<div class="clear"></div>
<?php 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">
- <caption><?php echo $showing; ?></caption>
<thead>
<tr>
<th width="7"> </th>
diff --git a/include/staff/helptopic.inc.php b/include/staff/helptopic.inc.php
index bd3e28dc3..96e70049c 100644
--- a/include/staff/helptopic.inc.php
+++ b/include/staff/helptopic.inc.php
@@ -23,13 +23,11 @@ if($topic && $_REQUEST['a']!='add') {
$info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
?>
-<h2 style="font-weight: normal"><?php echo $title; ?>
- <i class="help-tip icon-question-sign" href="#help_topic_information"></i>
- </h2>
+<h2><?php echo $title; ?>
<?php if ($topic) { ?>
- <div class="big"><strong><?php echo $topic->getLocal('topic'); ?></strong></div>
+ - <span class="ltr"><?php echo $topic->getLocal('topic'); ?></span>
<?php } ?>
-
+ <i class="help-tip icon-question-sign" href="#help_topic_information"></i></h2>
<br/>
<ul class="clean tabs" id="topic-tabs">
diff --git a/include/staff/helptopics.inc.php b/include/staff/helptopics.inc.php
index 9839cc76e..ef71b5b5d 100644
--- a/include/staff/helptopics.inc.php
+++ b/include/staff/helptopics.inc.php
@@ -12,56 +12,62 @@ $order_by = 'sort';
?>
<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;">
- <?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 class="sticky bar opaque">
+ <div class="content">
+ <div class="pull-left flush-left">
+ <h2><?php echo __('Help Topics');?></h2>
+ </div>
+ <div class="pull-right flush-right">
+ <?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>
</div>
-
-
-
-</div>
-<div class="clear"></div>
+ <div class="clear"></div>
<?php csrf_token(); ?>
<input type="hidden" name="do" value="mass_process" >
<input type="hidden" id="action" name="a" value="sort" >
<table class="list" border="0" cellspacing="1" cellpadding="0" width="940">
- <caption><span class="pull-left" style="display:inline-block;vertical-align:middle"><?php
- echo $showing; ?></span>
- <div class="pull-right"><?php echo __('Sorting Mode'); ?>:
- <select name="help_topic_sort_mode" onchange="javascript:
+
+ <!-- <div class="pull-right"><?php //echo __('Sorting Mode'); ?>:
+ <select name="help_topic_sort_mode" onchange="javascript:
var $form = $(this).closest('form');
$form.find('input[name=a]').val('sort');
$form.submit();
">
-<?php foreach (OsticketConfig::allTopicSortModes() as $i=>$m)
- echo sprintf('<option value="%s"%s>%s</option>',
- $i, $i == $cfg->getTopicSortMode() ? ' selected="selected"' : '', $m); ?>
+<?php// foreach (OsticketConfig::allTopicSortModes() as $i=>$m)
+ //echo sprintf('<option value="%s"%s>%s</option>',
+ // $i, $i == $cfg->getTopicSortMode() ? ' selected="selected"' : '', $m); ?>
</select>
- </div>
- </caption>
+ </div>-->
<thead>
<tr>
<th width="7" style="height:20px;"> </th>
diff --git a/include/staff/org-view.inc.php b/include/staff/org-view.inc.php
index 6c50d048f..1c20cb92a 100644
--- a/include/staff/org-view.inc.php
+++ b/include/staff/org-view.inc.php
@@ -9,16 +9,16 @@ 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">
+<?php if ($thisstaff->hasPerm(Organization::PERM_DELETE)) { ?>
+ <a id="org-delete" class="red button action-button org-action"
+ href="#orgs/<?php echo $org->getId(); ?>/delete"><i class="icon-trash"></i>
+ <?php echo __('Delete Organization'); ?></a>
+<?php } ?>
<?php if ($thisstaff->hasPerm(Organization::PERM_EDIT)) { ?>
- <span class="action-button pull-right" data-dropdown="#action-dropdown-more">
+ <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>
-<?php } ?>
-<?php if ($thisstaff->hasPerm(Organization::PERM_DELETE)) { ?>
- <a id="org-delete" class="red button action-button pull-right org-action"
- href="#orgs/<?php echo $org->getId(); ?>/delete"><i class="icon-trash"></i>
- <?php echo __('Delete Organization'); ?></a>
<?php } ?>
<div id="action-dropdown-more" class="action-dropdown anchor-right">
<ul>
diff --git a/include/staff/orgs.inc.php b/include/staff/orgs.inc.php
index 969540cdc..e4993e85d 100644
--- a/include/staff/orgs.inc.php
+++ b/include/staff/orgs.inc.php
@@ -71,47 +71,52 @@ $query="$select $from $where GROUP BY org.id ORDER BY $order_by LIMIT ".$pageNav
$qhash = md5($query);
$_SESSION['orgs_qs_'.$qhash] = $query;
?>
-<h2><?php echo __('Organizations'); ?></h2>
-<div class="pull-left">
- <form action="orgs.php" method="get">
- <?php csrf_token(); ?>
- <input type="hidden" name="a" value="search">
- <table>
- <tr>
- <td><input type="search" id="basic-org-search" name="query"
- autofocus size="30" value="<?php echo Format::htmlchars($_REQUEST['query']); ?>"
- autocomplete="off" autocorrect="off" autocapitalize="off"></td>
- <td><input type="submit" name="basic_search" class="button" value="<?php echo __('Search'); ?>"></td>
- <!-- <td> <a href="" id="advanced-user-search">[advanced]</a></td> -->
- </tr>
- </table>
- </form>
- </div>
-
-<div class="pull-right">
-<?php if ($thisstaff->hasPerm(Organization::PERM_CREATE)) { ?>
- <a class="green button action-button add-org"
- href="#">
- <i class="icon-plus-sign"></i>
- <?php echo __('Add Organization'); ?>
- </a>
-<?php }
-if ($thisstaff->hasPerm(Organization::PERM_DELETE)) { ?>
- <span class="action-button" data-dropdown="#action-dropdown-more"
- style="/*DELME*/ vertical-align:top; margin-bottom:0">
- <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>
- <li class="danger"><a class="orgs-action" href="#delete">
- <i class="icon-trash icon-fixed-width"></i>
- <?php echo __('Delete'); ?></a></li>
- </ul>
+<div id="basic_search">
+ <div style="min-height:25px;">
+ <form action="orgs.php" method="get">
+ <?php csrf_token(); ?>
+ <div class="attached input">
+ <input type="hidden" name="a" value="search">
+ <input type="search" class="basic-search" id="basic-org-search" name="query" autofocus size="30" value="<?php echo Format::htmlchars($_REQUEST['query']); ?>" autocomplete="off" autocorrect="off" autocapitalize="off">
+ <button type="submit" class="attached button"><i class="icon-search"></i>
+ </button>
+ <!-- <td> <a href="" id="advanced-user-search">[advanced]</a></td> -->
+ </div>
+ </form>
+ </div>
+</div>
+<div style="margin-bottom:20px; padding-top:5px;">
+ <div class="sticky bar opaque">
+ <div class="content">
+ <div class="pull-left flush-left">
+ <h2><?php echo __('Organizations'); ?></h2>
+ </div>
+ <div class="pull-right">
+ <?php if ($thisstaff->hasPerm(Organization::PERM_CREATE)) { ?>
+ <a class="green button action-button add-org"
+ href="#">
+ <i class="icon-plus-sign"></i>
+ <?php echo __('Add Organization'); ?>
+ </a>
+ <?php }
+ if ($thisstaff->hasPerm(Organization::PERM_DELETE)) { ?>
+ <span class="action-button" data-dropdown="#action-dropdown-more"
+ style="/*DELME*/ vertical-align:top; margin-bottom:0">
+ <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>
+ <li class="danger"><a class="orgs-action" href="#delete">
+ <i class="icon-trash icon-fixed-width"></i>
+ <?php echo __('Delete'); ?></a></li>
+ </ul>
+ </div>
+ <?php } ?>
+ </div>
+ </div>
</div>
-<?php } ?>
</div>
-
<div class="clear"></div>
<?php
$showing = $search ? __('Search Results').': ' : '';
@@ -127,7 +132,6 @@ else
<input type="hidden" id="action" name="do" value="" >
<input type="hidden" id="selected-count" name="count" value="" >
<table class="list" border="0" cellspacing="1" cellpadding="0" width="940">
- <caption><?php echo $showing; ?></caption>
<thead>
<tr>
<th nowrap width="12"> </th>
diff --git a/include/staff/page.inc.php b/include/staff/page.inc.php
index 1a959a4c8..250b5f3bd 100644
--- a/include/staff/page.inc.php
+++ b/include/staff/page.inc.php
@@ -8,7 +8,7 @@ $pageTypes = array(
);
$info = $qs = array();
if($page && $_REQUEST['a']!='add'){
- $title=__('Update Page');
+ $title=__('Update Page –');
$action='update';
$submit_text=__('Save Changes');
$info=$page->getHashtable();
@@ -42,15 +42,16 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<input type="hidden" name="do" value="<?php echo $action; ?>">
<input type="hidden" name="a" value="<?php echo Format::htmlchars($_REQUEST['a']); ?>">
<input type="hidden" name="id" value="<?php echo $info['id']; ?>">
- <h2><?php echo __('Site Pages'); ?>
+ <h2><?php echo $title; ?>
+ <?php if ($info) { ?> <span class="ltr"><?php echo $info['name']; ?></span>
+ <?php } ?>
<i class="help-tip icon-question-sign" href="#site_pages"></i>
</h2>
<table class="form_table fixed" width="940" border="0" cellspacing="0" cellpadding="2">
<thead>
- <tr><td></td><td></td></tr> <!-- For fixed table layout -->
+ <tr><td style="padding:0"></td><td style="padding:0;"></td></tr> <!-- For fixed table layout -->
<tr>
<th colspan="2">
- <h4><?php echo $title; ?></h4>
<em><?php echo __('Page information'); ?></em>
</th>
</tr>
diff --git a/include/staff/pages.inc.php b/include/staff/pages.inc.php
index 543b6bb78..887515c20 100644
--- a/include/staff/pages.inc.php
+++ b/include/staff/pages.inc.php
@@ -37,40 +37,50 @@ else
?>
<form action="pages.php" method="POST" name="tpls">
-
-<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;">
- <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 class="sticky bar opaque">
+ <div class="content">
+ <div class="pull-left flush-left">
+ <h2><?php echo __('Site Pages'); ?>
+ <i class="help-tip icon-question-sign notsticky" href="#site_pages"></i>
+ </h2>
+ </div>
+ <div class="pull-right flush-right">
+ <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>
</div>
-</div>
-<div class="clear"></div>
+ <div class="clear"></div>
<form action="pages.php" method="POST" name="tpls">
<?php 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">
- <caption><?php echo $showing; ?></caption>
<thead>
<tr>
<th width="7"> </th>
diff --git a/include/staff/plugins.inc.php b/include/staff/plugins.inc.php
index bbb25bd04..b6bc8c3b7 100644
--- a/include/staff/plugins.inc.php
+++ b/include/staff/plugins.inc.php
@@ -1,28 +1,40 @@
<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;">
- <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 class="sticky bar opaque">
+ <div class="content">
+ <div class="pull-left flush-left">
+ <h2><?php echo __('Currently Installed Plugins'); ?></h2>
+ </div>
+ <div class="pull-right flush-right">
+ <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>
</div>
<div class="clear"></div>
diff --git a/include/staff/profile.inc.php b/include/staff/profile.inc.php
index 6fc6a2c75..d11c0f4c6 100644
--- a/include/staff/profile.inc.php
+++ b/include/staff/profile.inc.php
@@ -6,8 +6,7 @@ if(!defined('OSTSTAFFINC') || !$staff || !$thisstaff) die('Access Denied');
<?php csrf_token(); ?>
<input type="hidden" name="do" value="update">
<input type="hidden" name="id" value="<?php echo $staff->getId(); ?>">
- <h2><?php echo __('My Account Profile');?></h2>
-
+<h2><?php echo __('My Account Profile');?></h2>
<ul class="clean tabs">
<li class="active"><a href="#account"><i class="icon-user"></i> <?php echo __('Account'); ?></a></li>
<li><a href="#preferences"><?php echo __('Preferences'); ?></a></li>
@@ -314,10 +313,11 @@ if ($avatar->isChangeable()) { ?>
</div>
<p style="text-align:center;">
- <input type="submit" name="submit" value="<?php echo __('Save Changes'); ?>">
- <input type="reset" name="reset" value="<?php echo __('Reset');?>">
- <input type="button" name="cancel" value="<?php echo __('Cancel');?>" onclick="window.history.go(-1);">
+ <button class="button action-button" type="submit" name="submit" ><i class="icon-save"></i> <?php echo __('Save Changes'); ?></button>
+ <button class="button action-button" type="reset" name="reset"><?php echo __('Reset');?></button>
+ <button class="red button action-button" type="button" name="cancel" onclick="window.history.go(-1);"><i class="icon-remove-circle"></i> <?php echo __('Cancel');?></button>
</p>
+ <div class="clear"></div>
</form>
<?php
if ($staff->change_passwd) { ?>
diff --git a/include/staff/role.inc.php b/include/staff/role.inc.php
index de2eecb2b..34853b688 100644
--- a/include/staff/role.inc.php
+++ b/include/staff/role.inc.php
@@ -2,7 +2,7 @@
$info=array();
if ($role) {
- $title = __('Update Role');
+ $title = __('Update Role –');
$action = 'update';
$submit_text = __('Save Changes');
$info = $role->getInfo();
@@ -23,7 +23,10 @@ $info = Format::htmlchars(($errors && $_POST) ? array_merge($info, $_POST) : $in
<input type="hidden" name="do" value="<?php echo $action; ?>">
<input type="hidden" name="a" value="<?php echo Format::htmlchars($_REQUEST['a']); ?>">
<input type="hidden" name="id" value="<?php echo $info['id']; ?>">
-<h2> <?php echo $role ?: __('New Role'); ?></h2>
+<h2><?php echo $title; ?>
+ <?php if ($info) { ?> <span class="ltr"><?php echo $info['name']; ?></span>
+ <?php } ?>
+</h2>
<ul class="clean tabs">
<li class="active"><a href="#definition">
<i class="icon-file"></i> <?php echo __('Definition'); ?></a></li>
@@ -35,7 +38,6 @@ $info = Format::htmlchars(($errors && $_POST) ? array_merge($info, $_POST) : $in
<thead>
<tr>
<th colspan="2">
- <h4><?php echo $title; ?></h4>
<em><?php echo __(
'Roles are used to define agents\' permissions'
); ?> <i class="help-tip icon-question-sign"
diff --git a/include/staff/roles.inc.php b/include/staff/roles.inc.php
index c568616c6..27ef3ce92 100644
--- a/include/staff/roles.inc.php
+++ b/include/staff/roles.inc.php
@@ -39,7 +39,6 @@ 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">
- <caption><?php echo $showing; ?></caption>
<thead>
<tr>
<th width="7"> </th>
diff --git a/include/staff/settings-alerts.inc.php b/include/staff/settings-alerts.inc.php
index 03168d557..b08cdbe4d 100644
--- a/include/staff/settings-alerts.inc.php
+++ b/include/staff/settings-alerts.inc.php
@@ -1,11 +1,4 @@
-<table class="form_table settings_table" width="940" border="0" cellspacing="0" cellpadding="2">
- <thead>
- <tr>
- <th>
- <h4><?php echo __('Alerts and Notices sent to agents on ticket "events"'); ?></h4>
- </th>
- </tr>
- </thead>
+<table class="form_table settings_table" width="940" border="0" cellspacing="0" cellpadding="2">
<tbody>
<tr><th><em><b><?php echo __('New Ticket Alert'); ?></b>:
<i class="help-tip icon-question-sign" href="#ticket_alert"></i>
diff --git a/include/staff/settings-autoresp.inc.php b/include/staff/settings-autoresp.inc.php
index 42a52de40..24729350f 100644
--- a/include/staff/settings-autoresp.inc.php
+++ b/include/staff/settings-autoresp.inc.php
@@ -1,8 +1,7 @@
<table class="form_table settings_table" width="940" border="0" cellspacing="0" cellpadding="2">
<thead>
<tr>
- <th colspan="2">
- <h4><?php echo __('Autoresponder Setting'); ?></h4>
+ <th colspan="2">
<em><?php echo __('Global setting - can be disabled at department or email level.'); ?></em>
</th>
</tr>
diff --git a/include/staff/settings-emails.inc.php b/include/staff/settings-emails.inc.php
index 06b631664..d08b0bec5 100644
--- a/include/staff/settings-emails.inc.php
+++ b/include/staff/settings-emails.inc.php
@@ -9,7 +9,6 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
<thead>
<tr>
<th colspan="2">
- <h4><?php echo __('Email Settings');?></h4>
<em><?php echo __('Note that some of the global settings can be overwridden at department/email level.');?></em>
</th>
</tr>
diff --git a/include/staff/settings-kb.inc.php b/include/staff/settings-kb.inc.php
index cd55261ed..2f7fa6762 100644
--- a/include/staff/settings-kb.inc.php
+++ b/include/staff/settings-kb.inc.php
@@ -9,7 +9,6 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
<thead>
<tr>
<th colspan="2">
- <h4><?php echo __('Knowledge Base Settings');?></h4>
<em><?php echo __("Disabling knowledge base disables clients' interface.");?></em>
</th>
</tr>
diff --git a/include/staff/settings-pages.inc.php b/include/staff/settings-pages.inc.php
index 586a7087e..c0cb5699a 100644
--- a/include/staff/settings-pages.inc.php
+++ b/include/staff/settings-pages.inc.php
@@ -6,13 +6,22 @@ $pages = Page::getPages();
<form action="settings.php?t=pages" method="post" id="save"
enctype="multipart/form-data">
<?php csrf_token(); ?>
+
+
+
<input type="hidden" name="t" value="pages" >
+
+<ul class="clean tabs">
+ <li class="active"><a href="#basic-information"><i class="icon-asterisk"></i>
+ <?php echo __('Basic Information'); ?></a></li>
+ <li><a href="#site-pages"><i class="icon-file"></i>
+ <?php echo __('Site Pages'); ?></a></li>
+ <li><a href="#logos"><i class="icon-picture"></i>
+ <?php echo __('Logos'); ?></a></li>
+</ul>
+
+<div class="tab_content" id="basic-information">
<table class="form_table settings_table" width="940" border="0" cellspacing="0" cellpadding="2">
- <thead><tr>
- <th colspan="2">
- <h4><?php echo __('Basic Information'); ?></h4>
- </th>
- </tr></thead>
<tbody>
<?php
$form = $ost->company->getForm();
@@ -20,10 +29,13 @@ $pages = Page::getPages();
$form->render();
?>
</tbody>
+</table>
+</div>
+<div class="hidden tab_content" id="site-pages">
+<table class="form_table settings_table" width="940" border="0" cellspacing="0" cellpadding="2">
<thead>
<tr>
<th colspan="2">
- <h4><?php echo __('Site Pages'); ?></h4>
<em><?php echo sprintf(__(
'To edit or add new pages go to %s Manage > Site Pages %s'),
'<a href="pages.php">','</a>'); ?></em>
@@ -93,95 +105,103 @@ $pages = Page::getPages();
</tr>
</tbody>
</table>
+</div>
+<div class="hidden tab_content" id="logos">
<table class="form_table settings_table" width="940" border="0" cellspacing="0" cellpadding="2">
<thead>
<tr>
<th colspan="2">
- <h4><?php echo __('Logos'); ?>
- <i class="help-tip icon-question-sign" href="#logos"></i>
- </h4>
- <em><?php echo __('System Default Logo'); ?></em>
+ <em><?php echo __('System Default Logo'); ?><i class="help-tip icon-question-sign" href="#logos"></i></em>
</th>
</tr>
</thead>
<tbody>
<tr>
- <td colspan="2">
-<table style="width:100%">
- <thead><tr>
- <th>Client</th>
- <th>Staff</th>
- <th>Logo</th>
- </tr></thead>
- <tbody>
- <tr>
- <td>
- <input type="radio" name="selected-logo" value="0"
- style="margin-left: 1em"
- <?php if (!$ost->getConfig()->getClientLogoId())
- echo 'checked="checked"'; ?>/>
- </td><td>
- <input type="radio" name="selected-logo-scp" value="0"
- style="margin-left: 1em"
- <?php if (!$ost->getConfig()->getStaffLogoId())
- echo 'checked="checked"'; ?>/>
- </td><td>
- <img src="<?php echo ROOT_PATH; ?>assets/default/images/logo.png"
- alt="Default Logo" valign="middle"
- style="box-shadow: 0 0 0.5em rgba(0,0,0,0.5);
- margin: 0.5em; height: 5em;
- vertical-align: middle"/>
- <img src="<?php echo ROOT_PATH; ?>scp/images/ost-logo.png"
- alt="Default Logo" valign="middle"
- style="box-shadow: 0 0 0.5em rgba(0,0,0,0.5);
- margin: 0.5em; height: 5em;
- vertical-align: middle"/>
- </td>
- </tr>
- <tr><th colspan="3">
- <em><?php echo __('Use a custom logo'); ?> <i class="help-tip icon-question-sign" href="#upload_a_new_logo"></i></em>
- </th></tr>
- <?php
- $current = $ost->getConfig()->getClientLogoId();
- $currentScp = $ost->getConfig()->getStaffLogoId();
- foreach (AttachmentFile::allLogos() as $logo) { ?>
- <tr>
- <td>
- <input type="radio" name="selected-logo"
- style="margin-left: 1em" value="<?php
- echo $logo->getId(); ?>" <?php
- if ($logo->getId() == $current)
- echo 'checked="checked"'; ?>/>
- </td><td>
- <input type="radio" name="selected-logo-scp"
- style="margin-left: 1em" value="<?php
- echo $logo->getId(); ?>" <?php
- if ($logo->getId() == $currentScp)
- echo 'checked="checked"'; ?>/>
- </td><td>
- <img src="<?php echo $logo->getDownloadUrl(); ?>"
- alt="Custom Logo" valign="middle"
- style="box-shadow: 0 0 0.5em rgba(0,0,0,0.5);
- margin: 0.5em; height: 5em;
- vertical-align: middle;"/>
- <?php if ($logo->getId() != $current && $logo->getId() != $currentScp) { ?>
- <label>
- <input type="checkbox" name="delete-logo[]" value="<?php
- echo $logo->getId(); ?>"/> <?php echo __('Delete'); ?>
- </label>
- <?php } ?>
+ <td colspan="2">
+ <table style="width:100%">
+ <thead>
+ <tr>
+ <th>Client</th>
+ <th>Staff</th>
+ <th>Logo</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>
+ <input type="radio" name="selected-logo" value="0"
+ style="margin-left: 1em"
+ <?php if (!$ost->getConfig()->getClientLogoId())
+ echo 'checked="checked"'; ?>/>
+ </td>
+ <td>
+ <input type="radio" name="selected-logo-scp" value="0"
+ style="margin-left: 1em"
+ <?php if (!$ost->getConfig()->getStaffLogoId())
+ echo 'checked="checked"'; ?>/>
+ </td>
+ <td>
+ <img src="<?php echo ROOT_PATH; ?>assets/default/images/logo.png"
+ alt="Default Logo" valign="middle"
+ style="box-shadow: 0 0 0.5em rgba(0,0,0,0.5);
+ margin: 0.5em; height: 5em;
+ vertical-align: middle"/>
+ <img src="<?php echo ROOT_PATH; ?>scp/images/ost-logo.png"
+ alt="Default Logo" valign="middle"
+ style="box-shadow: 0 0 0.5em rgba(0,0,0,0.5);
+ margin: 0.5em; height: 5em;
+ vertical-align: middle"/>
+ </td>
+ </tr>
+ <tr>
+ <th colspan="3">
+ <em><?php echo __('Use a custom logo'); ?> <i class="help-tip icon-question-sign" href="#upload_a_new_logo"></i></em>
+ </th>
+ </tr>
+ <?php
+ $current = $ost->getConfig()->getClientLogoId();
+ $currentScp = $ost->getConfig()->getStaffLogoId();
+ foreach (AttachmentFile::allLogos() as $logo) { ?>
+ <tr>
+ <td>
+ <input type="radio" name="selected-logo"
+ style="margin-left: 1em" value="<?php
+ echo $logo->getId(); ?>" <?php
+ if ($logo->getId() == $current)
+ echo 'checked="checked"'; ?>/>
+ </td>
+ <td>
+ <input type="radio" name="selected-logo-scp"
+ style="margin-left: 1em" value="<?php
+ echo $logo->getId(); ?>" <?php
+ if ($logo->getId() == $currentScp)
+ echo 'checked="checked"'; ?>/>
+ </td>
+ <td>
+ <img src="<?php echo $logo->getDownloadUrl(); ?>"
+ alt="Custom Logo" valign="middle"
+ style="box-shadow: 0 0 0.5em rgba(0,0,0,0.5);
+ margin: 0.5em; height: 5em;
+ vertical-align: middle;"/>
+ <?php if ($logo->getId() != $current && $logo->getId() != $currentScp) { ?>
+ <label>
+ <input type="checkbox" name="delete-logo[]" value="<?php
+ echo $logo->getId(); ?>"/> <?php echo __('Delete'); ?>
+ </label>
+ <?php } ?>
+ </td>
+ </tr>
+ <?php } ?>
+ </tbody>
+ </table>
+ <b><?php echo __('Upload a new logo'); ?>:</b>
+ <input type="file" name="logo[]" size="30" value="" />
+ <font class="error"><br/><?php echo $errors['logo']; ?></font>
</td>
</tr>
-<?php } ?>
- </tbody>
-</table>
- <b><?php echo __('Upload a new logo'); ?>:</b>
- <input type="file" name="logo[]" size="30" value="" />
- <font class="error"><br/><?php echo $errors['logo']; ?></font>
- </td>
- </tr>
</tbody>
</table>
+</div>
<p style="text-align:center;">
<input class="button" type="submit" name="submit-button" value="<?php
echo __('Save Changes'); ?>">
diff --git a/include/staff/settings-system.inc.php b/include/staff/settings-system.inc.php
index 809998a5f..5aebca8e8 100644
--- a/include/staff/settings-system.inc.php
+++ b/include/staff/settings-system.inc.php
@@ -11,7 +11,6 @@ $gmtime = Misc::gmtime();
<thead>
<tr>
<th colspan="2">
- <h4><?php echo __('System Settings and Preferences'); ?></h4>
<em><b><?php echo __('General Settings'); ?></b></em>
</th>
</tr>
diff --git a/include/staff/settings-tickets.inc.php b/include/staff/settings-tickets.inc.php
index c02f437f7..8edf21818 100644
--- a/include/staff/settings-tickets.inc.php
+++ b/include/staff/settings-tickets.inc.php
@@ -16,13 +16,11 @@ if(!($maxfileuploads=ini_get('max_file_uploads')))
<li><a href="#alerts"><i class="icon-bell-alt"></i>
<?php echo __('Alerts and Notices'); ?></a></li>
</ul>
-
<div class="tab_content" id="settings">
<table class="form_table settings_table" width="940" border="0" cellspacing="0" cellpadding="2">
<thead>
<tr>
<th colspan="2">
- <h4><?php echo __('Global Ticket Settings');?></h4>
<em><?php echo __('System-wide default ticket settings and options.'); ?></em>
</th>
</tr>
diff --git a/include/staff/slaplan.inc.php b/include/staff/slaplan.inc.php
index 484778e8b..db16fce44 100644
--- a/include/staff/slaplan.inc.php
+++ b/include/staff/slaplan.inc.php
@@ -2,7 +2,7 @@
if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin()) die('Access Denied');
$info = $qs = array();
if($sla && $_REQUEST['a']!='add'){
- $title=__('Update SLA Plan' /* SLA is abbreviation for Service Level Agreement */);
+ $title=__('Update SLA Plan –' /* SLA is abbreviation for Service Level Agreement */);
$action='update';
$submit_text=__('Save Changes');
$info=$sla->getInfo();
@@ -25,12 +25,14 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<input type="hidden" name="do" value="<?php echo $action; ?>">
<input type="hidden" name="a" value="<?php echo Format::htmlchars($_REQUEST['a']); ?>">
<input type="hidden" name="id" value="<?php echo $info['id']; ?>">
- <h2><?php echo __('Service Level Agreement');?></h2>
+ <h2><?php echo $title; ?>
+ <?php if ($info) { ?> <span class="ltr"><?php echo $info['name']; ?></span>
+ <?php } ?>
+</h2>
<table class="form_table" width="940" border="0" cellspacing="0" cellpadding="2">
<thead>
<tr>
<th colspan="2">
- <h4><?php echo $title; ?></h4>
<em><?php echo __('Tickets are marked overdue on grace period violation.');?></em>
</th>
</tr>
diff --git a/include/staff/slaplans.inc.php b/include/staff/slaplans.inc.php
index 2e018639d..198f0333b 100644
--- a/include/staff/slaplans.inc.php
+++ b/include/staff/slaplans.inc.php
@@ -40,37 +40,47 @@ $showing = $pageNav->showing().' '._N('SLA plan', 'SLA plans', $count);
$qstr .= '&order='.($order=='DESC' ? 'ASC' : 'DESC');
?>
<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;">
- <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 class="sticky bar opaque">
+ <div class="content">
+ <div class="pull-left flush-left">
+ <h2><?php echo __('Service Level Agreements');?></h2>
+ </div>
+ <div class="pull-right flush-right">
+ <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>
</div>
-</div>
-<div class="clear"></div>
+ <div class="clear"></div>
<?php 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">
- <caption><?php echo $showing; ?></caption>
<thead>
<tr>
<th width="7"> </th>
diff --git a/include/staff/staff.inc.php b/include/staff/staff.inc.php
index 020e28162..d23971929 100644
--- a/include/staff/staff.inc.php
+++ b/include/staff/staff.inc.php
@@ -27,7 +27,7 @@ if ($_REQUEST['a']=='add'){
}
else {
//Editing Department.
- $title=__('Manage Agent');
+ $title=__('Manage Agent –');
$action='update';
$submit_text=__('Save Changes');
$info['id'] = $staff->getId();
@@ -42,10 +42,10 @@ else {
<input type="hidden" name="id" value="<?php echo $info['id']; ?>">
<h2><?php echo $title; ?>
- <div>
- <small><?php echo $staff->getName(); ?></small>
- </div>
- </h2>
+ <?php if ($staff) { ?> <span class="ltr">
+ <?php echo $staff->getName(); ?></span>
+ <?php } ?>
+</h2>
<ul class="clean tabs">
<li class="active"><a href="#account"><i class="icon-user"></i> <?php echo __('Account'); ?></a></li>
diff --git a/include/staff/staffmembers.inc.php b/include/staff/staffmembers.inc.php
index 0fd390cb7..a7cdf78c5 100644
--- a/include/staff/staffmembers.inc.php
+++ b/include/staff/staffmembers.inc.php
@@ -80,74 +80,87 @@ $qstr .= '&order='.($order=='-' ? 'ASC' : 'DESC');
// add limits.
$agents->limit($pageNav->getLimit())->offset($pageNav->getStart());
?>
-<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 id="basic_search">
+ <div style="min-height:25px;">
+ <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="button muted" value="<?php echo __('Apply');?>" />
+ </form>
+ </div>
+ </div>
+</div>
+<div style="margin-bottom:20px; padding-top:5px;">
+ <div class="sticky bar opaque">
+ <div class="content">
+ <div class="pull-left flush-left">
+ <h2><?php echo __('Agents');?></h2>
</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">
+ <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-form-id="mass-actions" 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-form-id="mass-actions" 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
+ </span>
+ <div id="action-dropdown-more" class="action-dropdown anchor-right">
+ <ul id="actions">
+ <li>
+ <a class="confirm" data-form-id="mass-actions" 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-form-id="mass-actions" 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-form-id="mass-actions" data-name="delete" href="staff.php?a=delete">
- <i class="icon-trash icon-fixed-width"></i>
- <?php echo __('Delete'); ?></a></li>
- </ul>
+ <li class="danger">
+ <a class="confirm" data-form-id="mass-actions" 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>
- <div class="clear" style="padding: 3px 0"></div>
</div>
</div>
+<div class="clear"></div>
<form id="mass-actions" action="staff.php" method="POST" name="staff" >
@@ -155,7 +168,6 @@ $agents->limit($pageNav->getLimit())->offset($pageNav->getStart());
<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">
- <caption><?php echo $showing; ?></caption>
<thead>
<tr>
<th width="7px"> </th>
diff --git a/include/staff/syslogs.inc.php b/include/staff/syslogs.inc.php
index 68648f99f..98aa50917 100644
--- a/include/staff/syslogs.inc.php
+++ b/include/staff/syslogs.inc.php
@@ -84,35 +84,51 @@ else
$showing=__('No logs found!');
?>
-<h2><?php echo __('System Logs');?>
- <i class="help-tip icon-question-sign" href="#system_logs"></i>
-</h2>
-<div id='filter' >
- <form action="logs.php" method="get">
- <div style="padding-left:2px;">
- <b><?php echo __('Date Span'); ?></b> <i class="help-tip icon-question-sign" href="#date_span"></i>
- <?php echo __('Between'); ?>:
- <input class="dp" id="sd" size=15 name="startDate" value="<?php echo Format::htmlchars($_REQUEST['startDate']); ?>" autocomplete=OFF>
-
- <input class="dp" id="ed" size=15 name="endDate" value="<?php echo Format::htmlchars($_REQUEST['endDate']); ?>" autocomplete=OFF>
- <?php echo __('Log Level'); ?>: <i class="help-tip icon-question-sign" href="#type"></i>
- <select name='type'>
- <option value="" selected><?php echo __('All');?></option>
- <option value="Error" <?php echo ($type=='Error')?'selected="selected"':''; ?>><?php echo __('Errors');?></option>
- <option value="Warning" <?php echo ($type=='Warning')?'selected="selected"':''; ?>><?php echo __('Warnings');?></option>
- <option value="Debug" <?php echo ($type=='Debug')?'selected="selected"':''; ?>><?php echo __('Debug');?></option>
- </select>
-
- <input type="submit" Value="<?php echo __('Go!');?>" />
+<div id="basic_search">
+ <div style="height:25px">
+ <div id='filter' >
+ <form action="logs.php" method="get">
+ <div style="padding-left:2px;">
+ <i class="help-tip icon-question-sign" href="#date_span"></i>
+ <?php echo __('Between'); ?>:
+ <input class="dp" id="sd" size=15 name="startDate" value="<?php echo Format::htmlchars($_REQUEST['startDate']); ?>" autocomplete=OFF>
+
+ <input class="dp" id="ed" size=15 name="endDate" value="<?php echo Format::htmlchars($_REQUEST['endDate']); ?>" autocomplete=OFF>
+ <?php echo __('Log Level'); ?>: <i class="help-tip icon-question-sign" href="#type"></i>
+ <select name='type'>
+ <option value="" selected><?php echo __('All');?></option>
+ <option value="Error" <?php echo ($type=='Error')?'selected="selected"':''; ?>><?php echo __('Errors');?></option>
+ <option value="Warning" <?php echo ($type=='Warning')?'selected="selected"':''; ?>><?php echo __('Warnings');?></option> <option value="Debug" <?php echo ($type=='Debug')?'selected="selected"':''; ?>><?php echo __('Debug');?></option>
+ </select>
+
+ <input type="submit" Value="<?php echo __('Go!');?>" />
+ </div>
+ </form>
+ </div>
</div>
- </form>
</div>
+<div class="clear"></div>
<form action="logs.php" method="POST" name="logs">
+ <div style="margin-bottom:20px; padding-top:5px;">
+ <div class="sticky bar opaque">
+ <div class="content">
+ <div class="pull-left flush-left">
+ <h2><?php echo __('System Logs');?>
+ <i class="help-tip icon-question-sign" href="#system_logs"></i>
+ </h2>
+ </div>
+ <div id="actions" class="pull-right flush-right">
+ <button class="red button" type="submit" name="delete"><i class="icon-trash"></i>
+ <?php echo __( 'Delete Selected Entries');?>
+ </button>
+ </div>
+ </div>
+ </div>
+ </div>
<?php 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">
- <caption><?php echo $showing; ?></caption>
<thead>
<tr>
<th width="7"> </th>
@@ -164,9 +180,7 @@ else
if($res && $num): //Show options..
echo '<div> '.__('Page').':'.$pageNav->getPageLinks().' </div>';
?>
-<p class="centered" id="actions">
- <input class="button" type="submit" name="delete" value="<?php echo __('Delete Selected Entries');?>">
-</p>
+
<?php
endif;
?>
diff --git a/include/staff/tasks.inc.php b/include/staff/tasks.inc.php
index 2307d1975..4efb4ec4c 100644
--- a/include/staff/tasks.inc.php
+++ b/include/staff/tasks.inc.php
@@ -228,27 +228,27 @@ if ($thisstaff->hasPerm(Task::PERM_DELETE, false)) {
?>
</div>
<form action="tasks.php" method="get" onsubmit="javascript:
- $.pjax({
- url:$(this).attr('action') + '?' + $(this).serialize(),
- container:'#pjax-container',
- timeout: 2000
- });
-return false;">
- <input type="hidden" name="a" value="search">
- <input type="hidden" name="search-type" value=""/>
- <div class="attached input">
- <input type="text" class="basic-search" data-url="ajax.php/tasks/lookup" name="query"
- autofocus size="30" value="<?php echo Format::htmlchars($_REQUEST['query'], true); ?>"
- autocomplete="off" autocorrect="off" autocapitalize="off">
- <button type="submit" class="attached button"><i class="icon-search"></i>
- </button>
- </div>
+ $.pjax({
+ url:$(this).attr('action') + '?' + $(this).serialize(),
+ container:'#pjax-container',
+ timeout: 2000
+ });
+ return false;">
+ <input type="hidden" name="a" value="search">
+ <input type="hidden" name="search-type" value=""/>
+ <div class="attached input">
+ <input type="text" class="basic-search" data-url="ajax.php/tasks/lookup" name="query"
+ autofocus size="30" value="<?php echo Format::htmlchars($_REQUEST['query'], true); ?>"
+ autocomplete="off" autocorrect="off" autocapitalize="off">
+ <button type="submit" class="attached button"><i class="icon-search"></i>
+ </button>
+ </div>
</form>
</div>
<!-- SEARCH FORM END -->
<div class="clear"></div>
-<div style="margin-bottom:20px; padding-top:10px;">
+<div style="margin-bottom:20px; padding-top:5px;">
<div class="sticky bar opaque">
<div class="content">
<div class="pull-left flush-left">
diff --git a/include/staff/team.inc.php b/include/staff/team.inc.php
index 4fb127ec5..63f10ee17 100644
--- a/include/staff/team.inc.php
+++ b/include/staff/team.inc.php
@@ -3,7 +3,7 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin()) die('Access
$info = $members = $qs = array();
if ($team && $_REQUEST['a']!='add') {
//Editing Team
- $title=__('Update Team');
+ $title=__('Update Team –');
$action='update';
$submit_text=__('Save Changes');
$trans['name'] = $team->getTranslateTag('name');
@@ -28,9 +28,11 @@ $info = $team->getInfo();
<input type="hidden" name="do" value="<?php echo $action; ?>">
<input type="hidden" name="a" value="<?php echo Format::htmlchars($_REQUEST['a']); ?>">
<input type="hidden" name="id" value="<?php echo $team->getId(); ?>">
- <h2><?php echo __('Team');?>
+ <h2><?php echo $title; ?>
+ <?php if ($team) { ?> <span class="ltr"><?php echo $team->name; ?></span>
+ <?php } ?>
<i class="help-tip icon-question-sign" href="#teams"></i>
- </h2>
+</h2>
<br>
<ul class="clean tabs">
<li class="active"><a href="#team">
@@ -44,7 +46,6 @@ $info = $team->getInfo();
<thead>
<tr>
<th colspan="2">
- <h4><?php echo $title; ?></h4>
<em><strong><?php echo __('Team Information'); ?></strong>:</em>
</th>
</tr>
diff --git a/include/staff/teams.inc.php b/include/staff/teams.inc.php
index 8296b06c6..3d5b65901 100644
--- a/include/staff/teams.inc.php
+++ b/include/staff/teams.inc.php
@@ -78,7 +78,6 @@ $qstr .= '&order='.urlencode($order=='DESC' ? 'ASC' : 'DESC');
<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">
- <caption><?php echo $showing; ?></caption>
<thead>
<tr>
<th width="7px"> </th>
diff --git a/include/staff/template.inc.php b/include/staff/template.inc.php
index 073908166..fc0d403ab 100644
--- a/include/staff/template.inc.php
+++ b/include/staff/template.inc.php
@@ -3,7 +3,7 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin()) die('Access
$info = $qs = array();
if($template && $_REQUEST['a']!='add'){
- $title=__('Update Template');
+ $title=__('Update Template –');
$action='update';
$submit_text=__('Save Changes');
$info=$template->getInfo();
@@ -24,12 +24,14 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<input type="hidden" name="do" value="<?php echo $action; ?>">
<input type="hidden" name="a" value="<?php echo Format::htmlchars($_REQUEST['a']); ?>">
<input type="hidden" name="tpl_id" value="<?php echo $info['tpl_id']; ?>">
- <h2><?php echo __('Email Template');?></h2>
+ <h2><?php echo $title; ?>
+ <?php if ($info) { ?> <span class="ltr"><?php echo $info['name']; ?></span>
+ <?php } ?>
+</h2>
<table class="form_table" width="940" border="0" cellspacing="0" cellpadding="2">
<thead>
<tr>
<th colspan="2">
- <h4><?php echo $title; ?></h4>
<em><?php echo __('Template information');?></em>
</th>
</tr>
diff --git a/include/staff/templates.inc.php b/include/staff/templates.inc.php
index a64906211..c4ed0d78b 100644
--- a/include/staff/templates.inc.php
+++ b/include/staff/templates.inc.php
@@ -43,38 +43,47 @@ else
?>
<form action="templates.php" method="POST" name="tpls">
-
-<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;">
- <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 class="sticky bar opaque">
+ <div class="content">
+ <div class="pull-left flush-left">
+ <h2><?php echo __('Email Template Sets'); ?></h2>
+ </div>
+ <div class="pull-right flush-right">
+ <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>
</div>
-
-</div>
-<div class="clear"></div>
+ <div class="clear"></div>
<?php 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">
- <caption><?php echo $showing; ?></caption>
<thead>
<tr>
<th width="7"> </th>
diff --git a/include/staff/templates/task-view.tmpl.php b/include/staff/templates/task-view.tmpl.php
index b69be9dfb..366279489 100644
--- a/include/staff/templates/task-view.tmpl.php
+++ b/include/staff/templates/task-view.tmpl.php
@@ -102,8 +102,9 @@ if ($task->isOverdue())
href="tasks.php?id=<?php echo $task->getId(); ?>"
><i class="icon-refresh"></i> <?php
echo sprintf(__('Task #%s'), $task->getNumber()); ?></a>
- <span class="faded notsticky"> — <?php echo $task->getTitle(); ?></span>
- </h2>
+ <?php if ($task) { ?> – <span class="ltr"><?php echo $task->getTitle(); ?></span>
+ <?php } ?>
+ </h2>
<?php
} ?>
</div>
@@ -425,9 +426,9 @@ else
</td>
</tr>
</table>
- <p style="padding-left:165px;">
- <input class="btn_sm" type="submit" value="<?php echo __('Post Update');?>">
- <input class="btn_sm" type="reset" value="<?php echo __('Reset');?>">
+ <p style="text-align:center;">
+ <input class="save pending" type="submit" value="<?php echo __('Post Update');?>">
+ <input type="reset" value="<?php echo __('Reset');?>">
</p>
</form>
<?php
@@ -485,9 +486,9 @@ else
</td>
</tr>
</table>
- <p style="padding-left:165px;">
- <input class="btn_sm" type="submit" value="<?php echo __('Post Note');?>">
- <input class="btn_sm" type="reset" value="<?php echo __('Reset');?>">
+ <p style="text-align:center;">
+ <input class="save pending" type="submit" value="<?php echo __('Post Note');?>">
+ <input type="reset" value="<?php echo __('Reset');?>">
</p>
</form>
</div>
diff --git a/include/staff/templates/tickets.tmpl.php b/include/staff/templates/tickets.tmpl.php
index d7ee6521b..30c04f011 100644
--- a/include/staff/templates/tickets.tmpl.php
+++ b/include/staff/templates/tickets.tmpl.php
@@ -48,7 +48,7 @@ TicketForm::ensureDynamicDataView();
// Fetch the results
$results = count($tickets);
?>
-<div style="width:700px;" class="pull-left">
+<div class="pull-left" style="margin-top:5px;">
<?php
if ($results) {
echo '<strong>'.sprintf(_N('Showing %d ticket', 'Showing %d tickets',
@@ -58,13 +58,15 @@ $results = count($tickets);
}
?>
</div>
-<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(); ?>">
- <?php print __('Create New Ticket'); ?></a></b>
- <?php
- } ?>
+<div style="margin-bottom:10px;">
+ <div class="pull-right flush-right">
+ <?php
+ if ($user) { ?>
+ <a class="green button action-button" href="tickets.php?a=open&uid=<?php echo $user->getId(); ?>">
+ <i class="icon-plus"></i> <?php print __('Create New Ticket'); ?></a>
+ <?php
+ } ?>
+ </div>
</div>
<br/>
<div>
diff --git a/include/staff/templates/users.tmpl.php b/include/staff/templates/users.tmpl.php
index 636e3999c..2e59879eb 100644
--- a/include/staff/templates/users.tmpl.php
+++ b/include/staff/templates/users.tmpl.php
@@ -56,22 +56,22 @@ else
$showing .= __("This organization doesn't have any users yet");
?>
-<div style="width:700px;" class="pull-left"><b><?php echo $showing; ?></b></div>
+<form action="orgs.php?id=<?php echo $org->getId(); ?>" method="POST" name="users" >
+
+<div style="margin-top:5px;" class="pull-left"><b><?php echo $showing; ?></b></div>
<?php if ($thisstaff->hasPerm(User::PERM_EDIT)) { ?>
-<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>
- |
- <b><a href="#orgs/<?php echo $org->getId(); ?>/import-users" class="add-user">
- <i class="icon-cloud-upload icon-large"></i>
- <?php echo __('Import'); ?></a></b>
+<div class="pull-right flush-right" style="margin-bottom:10px;">
+ <a href="#orgs/<?php echo $org->getId(); ?>/add-user" class="green button action-button add-user"
+ ><i class="icon-plus"></i> <?php echo __('Add User'); ?></a>
+ <a href="#orgs/<?php echo $org->getId(); ?>/import-users" class="button action-button add-user">
+ <i class="icon-cloud-upload icon-large"></i>
+ <?php echo __('Import'); ?></a>
+ <button id="actions" class="red button action-button" type="submit" name="remove-users"><i class="icon-trash"></i> <?php echo __('Remove'); ?></button>
</div>
<?php } ?>
<div class="clear"></div>
-<br/>
<?php
if ($num) { ?>
-<form action="orgs.php?id=<?php echo $org->getId(); ?>" method="POST" name="users" >
<?php csrf_token(); ?>
<input type="hidden" name="do" value="mass_process" >
<input type="hidden" id="id" name="id" value="<?php echo $org->getId(); ?>" >
@@ -148,9 +148,7 @@ if ($res && $num) { //Show options..
echo '<div> '.__('Page').':'.$pageNav->getPageLinks().' </div>';
?>
- <p class="centered" id="actions">
- <input class="button" type="submit" name="remove-users" value="<?php echo __('Remove'); ?>" >
- </p>
+
<?php
}
?>
diff --git a/include/staff/ticket-edit.inc.php b/include/staff/ticket-edit.inc.php
index e2bd902e2..d6312bf0e 100644
--- a/include/staff/ticket-edit.inc.php
+++ b/include/staff/ticket-edit.inc.php
@@ -11,19 +11,23 @@ if ($_POST)
$info['duedate'] = Format::date(strtotime($info['duedate']), false, false, 'UTC');
?>
<form action="tickets.php?id=<?php echo $ticket->getId(); ?>&a=edit" method="post" id="save" enctype="multipart/form-data">
- <?php csrf_token(); ?>
- <input type="hidden" name="do" value="update">
- <input type="hidden" name="a" value="edit">
- <input type="hidden" name="id" value="<?php echo $ticket->getId(); ?>">
- <h2><?php echo sprintf(__('Update Ticket #%s'),$ticket->getNumber());?></h2>
- <table class="form_table" width="940" border="0" cellspacing="0" cellpadding="2">
- <tbody>
- <tr>
- <th colspan="2">
- <em><strong><?php echo __('User Information'); ?></strong>: <?php echo __('Currently selected user'); ?></em>
- </th>
- </tr>
- <?php
+ <?php csrf_token(); ?>
+ <input type="hidden" name="do" value="update">
+ <input type="hidden" name="a" value="edit">
+ <input type="hidden" name="id" value="<?php echo $ticket->getId(); ?>">
+ <div style="margin-bottom:20px; padding-top:5px;">
+ <div class="pull-left flush-left">
+ <h2><?php echo sprintf(__('Update Ticket #%s'),$ticket->getNumber());?></h2>
+ </div>
+ </div>
+ <table class="form_table" width="940" border="0" cellspacing="0" cellpadding="2">
+ <tbody>
+ <tr>
+ <th colspan="2">
+ <em><strong><?php echo __('User Information'); ?></strong>: <?php echo __('Currently selected user'); ?></em>
+ </th>
+ </tr>
+ <?php
if(!$info['user_id'] || !($user = User::lookup($info['user_id'])))
$user = $ticket->getUser();
?>
@@ -156,7 +160,7 @@ if ($_POST)
</tr>
</tbody>
</table>
-<p style="padding-left:250px;">
+<p style="text-align:center;">
<input type="submit" name="submit" value="<?php echo __('Save');?>">
<input type="reset" name="reset" value="<?php echo __('Reset');?>">
<input type="button" name="cancel" value="<?php echo __('Cancel');?>" onclick='window.location.href="tickets.php?id=<?php echo $ticket->getId(); ?>"'>
diff --git a/include/staff/ticket-open.inc.php b/include/staff/ticket-open.inc.php
index 4b536cd24..6dd80fa83 100644
--- a/include/staff/ticket-open.inc.php
+++ b/include/staff/ticket-open.inc.php
@@ -29,19 +29,18 @@ if ($_POST)
<?php csrf_token(); ?>
<input type="hidden" name="do" value="create">
<input type="hidden" name="a" value="open">
- <h2><?php echo __('Open a New Ticket');?></h2>
+<div style="margin-bottom:20px; padding-top:5px;">
+ <div class="pull-left flush-left">
+ <h2><?php echo __('Open a New Ticket');?></h2>
+ </div>
+</div>
<table class="form_table fixed" width="940" border="0" cellspacing="0" cellpadding="2">
<thead>
<!-- This looks empty - but beware, with fixed table layout, the user
agent will usually only consult the cells in the first row to
construct the column widths of the entire toable. Therefore, the
first row needs to have two cells -->
- <tr><td></td><td></td></tr>
- <tr>
- <th colspan="2">
- <h4><?php echo __('New Ticket');?></h4>
- </th>
- </tr>
+ <tr><td style="padding:0;"></td><td style="padding:0;"></td></tr>
</thead>
<tbody>
<tr>
diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php
index 5bf1a6e5c..c59d7ffaa 100644
--- a/include/staff/ticket-view.inc.php
+++ b/include/staff/ticket-view.inc.php
@@ -193,7 +193,9 @@ if($ticket->isOverdue())
<div class="flush-left">
<h2><a href="tickets.php?id=<?php echo $ticket->getId(); ?>"
title="<?php echo __('Reload'); ?>"><i class="icon-refresh"></i>
- <?php echo sprintf(__('Ticket #%s'), $ticket->getNumber()); ?></a></h2>
+ <?php echo sprintf(__('Ticket #%s'), $ticket->getNumber()); ?></a>
+ <?php if ($ticket) { ?> – <?php echo $ticket->getSubject(); } ?>
+ </h2>
</div>
</div>
</div>
@@ -438,7 +440,7 @@ foreach (DynamicFormEntry::forTicket($ticket->getId()) as $form) {
} ?>
</table>
<div class="clear"></div>
-<h2 style="padding:10px 0 5px 0; font-size:11pt;"><?php echo Format::htmlchars($ticket->getSubject()); ?></h2>
+
<?php
$tcount = $ticket->getThreadEntries($types)->count();
?>
@@ -670,7 +672,7 @@ $tcount = $ticket->getThreadEntries($types)->count();
</tr>
</tbody>
</table>
- <p style="padding:0 165px;">
+ <p style="text-align:center;">
<input class="save pending" type="submit" value="<?php echo __('Post Reply');?>">
<input class="" type="reset" value="<?php echo __('Reset');?>">
</p>
@@ -757,7 +759,7 @@ $tcount = $ticket->getThreadEntries($types)->count();
</tr>
</table>
- <p style="padding-left:165px;">
+ <p style="text-align:center;">
<input class="save pending" type="submit" value="<?php echo __('Post Note');?>">
<input class="" type="reset" value="<?php echo __('Reset');?>">
</p>
diff --git a/include/staff/tickets.inc.php b/include/staff/tickets.inc.php
index 5d982b1b0..740d7bc66 100644
--- a/include/staff/tickets.inc.php
+++ b/include/staff/tickets.inc.php
@@ -350,19 +350,20 @@ return false;">
</div>
<!-- SEARCH FORM END -->
<div class="clear"></div>
-<div style="margin-bottom:20px; padding-top:10px;">
-<div class="sticky bar opaque">
- <div class="content">
- <div class="pull-left flush-left">
- <h2><a href="<?php echo $refresh_url; ?>"
- title="<?php echo __('Refresh'); ?>"><i class="icon-refresh"></i> <?php echo
- $results_type; ?></a></h2>
- </div>
- <div class="pull-right flush-right">
+<div style="margin-bottom:20px; padding-top:5px;">
+ <div class="sticky bar opaque">
+ <div class="content">
+ <div class="pull-left flush-left">
+ <h2><a href="<?php echo $refresh_url; ?>"
+ title="<?php echo __('Refresh'); ?>"><i class="icon-refresh"></i> <?php echo
+ $results_type; ?></a></h2>
+ </div>
+ <div class="pull-right flush-right">
<?php
if ($count) {
Ticket::agentActions($thisstaff, array('status' => $status));
}?>
+ </div>
</div>
</div>
</div>
diff --git a/include/staff/user-view.inc.php b/include/staff/user-view.inc.php
index 4d02b3d66..35ca5b69f 100644
--- a/include/staff/user-view.inc.php
+++ b/include/staff/user-view.inc.php
@@ -21,7 +21,7 @@ $org = $user->getOrganization();
</span>
<?php }
if ($thisstaff->hasPerm(User::PERM_DELETE)) { ?>
- <a id="user-delete" class="action-button pull-right user-action"
+ <a id="user-delete" class="red button action-button pull-right user-action"
href="#users/<?php echo $user->getId(); ?>/delete"><i class="icon-trash"></i>
<?php echo __('Delete User'); ?></a>
<?php } ?>
diff --git a/include/staff/users.inc.php b/include/staff/users.inc.php
index 1632f0f20..23de378ba 100644
--- a/include/staff/users.inc.php
+++ b/include/staff/users.inc.php
@@ -56,74 +56,83 @@ $users->values('id', 'name', 'default_email__address', 'account__id',
'account__status', 'created', 'updated');
$users->order_by($order . $order_column);
?>
-<h2><?php echo __('User Directory'); ?></h2>
-<div class="pull-left">
- <form action="users.php" method="get">
- <?php csrf_token(); ?>
- <input type="hidden" name="a" value="search">
- <table>
- <tr>
- <td><input type="search" id="basic-user-search" name="query"
- autofocus size="30" value="<?php echo Format::htmlchars($_REQUEST['query']); ?>"
- autocomplete="off" autocorrect="off" autocapitalize="off"></td>
- <td><input type="submit" name="basic_search" class="button" value="<?php echo __('Search'); ?>"></td>
- <!-- <td> <a href="" id="advanced-user-search">[advanced]</a></td> -->
- </tr>
- </table>
- </form>
+<div id="basic_search">
+ <div style="min-height:25px;">
+ <form action="users.php" method="get">
+ <?php csrf_token(); ?>
+ <input type="hidden" name="a" value="search">
+ <div class="attached input">
+ <input type="search" class="basic-search" id="basic-user-search" name="query"
+ autofocus size="30" value="<?php echo Format::htmlchars($_REQUEST['query']); ?>"
+ autocomplete="off" autocorrect="off" autocapitalize="off">
+ <!-- <td> <a href="" id="advanced-user-search">[advanced]</a></td> -->
+ <button type="submit" class="attached button"><i class="icon-search"></i>
+ </button>
+ </div>
+ </form>
+ </div>
</div>
+<form id="users-list" action="users.php" method="POST" name="staff" >
-<div class="pull-right">
-<?php if ($thisstaff->hasPerm(User::PERM_CREATE)) { ?>
- <a class="green button action-button popup-dialog"
- href="#users/add">
- <i class="icon-plus-sign"></i>
- <?php echo __('Add User'); ?>
- </a>
- <a class="action-button popup-dialog"
- href="#users/import">
- <i class="icon-upload"></i>
- <?php echo __('Import'); ?>
- </a>
-<?php } ?>
- <span class="action-button" data-dropdown="#action-dropdown-more"
- style="/*DELME*/ vertical-align:top; margin-bottom:0">
- <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>
-<?php if ($thisstaff->hasPerm(User::PERM_EDIT)) { ?>
- <li><a href="#add-to-org" class="users-action">
- <i class="icon-group icon-fixed-width"></i>
- <?php echo __('Add to Organization'); ?></a></li>
-<?php
-}
-if ('disabled' != $cfg->getClientRegistrationMode()) { ?>
- <li><a class="users-action" href="#reset">
- <i class="icon-envelope icon-fixed-width"></i>
- <?php echo __('Send Password Reset Email'); ?></a></li>
-<?php if ($thisstaff->hasPerm(User::PERM_MANAGE)) { ?>
- <li><a class="users-action" href="#register">
- <i class="icon-smile icon-fixed-width"></i>
- <?php echo __('Register'); ?></a></li>
- <li><a class="users-action" href="#lock">
- <i class="icon-lock icon-fixed-width"></i>
- <?php echo __('Lock'); ?></a></li>
- <li><a class="users-action" href="#unlock">
- <i class="icon-unlock icon-fixed-width"></i>
- <?php echo __('Unlock'); ?></a></li>
-<?php }
-if ($thisstaff->hasPerm(User::PERM_DELETE)) { ?>
- <li class="danger"><a class="users-action" href="#delete">
- <i class="icon-trash icon-fixed-width"></i>
- <?php echo __('Delete'); ?></a></li>
-<?php }
-} # end of registration-enabled? ?>
- </ul>
+<div style="margin-bottom:20px; padding-top:5px;">
+ <div class="sticky bar opaque">
+ <div class="content">
+ <div class="pull-left flush-left">
+ <h2><?php echo __('User Directory'); ?></h2>
+ </div>
+ <div class="pull-right">
+ <?php if ($thisstaff->hasPerm(User::PERM_CREATE)) { ?>
+ <a class="green button action-button popup-dialog"
+ href="#users/add">
+ <i class="icon-plus-sign"></i>
+ <?php echo __('Add User'); ?>
+ </a>
+ <a class="action-button popup-dialog"
+ href="#users/import">
+ <i class="icon-upload"></i>
+ <?php echo __('Import'); ?>
+ </a>
+ <?php } ?>
+ <span class="action-button" data-dropdown="#action-dropdown-more"
+ style="/*DELME*/ vertical-align:top; margin-bottom:0">
+ <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>
+ <?php if ($thisstaff->hasPerm(User::PERM_EDIT)) { ?>
+ <li><a href="#add-to-org" class="users-action">
+ <i class="icon-group icon-fixed-width"></i>
+ <?php echo __('Add to Organization'); ?></a></li>
+ <?php
+ }
+ if ('disabled' != $cfg->getClientRegistrationMode()) { ?>
+ <li><a class="users-action" href="#reset">
+ <i class="icon-envelope icon-fixed-width"></i>
+ <?php echo __('Send Password Reset Email'); ?></a></li>
+ <?php if ($thisstaff->hasPerm(User::PERM_MANAGE)) { ?>
+ <li><a class="users-action" href="#register">
+ <i class="icon-smile icon-fixed-width"></i>
+ <?php echo __('Register'); ?></a></li>
+ <li><a class="users-action" href="#lock">
+ <i class="icon-lock icon-fixed-width"></i>
+ <?php echo __('Lock'); ?></a></li>
+ <li><a class="users-action" href="#unlock">
+ <i class="icon-unlock icon-fixed-width"></i>
+ <?php echo __('Unlock'); ?></a></li>
+ <?php }
+ if ($thisstaff->hasPerm(User::PERM_DELETE)) { ?>
+ <li class="danger"><a class="users-action" href="#delete">
+ <i class="icon-trash icon-fixed-width"></i>
+ <?php echo __('Delete'); ?></a></li>
+ <?php }
+ } # end of registration-enabled? ?>
+ </ul>
+ </div>
+ </div>
+ </div>
</div>
</div>
-
<div class="clear"></div>
<?php
$showing = $search ? __('Search Results').': ' : '';
@@ -132,14 +141,12 @@ if($users->exists(true))
else
$showing .= __('No users found!');
?>
-<form id="users-list" action="users.php" method="POST" name="staff" >
<?php csrf_token(); ?>
<input type="hidden" name="do" value="mass_process" >
<input type="hidden" id="action" name="a" value="" >
<input type="hidden" id="selected-count" name="count" value="" >
<input type="hidden" id="org_id" name="org_id" value="" >
<table class="list" border="0" cellspacing="1" cellpadding="0" width="940">
- <caption><?php echo $showing; ?></caption>
<thead>
<tr>
<th nowrap width="12"> </th>
diff --git a/scp/css/scp.css b/scp/css/scp.css
index a560fbded..2cb1f025e 100644
--- a/scp/css/scp.css
+++ b/scp/css/scp.css
@@ -100,20 +100,20 @@ a time.relative {
color: #555;
}
-.banner { margin: 0; padding: 5px 5px 11px; margin-bottom: 10px; color: #444; border: 1px solid #444; background-color: #ddd; border-radius: 4px; }
+.banner { margin: -10px 0 10px 0; padding: 10px 10px 10px 36px; color: #444; border: 1px solid #444; background-color: #ddd; border-radius: 4px; }
#msg_info,
-.info-banner { margin: 0; padding: 5px; margin-bottom: 10px; color: #3a87ad; border: 1px solid #bce8f1; background-color: #d9edf7; }
+.info-banner { margin: -10px 0 10px 0; padding: 10px 10px 10px 36px; color: #3a87ad; border: 1px solid #bce8f1; background-color: #d9edf7; }
#msg_notice,
.success-banner,
-.notice-banner { margin: 0; padding: 5px 10px 5px 36px; margin-bottom: 10px; border: 1px solid #0a0; background: url('../images/icons/ok.png') 10px 50% no-repeat #e0ffe0; }
+.notice-banner { margin: -10px 0 10px 0; padding: 10px 10px 10px 36px; border: 1px solid #0a0; background: url('../images/icons/ok.png') 10px 50% no-repeat #e0ffe0; }
#msg_warning,
-.warning-banner { margin: 0; padding: 5px 10px 5px 36px; margin-bottom: 10px; border: 1px solid #f26522; background: url('../images/icons/alert.png') 10px 50% no-repeat #ffffdd; }
+.warning-banner { margin: -10px 0 10px 0; padding: 10px 10px 10px 36px; border: 1px solid #f26522; background: url('../images/icons/alert.png') 10px 50% no-repeat #ffffdd; }
#msg_error,
-.error-banner { margin: 0; padding: 5px 10px 5px 36px; margin-bottom: 10px; border: 1px solid #a00; background: url('../images/icons/error.png') 10px 50% no-repeat #fff0f0; }
+.error-banner { margin: -10px 0 10px 0; padding: 10px 10px 10px 36px; border: 1px solid #a00; background: url('../images/icons/error.png') 10px 50% no-repeat #fff0f0; }
#notice_bar { margin: 0; padding: 5px 10px 5px 36px; height: 16px; line-height: 16px; border: 1px solid #0a0; background: url('../images/icons/ok.png') 10px 50% no-repeat #e0ffe0; }
@@ -1040,7 +1040,6 @@ ul.tabs {
}
#response_options ul.tabs {
- padding-left:190px;
}
ul.tabs li {
@@ -1432,7 +1431,7 @@ caption:hover > i.help-tip {
h2 > i.help-tip {
vertical-align: middle;
- font-size: 1.1em;
+ font-size: .85em;
}
.form_table th h4 i.help-tip {
color: white;
@@ -1836,7 +1835,7 @@ select + .button {
}
button[type=submit], input[type="submit"], .primary.button {
- font-weight: bold;
+ font-weight: normal;
box-shadow: 0 0 0 1px rgba(0,0,0,0.45) inset;
background-color: rgba(0,0,0,0.07);
}
@@ -2236,18 +2235,20 @@ tr.disabled th {
}
.label {
- font-size: 11px;
- padding: 1px 4px;
- -webkit-border-radius: 3px;
- -moz-border-radius: 3px;
- border-radius: 3px;
- font-weight: bold;
- line-height: 14px;
- color: #ffffff;
- vertical-align: baseline;
- white-space: nowrap;
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
- background-color: #999999;
+ float: right;
+ margin-bottom: 4px;
+ font-size: 11px;
+ padding: 0px 4px;
+ -webkit-border-radius: 3px;
+ -moz-border-radius: 3px;
+ border-radius: 3px;
+ font-weight: bold;
+ line-height: 24px;
+ color: #ffffff;
+ vertical-align: baseline;
+ white-space: nowrap;
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+ background-color: #999999;
}
.label-bare {
background-color: transparent;
@@ -2391,6 +2392,8 @@ tr i.help-tip.warning {
.ltr {
direction: ltr;
unicode-bidi: embed;
+ font-weight:normal;
+ font-style:italic;
}
.required {
font-weight: bold;
diff --git a/scp/dashboard.php b/scp/dashboard.php
index 8e4805678..2d6b20dfe 100644
--- a/scp/dashboard.php
+++ b/scp/dashboard.php
@@ -18,54 +18,6 @@ $nav->setTabActive('dashboard');
$ost->addExtraHeader('<meta name="tip-namespace" content="dashboard.dashboard" />',
"$('#content').data('tipNamespace', 'dashboard.dashboard');");
require(STAFFINC_DIR.'header.inc.php');
-?>
-
-<script type="text/javascript" src="js/raphael-min.js"></script>
-<script type="text/javascript" src="js/g.raphael.js"></script>
-<script type="text/javascript" src="js/g.line-min.js"></script>
-<script type="text/javascript" src="js/g.dot-min.js"></script>
-<script type="text/javascript" src="js/bootstrap-tab.js"></script>
-<script type="text/javascript" src="js/dashboard.inc.js"></script>
-
-<link rel="stylesheet" type="text/css" href="css/bootstrap.css"/>
-<link rel="stylesheet" type="text/css" href="css/dashboard.css"/>
-
-<h2><?php echo __('Ticket Activity');
-?> <i class="help-tip icon-question-sign" href="#ticket_activity"></i></h2>
-<p><?php echo __('Select the starting time and period for the system activity graph');?></p>
-<form class="well form-inline" id="timeframe-form">
- <label>
- <i class="help-tip icon-question-sign" href="#report_timeframe"></i> <?php
- echo __('Report timeframe'); ?>:
- <input type="text" class="dp input-medium search-query"
- name="start" placeholder="<?php echo __('Last month');?>"/>
- </label>
- <label>
- <?php echo __('period');?>:
- <select name="period">
- <option value="now" selected="selected"><?php echo __('Up to today');?></option>
- <option value="+7 days"><?php echo __('One Week');?></option>
- <option value="+14 days"><?php echo __('Two Weeks');?></option>
- <option value="+1 month"><?php echo __('One Month');?></option>
- <option value="+3 months"><?php echo __('One Quarter');?></option>
- </select>
- </label>
- <button class="btn" type="submit"><?php echo __('Refresh');?></button>
-</form>
-
-<!-- Create a graph and fetch some data to create pretty dashboard -->
-<div style="position:relative">
- <div id="line-chart-here" style="height:300px"></div>
- <div style="position:absolute;right:0;top:0" id="line-chart-legend"></div>
-</div>
-
-<hr/>
-<h2><?php echo __('Statistics'); ?> <i class="help-tip icon-question-sign" href="#statistics"></i></h2>
-<p><?php echo __('Statistics of tickets organized by department, help topic, and agent.');?></p>
-<ul class="nav nav-tabs" id="tabular-navigation"></ul>
-
-<div id="table-here"></div>
-
-<?php
+require_once(STAFFINC_DIR.'dashboard.inc.php');
include(STAFFINC_DIR.'footer.inc.php');
?>
diff --git a/scp/js/dashboard.inc.js b/scp/js/dashboard.inc.js
index 683135e62..147282596 100644
--- a/scp/js/dashboard.inc.js
+++ b/scp/js/dashboard.inc.js
@@ -102,7 +102,7 @@
if (this.start) build_table.apply(this);
return false;
}
- $(function() { $('tabular-navigation').tab(); });
+ //$(function() { $('tabular-navigation').tab(); });
// Add tabs for the tabular display
$(function() {
@@ -128,7 +128,7 @@
var start, stop;
function build_table() {
if (this.tagName == 'A') {
- current_tab = $(this).tab('show');
+ //current_tab = $(this).tab('show');
}
else if (this.start) {
start = this.start.value || 'last month';
diff --git a/scp/js/scp.js b/scp/js/scp.js
index a47af3361..2d59d913a 100644
--- a/scp/js/scp.js
+++ b/scp/js/scp.js
@@ -84,7 +84,7 @@ var scp_prep = function() {
return false;
});
- $('#actions :submit.button:not(.no-confirm), #actions .confirm').bind('click', function(e) {
+ $('#actions:submit, #actions :submit.button:not(.no-confirm), #actions .confirm').bind('click', function(e) {
var formObj,
name = this.name || $(this).data('name');
@@ -136,7 +136,7 @@ var scp_prep = function() {
var fObj = el.closest('form');
if(!fObj.data('changed')){
fObj.data('changed', true);
- $('input[type=submit]', fObj).addClass('save pending');
+ $('input[type=submit], button[type=submit]', fObj).addClass('save pending');
$(window).bind('beforeunload', function(e) {
return __('Are you sure you want to leave? Any changes or info you\'ve entered will be discarded!');
});
@@ -146,14 +146,14 @@ var scp_prep = function() {
}
};
- $("form#save").on('change', ':input[name]', function() {
+ $("form#save").on('change', ':input[name], :button[name]', function() {
if (!$(this).is('.nowarn')) warnOnLeave($(this));
});
- $("form#save").on('change', ':input[type=reset]', function() {
+ $("form#save").on('click', ':input[type=reset], :button[type=reset]', function() {
var fObj = $(this).closest('form');
if(fObj.data('changed')){
- $('input[type=submit]', fObj).removeClass('save pending');
+ $('input[type=submit], button[type=submit]', fObj).removeClass('save pending');
$('label', fObj).removeAttr('style');
$('label', fObj).removeClass('strike');
fObj.data('changed', false);
@@ -587,7 +587,7 @@ $.toggleOverlay = function (show) {
$('body').css('overflow', 'auto');
}
};
-
+//modal---------//
$.dialog = function (url, codes, cb, options) {
options = options||{};
@@ -746,7 +746,7 @@ $.confirm = function(message, title, options) {
.append($('<input type="button" class="close"/>')
.attr('value', __('Cancel'))
.click(function() { hide(); })
- )).append($('<span class="buttons pull-right"></span>')
+ )).append($('<span class="buttons pull-right">test</span>')
.append($('<input type="button"/>')
.attr('value', __('OK'))
.click(function() { hide(); D.resolve(body.find('input').serializeArray()); })
--
GitLab