From 9cd84c2690679cb239ce6cb5a115cfe800ca445a Mon Sep 17 00:00:00 2001 From: Nathan Febuary <nathan@bedheadcreative.com> Date: Thu, 6 Aug 2015 00:30:31 -0500 Subject: [PATCH] Dashboard & Tables Adjusted all tables to use % instead of px. Styled dashboard page. --- include/staff/apikeys.inc.php | 14 +++++++------- include/staff/banlist.inc.php | 12 ++++++------ include/staff/cannedresponses.inc.php | 12 ++++++------ include/staff/categories.inc.php | 12 ++++++------ include/staff/category.inc.php | 2 +- include/staff/dashboard.inc.php | 2 +- include/staff/departments.inc.php | 14 +++++++------- include/staff/directory.inc.php | 12 ++++++------ include/staff/dynamic-forms.inc.php | 8 ++++---- include/staff/dynamic-lists.inc.php | 10 +++++----- include/staff/emails.inc.php | 14 +++++++------- include/staff/faq-categories.inc.php | 4 ++-- include/staff/faq.inc.php | 3 +-- include/staff/filters.inc.php | 18 +++++++++--------- include/staff/helptopics.inc.php | 16 ++++++++-------- include/staff/orgs.inc.php | 12 ++++++------ include/staff/pages.inc.php | 14 +++++++------- include/staff/plugins.inc.php | 10 +++++----- include/staff/roles.inc.php | 12 ++++++------ include/staff/slaplans.inc.php | 14 +++++++------- include/staff/staffmembers.inc.php | 16 ++++++++-------- include/staff/syslogs.inc.php | 12 ++++++------ include/staff/tasks.inc.php | 12 ++++++------ include/staff/teams.inc.php | 16 ++++++++-------- include/staff/templates.inc.php | 14 +++++++------- include/staff/tickets.inc.php | 20 ++++++++++---------- include/staff/users.inc.php | 14 +++++++------- scp/css/scp.css | 26 ++++++++++++++++++++++++++ 28 files changed, 185 insertions(+), 160 deletions(-) diff --git a/include/staff/apikeys.inc.php b/include/staff/apikeys.inc.php index 5e3d24b4b..2fd02c902 100644 --- a/include/staff/apikeys.inc.php +++ b/include/staff/apikeys.inc.php @@ -84,12 +84,12 @@ else <table class="list" border="0" cellspacing="1" cellpadding="0" width="940"> <thead> <tr> - <th width="7"> </th> - <th width="320"><a <?php echo $key_sort; ?> href="apikeys.php?<?php echo $qstr; ?>&sort=key"><?php echo __('API Key');?></a></th> - <th width="120"><a <?php echo $ip_sort; ?> href="apikeys.php?<?php echo $qstr; ?>&sort=ip"><?php echo __('IP Address');?></a></th> - <th width="100"><a <?php echo $status_sort; ?> href="apikeys.php?<?php echo $qstr; ?>&sort=status"><?php echo __('Status');?></a></th> - <th width="150" nowrap><a <?php echo $date_sort; ?>href="apikeys.php?<?php echo $qstr; ?>&sort=date"><?php echo __('Date Added');?></a></th> - <th width="150" nowrap><a <?php echo $updated_sort; ?>href="apikeys.php?<?php echo $qstr; ?>&sort=updated"><?php echo __('Last Updated');?></a></th> + <th width="4%"> </th> + <th width="46%"><a <?php echo $key_sort; ?> href="apikeys.php?<?php echo $qstr; ?>&sort=key"><?php echo __('API Key');?></a></th> + <th width="12%"><a <?php echo $ip_sort; ?> href="apikeys.php?<?php echo $qstr; ?>&sort=ip"><?php echo __('IP Address');?></a></th> + <th width="8%"><a <?php echo $status_sort; ?> href="apikeys.php?<?php echo $qstr; ?>&sort=status"><?php echo __('Status');?></a></th> + <th width="10%" nowrap><a <?php echo $date_sort; ?>href="apikeys.php?<?php echo $qstr; ?>&sort=date"><?php echo __('Date Added');?></a></th> + <th width="20%" nowrap><a <?php echo $updated_sort; ?>href="apikeys.php?<?php echo $qstr; ?>&sort=updated"><?php echo __('Last Updated');?></a></th> </tr> </thead> <tbody> @@ -103,7 +103,7 @@ else $sel=true; ?> <tr id="<?php echo $row['id']; ?>"> - <td width=7px> + <td align="center"> <input type="checkbox" class="ckb" name="ids[]" value="<?php echo $row['id']; ?>" <?php echo $sel?'checked="checked"':''; ?>> </td> <td> <a href="apikeys.php?id=<?php echo $row['id']; ?>"><?php echo Format::htmlchars($row['apikey']); ?></a></td> diff --git a/include/staff/banlist.inc.php b/include/staff/banlist.inc.php index 9fb46b64e..8b3a1e681 100644 --- a/include/staff/banlist.inc.php +++ b/include/staff/banlist.inc.php @@ -109,11 +109,11 @@ $query="$select $from $where ORDER BY $order_by LIMIT ".$pageNav->getStart()."," <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> + <th width="4%"> </th> + <th width="56%"><a <?php echo $email_sort; ?> href="staff.php?<?php echo $qstr; ?>&sort=email"><?php echo __('Email Address');?></a></th> + <th width="10%"><a <?php echo $status_sort; ?> href="staff.php?<?php echo $qstr; ?>&sort=status"><?php echo __('Ban Status');?></a></th> + <th width="10%"><a <?php echo $created_sort; ?> href="staff.php?<?php echo $qstr; ?>&sort=created"><?php echo __('Date Added');?></a></th> + <th width="20%"><a <?php echo $updated_sort; ?> href="staff.php?<?php echo $qstr; ?>&sort=updated"><?php echo __('Last Updated');?></a></th> </tr> </thead> <tbody> @@ -126,7 +126,7 @@ $query="$select $from $where ORDER BY $order_by LIMIT ".$pageNav->getStart()."," $sel=true; ?> <tr id="<?php echo $row['id']; ?>"> - <td width=7px> + <td align="center"> <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> diff --git a/include/staff/cannedresponses.inc.php b/include/staff/cannedresponses.inc.php index 46b89958c..1a55d08db 100644 --- a/include/staff/cannedresponses.inc.php +++ b/include/staff/cannedresponses.inc.php @@ -96,11 +96,11 @@ else <table class="list" border="0" cellspacing="1" cellpadding="0" width="940"> <thead> <tr> - <th width="7"> </th> - <th width="500"><a <?php echo $title_sort; ?> href="canned.php?<?php echo $qstr; ?>&sort=title"><?php echo __('Title');?></a></th> - <th width="80"><a <?php echo $status_sort; ?> href="canned.php?<?php echo $qstr; ?>&sort=status"><?php echo __('Status');?></a></th> - <th width="200"><a <?php echo $dept_sort; ?> href="canned.php?<?php echo $qstr; ?>&sort=dept"><?php echo __('Department');?></a></th> - <th width="150" nowrap><a <?php echo $updated_sort; ?>href="canned.php?<?php echo $qstr; ?>&sort=updated"><?php echo __('Last Updated');?></a></th> + <th width="4%"> </th> + <th width="46%"><a <?php echo $title_sort; ?> href="canned.php?<?php echo $qstr; ?>&sort=title"><?php echo __('Title');?></a></th> + <th width="10%"><a <?php echo $status_sort; ?> href="canned.php?<?php echo $qstr; ?>&sort=status"><?php echo __('Status');?></a></th> + <th width="20%"><a <?php echo $dept_sort; ?> href="canned.php?<?php echo $qstr; ?>&sort=dept"><?php echo __('Department');?></a></th> + <th width="20%" nowrap><a <?php echo $updated_sort; ?>href="canned.php?<?php echo $qstr; ?>&sort=updated"><?php echo __('Last Updated');?></a></th> </tr> </thead> <tbody> @@ -115,7 +115,7 @@ else $files=$row['files']?'<span class="Icon file"> </span>':''; ?> <tr id="<?php echo $row['canned_id']; ?>"> - <td width=7px> + <td align="center"> <input type="checkbox" name="ids[]" value="<?php echo $row['canned_id']; ?>" class="ckb" <?php echo $sel?'checked="checked"':''; ?> /> </td> diff --git a/include/staff/categories.inc.php b/include/staff/categories.inc.php index 7826e21c7..222079b52 100644 --- a/include/staff/categories.inc.php +++ b/include/staff/categories.inc.php @@ -75,11 +75,11 @@ else <table class="list" border="0" cellspacing="1" cellpadding="0" width="940"> <thead> <tr> - <th width="7"> </th> - <th width="500"><a <?php echo $name_sort; ?> href="categories.php?<?php echo $qstr; ?>&sort=name"><?php echo __('Name');?></a></th> - <th width="150"><a <?php echo $type_sort; ?> href="categories.php?<?php echo $qstr; ?>&sort=type"><?php echo __('Type');?></a></th> - <th width="80"><a <?php echo $faqs_sort; ?> href="categories.php?<?php echo $qstr; ?>&sort=faqs"><?php echo __('FAQs');?></a></th> - <th width="150" nowrap><a <?php echo $updated_sort; ?>href="categories.php?<?php echo $qstr; ?>&sort=updated"><?php echo __('Last Updated');?></a></th> + <th width="4%"> </th> + <th width="56%"><a <?php echo $name_sort; ?> href="categories.php?<?php echo $qstr; ?>&sort=name"><?php echo __('Name');?></a></th> + <th width="10%"><a <?php echo $type_sort; ?> href="categories.php?<?php echo $qstr; ?>&sort=type"><?php echo __('Type');?></a></th> + <th width="10%"><a <?php echo $faqs_sort; ?> href="categories.php?<?php echo $qstr; ?>&sort=faqs"><?php echo __('FAQs');?></a></th> + <th width="20%" nowrap><a <?php echo $updated_sort; ?>href="categories.php?<?php echo $qstr; ?>&sort=updated"><?php echo __('Last Updated');?></a></th> </tr> </thead> <tbody> @@ -96,7 +96,7 @@ else $faqs=sprintf('<a href="faq.php?cid=%d">%d</a>',$C->getId(),$C->faq_count); ?> <tr id="<?php echo $C->getId(); ?>"> - <td width=7px> + <td align="center"> <input type="checkbox" name="ids[]" value="<?php echo $C->getId(); ?>" class="ckb" <?php echo $sel?'checked="checked"':''; ?>> </td> diff --git a/include/staff/category.inc.php b/include/staff/category.inc.php index d60d0d2f4..5db736154 100644 --- a/include/staff/category.inc.php +++ b/include/staff/category.inc.php @@ -137,7 +137,7 @@ if (count($langs) > 1) { ?> <div class="tab_content" id="notes" style="display:none;"> <b><?php echo __('Internal Notes');?></b>: - <div class="faded"><?php echo __("Be liberal, they're internal");?></div> + <span class="faded"><?php echo __("Be liberal, they're internal");?></span> <textarea class="richtext no-bar" name="notes" cols="21" rows="8" style="width: 80%;"><?php echo $info['notes']; ?></textarea> </div> diff --git a/include/staff/dashboard.inc.php b/include/staff/dashboard.inc.php index 76551ee75..0c16b8257 100644 --- a/include/staff/dashboard.inc.php +++ b/include/staff/dashboard.inc.php @@ -83,7 +83,7 @@ $first = true; foreach ($groups as $g=>$desc) { $data = $report->getTabularData($g); ?> <div class="tab_content <?php echo (!$first) ? 'hidden' : ''; ?>" id="<?php echo Format::slugify($g); ?>"> - <table class="table"><tbody><tr> + <table class="dashboard-stats table"><tbody><tr> <?php foreach ($data['columns'] as $c) { ?> <th><?php echo Format::htmlchars($c); ?></th> diff --git a/include/staff/departments.inc.php b/include/staff/departments.inc.php index 09711227c..2924eea68 100644 --- a/include/staff/departments.inc.php +++ b/include/staff/departments.inc.php @@ -68,12 +68,12 @@ $showing = $pageNav->showing().' '._N('department', 'departments', $count); <table class="list" border="0" cellspacing="1" cellpadding="0" width="940"> <thead> <tr> - <th width="7px"> </th> - <th width="200"><a <?php echo $name_sort; ?> href="departments.php?<?php echo $qstr; ?>&sort=name"><?php echo __('Name');?></a></th> - <th width="80"><a <?php echo $type_sort; ?> href="departments.php?<?php echo $qstr; ?>&sort=type"><?php echo __('Type');?></a></th> - <th width="70"><a <?php echo $users_sort; ?>href="departments.php?<?php echo $qstr; ?>&sort=users"><?php echo __('Agents');?></a></th> - <th width="300"><a <?php echo $email_sort; ?> href="departments.php?<?php echo $qstr; ?>&sort=email"><?php echo __('Email Address');?></a></th> - <th width="180"><a <?php echo $manager_sort; ?> href="departments.php?<?php echo $qstr; ?>&sort=manager"><?php echo __('Manager');?></a></th> + <th width="4%"> </th> + <th width="28%"><a <?php echo $name_sort; ?> href="departments.php?<?php echo $qstr; ?>&sort=name"><?php echo __('Name');?></a></th> + <th width="8%"><a <?php echo $type_sort; ?> href="departments.php?<?php echo $qstr; ?>&sort=type"><?php echo __('Type');?></a></th> + <th width="8%"><a <?php echo $users_sort; ?>href="departments.php?<?php echo $qstr; ?>&sort=users"><?php echo __('Agents');?></a></th> + <th width="30%"><a <?php echo $email_sort; ?> href="departments.php?<?php echo $qstr; ?>&sort=email"><?php echo __('Email Address');?></a></th> + <th width="22%"><a <?php echo $manager_sort; ?> href="departments.php?<?php echo $qstr; ?>&sort=manager"><?php echo __('Manager');?></a></th> </tr> </thead> <tbody> @@ -109,7 +109,7 @@ $showing = $pageNav->showing().' '._N('department', 'departments', $count); $default= ($defaultId == $dept->getId()) ?' <small>'.__('(Default)').'</small>' : ''; ?> <tr id="<?php echo $id; ?>"> - <td width=7px> + <td align="center"> <input type="checkbox" class="ckb" name="ids[]" value="<?php echo $id; ?>" <?php echo $sel? 'checked="checked"' : ''; ?> diff --git a/include/staff/directory.inc.php b/include/staff/directory.inc.php index b6996e25a..9eb4926dd 100644 --- a/include/staff/directory.inc.php +++ b/include/staff/directory.inc.php @@ -111,12 +111,12 @@ $qstr.='&order='.($order=='DESC' ? 'ASC' : 'DESC'); <table class="list" border="0" cellspacing="1" cellpadding="0" width="940"> <thead> <tr> - <th width="160"><a <?php echo $name_sort; ?> href="directory.php?<?php echo $qstr; ?>&sort=name"><?php echo __('Name');?></a></th> - <th width="150"><a <?php echo $dept_sort; ?>href="directory.php?<?php echo $qstr; ?>&sort=dept"><?php echo __('Department');?></a></th> - <th width="180"><a <?php echo $email_sort; ?>href="directory.php?<?php echo $qstr; ?>&sort=email"><?php echo __('Email Address');?></a></th> - <th width="120"><a <?php echo $phone_sort; ?> href="directory.php?<?php echo $qstr; ?>&sort=phone"><?php echo __('Phone Number');?></a></th> - <th width="80"><a <?php echo $ext_sort; ?> href="directory.php?<?php echo $qstr; ?>&sort=ext"><?php echo __(/* As in a phone number `extension` */ 'Extension');?></a></th> - <th width="120"><a <?php echo $mobile_sort; ?> href="directory.php?<?php echo $qstr; ?>&sort=mobile"><?php echo __('Mobile Number');?></a></th> + <th width="20%"><a <?php echo $name_sort; ?> href="directory.php?<?php echo $qstr; ?>&sort=name"><?php echo __('Name');?></a></th> + <th width="15%"><a <?php echo $dept_sort; ?>href="directory.php?<?php echo $qstr; ?>&sort=dept"><?php echo __('Department');?></a></th> + <th width="25%"><a <?php echo $email_sort; ?>href="directory.php?<?php echo $qstr; ?>&sort=email"><?php echo __('Email Address');?></a></th> + <th width="15%"><a <?php echo $phone_sort; ?> href="directory.php?<?php echo $qstr; ?>&sort=phone"><?php echo __('Phone Number');?></a></th> + <th width="10%"><a <?php echo $ext_sort; ?> href="directory.php?<?php echo $qstr; ?>&sort=ext"><?php echo __(/* As in a phone number `extension` */ 'Extension');?></a></th> + <th width="15%"><a <?php echo $mobile_sort; ?> href="directory.php?<?php echo $qstr; ?>&sort=mobile"><?php echo __('Mobile Number');?></a></th> </tr> </thead> <tbody> diff --git a/include/staff/dynamic-forms.inc.php b/include/staff/dynamic-forms.inc.php index fbb7e75ad..9bad2be61 100644 --- a/include/staff/dynamic-forms.inc.php +++ b/include/staff/dynamic-forms.inc.php @@ -45,8 +45,8 @@ $showing=$pageNav->showing().' '._N('form','forms',$count); <table class="list" border="0" cellspacing="1" cellpadding="0" width="940"> <thead> <tr> - <th width="7"> </th> - <th><?php echo __('Built-in Forms'); ?></th> + <th width="4%"> </th> + <th width="50%"><?php echo __('Built-in Forms'); ?></th> <th><?php echo __('Last Updated'); ?></th> </tr> </thead> @@ -63,7 +63,7 @@ $showing=$pageNav->showing().' '._N('form','forms',$count); ->filter(array('type__in'=>array_keys($forms))) ->order_by('type', 'title') as $form) { ?> <tr> - <td><i class="<?php echo $forms[$form->get('type')]; ?>"></i></td> + <td align="center"><i class="<?php echo $forms[$form->get('type')]; ?>"></i></td> <td><a href="?id=<?php echo $form->get('id'); ?>"> <?php echo $form->get('title'); ?></a> <td><?php echo $form->get('updated'); ?></td> @@ -73,7 +73,7 @@ $showing=$pageNav->showing().' '._N('form','forms',$count); <tbody> <thead> <tr> - <th width="7"> </th> + <th width="4%"> </th> <th><?php echo __('Custom Forms'); ?></th> <th><?php echo __('Last Updated'); ?></th> </tr> diff --git a/include/staff/dynamic-lists.inc.php b/include/staff/dynamic-lists.inc.php index 93197c79d..9f810d4a8 100644 --- a/include/staff/dynamic-lists.inc.php +++ b/include/staff/dynamic-lists.inc.php @@ -42,10 +42,10 @@ $showing=$pageNav->showing().' '._N('custom list', 'custom lists', $count); <table class="list" border="0" cellspacing="1" cellpadding="0" width="940"> <thead> <tr> - <th width="7"> </th> - <th><?php echo __('List Name'); ?></th> - <th><?php echo __('Created') ?></th> - <th><?php echo __('Last Updated'); ?></th> + <th width="4%"> </th> + <th width="32%"><?php echo __('List Name'); ?></th> + <th width="32%"><?php echo __('Created') ?></th> + <th width="32%"><?php echo __('Last Updated'); ?></th> </tr> </thead> <tbody> @@ -56,7 +56,7 @@ $showing=$pageNav->showing().' '._N('custom list', 'custom lists', $count); if ($ids && in_array($form->get('id'),$ids)) $sel = true; ?> <tr> - <td> + <td align="center"> <?php if ($list->isDeleteable()) { ?> <input width="7" type="checkbox" class="ckb" name="ids[]" diff --git a/include/staff/emails.inc.php b/include/staff/emails.inc.php index 30742a493..78c296ce2 100644 --- a/include/staff/emails.inc.php +++ b/include/staff/emails.inc.php @@ -71,12 +71,12 @@ $def_priority = $cfg->getDefaultPriority()->getDesc(); <table class="list" border="0" cellspacing="1" cellpadding="0" width="940"> <thead> <tr> - <th width="7"> </th> - <th width="400"><a <?php echo $email_sort; ?> href="emails.php?<?php echo $qstr; ?>&sort=email"><?php echo __('Email');?></a></th> - <th width="120"><a <?php echo $priority_sort; ?> href="emails.php?<?php echo $qstr; ?>&sort=priority"><?php echo __('Priority');?></a></th> - <th width="250"><a <?php echo $dept_sort; ?> href="emails.php?<?php echo $qstr; ?>&sort=dept"><?php echo __('Department');?></a></th> - <th width="110" nowrap><a <?php echo $created_sort; ?>href="emails.php?<?php echo $qstr; ?>&sort=created"><?php echo __('Created');?></a></th> - <th width="150" nowrap><a <?php echo $updated_sort; ?>href="emails.php?<?php echo $qstr; ?>&sort=updated"><?php echo __('Last Updated');?></a></th> + <th width="4%"> </th> + <th width="38%"><a <?php echo $email_sort; ?> href="emails.php?<?php echo $qstr; ?>&sort=email"><?php echo __('Email');?></a></th> + <th width="8%"><a <?php echo $priority_sort; ?> href="emails.php?<?php echo $qstr; ?>&sort=priority"><?php echo __('Priority');?></a></th> + <th width="15%"><a <?php echo $dept_sort; ?> href="emails.php?<?php echo $qstr; ?>&sort=dept"><?php echo __('Department');?></a></th> + <th width="15%" nowrap><a <?php echo $created_sort; ?>href="emails.php?<?php echo $qstr; ?>&sort=created"><?php echo __('Created');?></a></th> + <th width="20%" nowrap><a <?php echo $updated_sort; ?>href="emails.php?<?php echo $qstr; ?>&sort=updated"><?php echo __('Last Updated');?></a></th> </tr> </thead> <tbody> @@ -99,7 +99,7 @@ $def_priority = $cfg->getDefaultPriority()->getDesc(); $default=($id==$defaultId); ?> <tr id="<?php echo $id; ?>"> - <td width=7px> + <td align="center"> <input type="checkbox" class="ckb" name="ids[]" value="<?php echo $id; ?>" <?php echo $sel ? 'checked="checked" ' : ''; ?> diff --git a/include/staff/faq-categories.inc.php b/include/staff/faq-categories.inc.php index a94b5303d..d2aeb0cb7 100644 --- a/include/staff/faq-categories.inc.php +++ b/include/staff/faq-categories.inc.php @@ -20,14 +20,14 @@ if(!defined('OSTSTAFFINC') || !$thisstaff) die('Access Denied'); <span class="action-button muted" data-dropdown="#category-dropdown"> <i class="icon-caret-down pull-right"></i> <span> - <i class="icon icon-filter"></i> + <i class="icon-filter"></i> <?php echo __('Category'); ?> </span> </span> <span class="action-button muted" data-dropdown="#topic-dropdown"> <i class="icon-caret-down pull-right"></i> <span> - <i class="icon icon-filter"></i> + <i class="icon-filter"></i> <?php echo __('Help Topic'); ?> </span> </span> diff --git a/include/staff/faq.inc.php b/include/staff/faq.inc.php index 54c0a68ba..dace2536a 100644 --- a/include/staff/faq.inc.php +++ b/include/staff/faq.inc.php @@ -249,8 +249,7 @@ echo $attrs; ?>><?php echo $draft ?: $answer; <div class="tab_content" style="display:none;" id="notes"> <div> - <b><?php echo __('Internal Notes');?></b>: - <div class="faded"><?php echo __("Be liberal, they're internal");?></div> + <b><?php echo __('Internal Notes');?></b>:<span class="faded"><?php echo __("Be libergsdfgal, they're internal");?></span> </div> <div style="margin-top:10px"></div> <textarea class="richtext no-bar" name="notes" cols="21" diff --git a/include/staff/filters.inc.php b/include/staff/filters.inc.php index 343074de2..25a753302 100644 --- a/include/staff/filters.inc.php +++ b/include/staff/filters.inc.php @@ -88,14 +88,14 @@ else <table class="list" border="0" cellspacing="1" cellpadding="0" width="940"> <thead> <tr> - <th width="7"> </th> - <th width="320"><a <?php echo $name_sort; ?> href="filters.php?<?php echo $qstr; ?>&sort=name"><?php echo __('Name');?></a></th> - <th width="80"><a <?php echo $status_sort; ?> href="filters.php?<?php echo $qstr; ?>&sort=status"><?php echo __('Status');?></a></th> - <th width="80" style="text-align:center;"><a <?php echo $order_sort; ?> href="filters.php?<?php echo $qstr; ?>&sort=order"><?php echo __('Order');?></a></th> - <th width="80" style="text-align:center;"><a <?php echo $rules_sort; ?> href="filters.php?<?php echo $qstr; ?>&sort=rules"><?php echo __('Rules');?></a></th> - <th width="100"><a <?php echo $target_sort; ?> href="filters.php?<?php echo $qstr; ?>&sort=target"><?php echo __('Target');?></a></th> - <th width="120" nowrap><a <?php echo $created_sort; ?>href="filters.php?<?php echo $qstr; ?>&sort=created"><?php echo __('Date Added');?></a></th> - <th width="150" nowrap><a <?php echo $updated_sort; ?>href="filters.php?<?php echo $qstr; ?>&sort=updated"><?php echo __('Last Updated');?></a></th> + <th width="4%"> </th> + <th width="32%"><a <?php echo $name_sort; ?> href="filters.php?<?php echo $qstr; ?>&sort=name"><?php echo __('Name');?></a></th> + <th width="8%"><a <?php echo $status_sort; ?> href="filters.php?<?php echo $qstr; ?>&sort=status"><?php echo __('Status');?></a></th> + <th width="8%" style="text-align:center;"><a <?php echo $order_sort; ?> href="filters.php?<?php echo $qstr; ?>&sort=order"><?php echo __('Order');?></a></th> + <th width="8%" style="text-align:center;"><a <?php echo $rules_sort; ?> href="filters.php?<?php echo $qstr; ?>&sort=rules"><?php echo __('Rules');?></a></th> + <th width="10%"><a <?php echo $target_sort; ?> href="filters.php?<?php echo $qstr; ?>&sort=target"><?php echo __('Target');?></a></th> + <th width="12%" nowrap><a <?php echo $created_sort; ?>href="filters.php?<?php echo $qstr; ?>&sort=created"><?php echo __('Date Added');?></a></th> + <th width="18%" nowrap><a <?php echo $updated_sort; ?>href="filters.php?<?php echo $qstr; ?>&sort=updated"><?php echo __('Last Updated');?></a></th> </tr> </thead> <tbody> @@ -109,7 +109,7 @@ else $sel=true; ?> <tr id="<?php echo $row['id']; ?>"> - <td width=7px> + <td align="center"> <input type="checkbox" class="ckb" name="ids[]" value="<?php echo $row['id']; ?>" <?php echo $sel?'checked="checked"':''; ?>> </td> diff --git a/include/staff/helptopics.inc.php b/include/staff/helptopics.inc.php index ef71b5b5d..ceefa793f 100644 --- a/include/staff/helptopics.inc.php +++ b/include/staff/helptopics.inc.php @@ -70,13 +70,13 @@ $order_by = 'sort'; </div>--> <thead> <tr> - <th width="7" style="height:20px;"> </th> - <th style="padding-left:4px;vertical-align:middle" width="360"><?php echo __('Help Topic'); ?></th> - <th style="padding-left:4px;vertical-align:middle" width="80"><?php echo __('Status'); ?></th> - <th style="padding-left:4px;vertical-align:middle" width="100"><?php echo __('Type'); ?></th> - <th style="padding-left:4px;vertical-align:middle" width="100"><?php echo __('Priority'); ?></th> - <th style="padding-left:4px;vertical-align:middle" width="160"><?php echo __('Department'); ?></th> - <th style="padding-left:4px;vertical-align:middle" width="150" nowrap><?php echo __('Last Updated'); ?></th> + <th width="4%" style="height:20px;"> </th> + <th style="padding-left:4px;vertical-align:middle" width="36%"><?php echo __('Help Topic'); ?></th> + <th style="padding-left:4px;vertical-align:middle" width="8%"><?php echo __('Status'); ?></th> + <th style="padding-left:4px;vertical-align:middle" width="8%"><?php echo __('Type'); ?></th> + <th style="padding-left:4px;vertical-align:middle" width="10%"><?php echo __('Priority'); ?></th> + <th style="padding-left:4px;vertical-align:middle" width="14%"><?php echo __('Department'); ?></th> + <th style="padding-left:4px;vertical-align:middle" width="20%" nowrap><?php echo __('Last Updated'); ?></th> </tr> </thead> <tbody class="<?php if ($cfg->getTopicSortMode() == 'm') echo 'sortable-rows'; ?>" @@ -114,7 +114,7 @@ $order_by = 'sort'; $priority = $topic->priority ?: $defaultPriority; ?> <tr id="<?php echo $id; ?>"> - <td width=7px> + <td align="center"> <input type="hidden" name="sort-<?php echo $id; ?>" value="<?php echo $topic->sort ?: $sort; ?>"/> <input type="checkbox" class="ckb" name="ids[]" diff --git a/include/staff/orgs.inc.php b/include/staff/orgs.inc.php index e4993e85d..aba6ed308 100644 --- a/include/staff/orgs.inc.php +++ b/include/staff/orgs.inc.php @@ -134,11 +134,11 @@ else <table class="list" border="0" cellspacing="1" cellpadding="0" width="940"> <thead> <tr> - <th nowrap width="12"> </th> - <th width="400"><a <?php echo $name_sort; ?> href="orgs.php?<?php echo $qstr; ?>&sort=name"><?php echo __('Name'); ?></a></th> - <th width="100"><a <?php echo $users_sort; ?> href="orgs.php?<?php echo $qstr; ?>&sort=users"><?php echo __('Users'); ?></a></th> - <th width="150"><a <?php echo $create_sort; ?> href="orgs.php?<?php echo $qstr; ?>&sort=create"><?php echo __('Created'); ?></a></th> - <th width="145"><a <?php echo $update_sort; ?> href="orgs.php?<?php echo $qstr; ?>&sort=update"><?php echo __('Last Updated'); ?></a></th> + <th nowrap width="4%"> </th> + <th width="45%"><a <?php echo $name_sort; ?> href="orgs.php?<?php echo $qstr; ?>&sort=name"><?php echo __('Name'); ?></a></th> + <th width="11%"><a <?php echo $users_sort; ?> href="orgs.php?<?php echo $qstr; ?>&sort=users"><?php echo __('Users'); ?></a></th> + <th width="20%"><a <?php echo $create_sort; ?> href="orgs.php?<?php echo $qstr; ?>&sort=create"><?php echo __('Created'); ?></a></th> + <th width="20%"><a <?php echo $update_sort; ?> href="orgs.php?<?php echo $qstr; ?>&sort=update"><?php echo __('Last Updated'); ?></a></th> </tr> </thead> <tbody> @@ -152,7 +152,7 @@ else $sel=true; ?> <tr id="<?php echo $row['id']; ?>"> - <td nowrap> + <td nowrap align="center"> <input type="checkbox" value="<?php echo $row['id']; ?>" class="ckb mass nowarn"/> </td> <td> <a href="orgs.php?id=<?php echo $row['id']; ?>"><?php echo $row['name']; ?></a> </td> diff --git a/include/staff/pages.inc.php b/include/staff/pages.inc.php index 887515c20..76f7a4c3a 100644 --- a/include/staff/pages.inc.php +++ b/include/staff/pages.inc.php @@ -83,12 +83,12 @@ else <table class="list" border="0" cellspacing="1" cellpadding="0" width="940"> <thead> <tr> - <th width="7"> </th> - <th width="300"><a <?php echo $name_sort; ?> href="pages.php?<?php echo $qstr; ?>&sort=name"><?php echo __('Name'); ?></a></th> - <th width="90"><a <?php echo $type_sort; ?> href="pages.php?<?php echo $qstr; ?>&sort=type"><?php echo __('Type'); ?></a></th> - <th width="110"><a <?php echo $status_sort; ?> href="pages.php?<?php echo $qstr; ?>&sort=status"><?php echo __('Status'); ?></a></th> - <th width="150" nowrap><a <?php echo $created_sort; ?>href="pages.php?<?php echo $qstr; ?>&sort=created"><?php echo __('Date Added'); ?></a></th> - <th width="150" nowrap><a <?php echo $updated_sort; ?>href="pages.php?<?php echo $qstr; ?>&sort=updated"><?php echo __('Last Updated'); ?></a></th> + <th width="4%"> </th> + <th width="35%"><a <?php echo $name_sort; ?> href="pages.php?<?php echo $qstr; ?>&sort=name"><?php echo __('Name'); ?></a></th> + <th width="10%"><a <?php echo $type_sort; ?> href="pages.php?<?php echo $qstr; ?>&sort=type"><?php echo __('Type'); ?></a></th> + <th width="16%"><a <?php echo $status_sort; ?> href="pages.php?<?php echo $qstr; ?>&sort=status"><?php echo __('Status'); ?></a></th> + <th width="15%" nowrap><a <?php echo $created_sort; ?>href="pages.php?<?php echo $qstr; ?>&sort=created"><?php echo __('Date Added'); ?></a></th> + <th width="20%" nowrap><a <?php echo $updated_sort; ?>href="pages.php?<?php echo $qstr; ?>&sort=updated"><?php echo __('Last Updated'); ?></a></th> </tr> </thead> <tbody> @@ -102,7 +102,7 @@ else $inuse = ($page->topics || in_array($page->id, $defaultPages)); ?> <tr id="<?php echo $page->id; ?>"> - <td width=7px> + <td align="center"> <input type="checkbox" class="ckb" name="ids[]" value="<?php echo $page->id; ?>" <?php echo $sel?'checked="checked"':''; ?>> </td> diff --git a/include/staff/plugins.inc.php b/include/staff/plugins.inc.php index b6bc8c3b7..7f210246b 100644 --- a/include/staff/plugins.inc.php +++ b/include/staff/plugins.inc.php @@ -54,10 +54,10 @@ $showing=$pageNav->showing().' '._N('plugin', 'plugins', $count); <table class="list" border="0" cellspacing="1" cellpadding="0" width="940"> <thead> <tr> - <th width="7"> </th> - <th><?php echo __('Plugin Name'); ?></th> - <th><?php echo __('Status'); ?></th> - <th><?php echo __('Date Installed'); ?></th> + <th width="4%"> </th> + <th width="66%"><?php echo __('Plugin Name'); ?></th> + <th width="10%"><?php echo __('Status'); ?></th> + <th width="20%"><?php echo __('Date Installed'); ?></th> </tr> </thead> <tbody> @@ -65,7 +65,7 @@ $showing=$pageNav->showing().' '._N('plugin', 'plugins', $count); foreach ($ost->plugins->allInstalled() as $p) { if ($p instanceof Plugin) { ?> <tr> - <td><input type="checkbox" class="ckb" name="ids[]" value="<?php echo $p->getId(); ?>" + <td align="center"><input type="checkbox" class="ckb" name="ids[]" value="<?php echo $p->getId(); ?>" <?php echo $sel?'checked="checked"':''; ?>></td> <td><a href="plugins.php?id=<?php echo $p->getId(); ?>" ><?php echo $p->getName(); ?></a></td> diff --git a/include/staff/roles.inc.php b/include/staff/roles.inc.php index 27ef3ce92..7ce374cfe 100644 --- a/include/staff/roles.inc.php +++ b/include/staff/roles.inc.php @@ -41,11 +41,11 @@ csrf_token(); ?> <table class="list" border="0" cellspacing="1" cellpadding="0" width="940"> <thead> <tr> - <th width="7"> </th> - <th><?php echo __('Name'); ?></th> - <th width="100"><?php echo __('Status'); ?></th> - <th width="200"><?php echo __('Created On') ?></th> - <th width="250"><?php echo __('Last Updated'); ?></th> + <th width="4%"> </th> + <th width="53%"><?php echo __('Name'); ?></th> + <th width="8%"><?php echo __('Status'); ?></th> + <th width="15%"><?php echo __('Created On') ?></th> + <th width="20%"><?php echo __('Last Updated'); ?></th> </tr> </thead> <tbody> @@ -57,7 +57,7 @@ csrf_token(); ?> if ($ids && in_array($id, $ids)) $sel = true; ?> <tr> - <td> + <td align="center"> <?php if ($role->isDeleteable()) { ?> <input width="7" type="checkbox" class="ckb" name="ids[]" diff --git a/include/staff/slaplans.inc.php b/include/staff/slaplans.inc.php index 198f0333b..3e6c5c932 100644 --- a/include/staff/slaplans.inc.php +++ b/include/staff/slaplans.inc.php @@ -83,12 +83,12 @@ $qstr .= '&order='.($order=='DESC' ? 'ASC' : 'DESC'); <table class="list" border="0" cellspacing="1" cellpadding="0" width="940"> <thead> <tr> - <th width="7"> </th> - <th width="320"><a <?php echo $name_sort; ?> href="slas.php?<?php echo $qstr; ?>&sort=name"><?php echo __('Name');?></a></th> - <th width="100"><a <?php echo $status_sort; ?> href="slas.php?<?php echo $qstr; ?>&sort=status"><?php echo __('Status');?></a></th> - <th width="130"><a <?php echo $period_sort; ?> href="slas.php?<?php echo $qstr; ?>&sort=period"><?php echo __('Grace Period (hrs)');?></a></th> - <th width="120" nowrap><a <?php echo $created_sort; ?>href="slas.php?<?php echo $qstr; ?>&sort=created"><?php echo __('Date Added');?></a></th> - <th width="150" nowrap><a <?php echo $updated_sort; ?>href="slas.php?<?php echo $qstr; ?>&sort=updated"><?php echo __('Last Updated');?></a></th> + <th width="4%"> </th> + <th width="38%"><a <?php echo $name_sort; ?> href="slas.php?<?php echo $qstr; ?>&sort=name"><?php echo __('Name');?></a></th> + <th width="8%"><a <?php echo $status_sort; ?> href="slas.php?<?php echo $qstr; ?>&sort=status"><?php echo __('Status');?></a></th> + <th><a <?php echo $period_sort; ?> href="slas.php?<?php echo $qstr; ?>&sort=period"><?php echo __('Grace Period (hrs)');?></a></th> + <th width="15%" nowrap><a <?php echo $created_sort; ?>href="slas.php?<?php echo $qstr; ?>&sort=created"><?php echo __('Date Added');?></a></th> + <th width="20%" nowrap><a <?php echo $updated_sort; ?>href="slas.php?<?php echo $qstr; ?>&sort=updated"><?php echo __('Last Updated');?></a></th> </tr> </thead> <tbody> @@ -115,7 +115,7 @@ $qstr .= '&order='.($order=='DESC' ? 'ASC' : 'DESC'); $default = '<small><em>(Default)</em></small>'; ?> <tr id="<?php echo $id; ?>"> - <td width=7px> + <td align="center"> <input type="checkbox" class="ckb" name="ids[]" value="<?php echo $id; ?>" <?php echo $sel ? 'checked="checked"' :'' ; ?>> </td> diff --git a/include/staff/staffmembers.inc.php b/include/staff/staffmembers.inc.php index a7cdf78c5..7a1c75d81 100644 --- a/include/staff/staffmembers.inc.php +++ b/include/staff/staffmembers.inc.php @@ -170,13 +170,13 @@ $agents->limit($pageNav->getLimit())->offset($pageNav->getStart()); <table class="list" border="0" cellspacing="1" cellpadding="0" width="940"> <thead> <tr> - <th width="7px"> </th> - <th width="200"><a <?php echo $name_sort; ?> href="staff.php?<?php echo $qstr; ?>&sort=name"><?php echo __('Name');?></a></th> - <th width="100"><a <?php echo $username_sort; ?> href="staff.php?<?php echo $qstr; ?>&sort=username"><?php echo __('Username');?></a></th> - <th width="100"><a <?php echo $status_sort; ?> href="staff.php?<?php echo $qstr; ?>&sort=status"><?php echo __('Status');?></a></th> - <th width="150"><a <?php echo $dept_sort; ?>href="staff.php?<?php echo $qstr; ?>&sort=dept"><?php echo __('Department');?></a></th> - <th width="100"><a <?php echo $created_sort; ?> href="staff.php?<?php echo $qstr; ?>&sort=created"><?php echo __('Created');?></a></th> - <th width="145"><a <?php echo $login_sort; ?> href="staff.php?<?php echo $qstr; ?>&sort=login"><?php echo __('Last Login');?></a></th> + <th width="4%"> </th> + <th width="28%"><a <?php echo $name_sort; ?> href="staff.php?<?php echo $qstr; ?>&sort=name"><?php echo __('Name');?></a></th> + <th width="16%"><a <?php echo $username_sort; ?> href="staff.php?<?php echo $qstr; ?>&sort=username"><?php echo __('Username');?></a></th> + <th width="8%"><a <?php echo $status_sort; ?> href="staff.php?<?php echo $qstr; ?>&sort=status"><?php echo __('Status');?></a></th> + <th width="14%"><a <?php echo $dept_sort; ?>href="staff.php?<?php echo $qstr; ?>&sort=dept"><?php echo __('Department');?></a></th> + <th width="14%"><a <?php echo $created_sort; ?> href="staff.php?<?php echo $qstr; ?>&sort=created"><?php echo __('Created');?></a></th> + <th width="16%"><a <?php echo $login_sort; ?> href="staff.php?<?php echo $qstr; ?>&sort=login"><?php echo __('Last Login');?></a></th> </tr> </thead> <tbody> @@ -190,7 +190,7 @@ $agents->limit($pageNav->getLimit())->offset($pageNav->getStart()); $sel=true; ?> <tr id="<?php echo $id; ?>"> - <td width=7px> + <td align="center"> <input type="checkbox" class="ckb" name="ids[]" value="<?php echo $id; ?>" <?php echo $sel ? 'checked="checked"' : ''; ?> > <td><a href="staff.php?id=<?php echo $id; ?>"><?php echo diff --git a/include/staff/syslogs.inc.php b/include/staff/syslogs.inc.php index 35313408a..13d355928 100644 --- a/include/staff/syslogs.inc.php +++ b/include/staff/syslogs.inc.php @@ -131,11 +131,11 @@ else <table class="list" border="0" cellspacing="1" cellpadding="0" width="940"> <thead> <tr> - <th width="7"> </th> - <th width="320"><a <?php echo $title_sort; ?> href="logs.php?<?php echo $qstr; ?>&sort=title"><?php echo __('Log Title');?></a></th> - <th width="100"><a <?php echo $type_sort; ?> href="logs.php?<?php echo $qstr; ?>&sort=type"><?php echo __('Log Type');?></a></th> - <th width="200" nowrap><a <?php echo $date_sort; ?>href="logs.php?<?php echo $qstr; ?>&sort=date"><?php echo __('Log Date');?></a></th> - <th width="120"><a <?php echo $ip_sort; ?> href="logs.php?<?php echo $qstr; ?>&sort=ip"><?php echo __('IP Address');?></a></th> + <th width="4%"> </th> + <th width="40%"><a <?php echo $title_sort; ?> href="logs.php?<?php echo $qstr; ?>&sort=title"><?php echo __('Log Title');?></a></th> + <th width="11%"><a <?php echo $type_sort; ?> href="logs.php?<?php echo $qstr; ?>&sort=type"><?php echo __('Log Type');?></a></th> + <th width="30%" nowrap><a <?php echo $date_sort; ?>href="logs.php?<?php echo $qstr; ?>&sort=date"><?php echo __('Log Date');?></a></th> + <th width="15%"><a <?php echo $ip_sort; ?> href="logs.php?<?php echo $qstr; ?>&sort=ip"><?php echo __('IP Address');?></a></th> </tr> </thead> <tbody> @@ -149,7 +149,7 @@ else $sel=true; ?> <tr id="<?php echo $row['log_id']; ?>"> - <td width=7px> + <td align="center" nowrap> <input type="checkbox" class="ckb" name="ids[]" value="<?php echo $row['log_id']; ?>" <?php echo $sel?'checked="checked"':''; ?>> </td> <td> <a class="tip" href="#log/<?php echo $row['log_id']; ?>"><?php echo Format::htmlchars($row['title']); ?></a></td> diff --git a/include/staff/tasks.inc.php b/include/staff/tasks.inc.php index 4efb4ec4c..9c96ad5bb 100644 --- a/include/staff/tasks.inc.php +++ b/include/staff/tasks.inc.php @@ -275,17 +275,17 @@ if ($thisstaff->hasPerm(Task::PERM_DELETE, false)) { <thead> <tr> <?php if ($thisstaff->canManageTickets()) { ?> - <th width="8px"> </th> + <th width="4%"> </th> <?php } ?> - <th width="70"> + <th width="8%"> <?php echo __('Number'); ?></th> - <th width="70"> + <th width="20%"> <?php echo $date_header ?: __('Date'); ?></th> - <th width="280"> + <th width="38%"> <?php echo __('Title'); ?></th> - <th width="250"> + <th width="15%"> <?php echo __('Department');?></th> - <th width="250"> + <th width="15%"> <?php echo __('Assignee');?></th> </tr> </thead> diff --git a/include/staff/teams.inc.php b/include/staff/teams.inc.php index 3d5b65901..e54adb993 100644 --- a/include/staff/teams.inc.php +++ b/include/staff/teams.inc.php @@ -80,13 +80,13 @@ $qstr .= '&order='.urlencode($order=='DESC' ? 'ASC' : 'DESC'); <table class="list" border="0" cellspacing="1" cellpadding="0" width="940"> <thead> <tr> - <th width="7px"> </th> - <th width="250"><a <?php echo $name_sort; ?> href="teams.php?<?php echo $qstr; ?>&sort=name"><?php echo __('Team Name');?></a></th> - <th width="80"><a <?php echo $status_sort; ?> href="teams.php?<?php echo $qstr; ?>&sort=status"><?php echo __('Status');?></a></th> - <th width="80"><a <?php echo $members_sort; ?>href="teams.php?<?php echo $qstr; ?>&sort=members"><?php echo __('Members');?></a></th> - <th width="200"><a <?php echo $lead_sort; ?> href="teams.php?<?php echo $qstr; ?>&sort=lead"><?php echo __('Team Lead');?></a></th> - <th width="100"><a <?php echo $created_sort; ?> href="teams.php?<?php echo $qstr; ?>&sort=created"><?php echo __('Created');?></a></th> - <th width="130"><a <?php echo $updated_sort; ?> href="teams.php?<?php echo $qstr; ?>&sort=updated"><?php echo __('Last Updated');?></a></th> + <th width="4%"> </th> + <th width="25%"><a <?php echo $name_sort; ?> href="teams.php?<?php echo $qstr; ?>&sort=name"><?php echo __('Team Name');?></a></th> + <th width="8%"><a <?php echo $status_sort; ?> href="teams.php?<?php echo $qstr; ?>&sort=status"><?php echo __('Status');?></a></th> + <th width="8%"><a <?php echo $members_sort; ?>href="teams.php?<?php echo $qstr; ?>&sort=members"><?php echo __('Members');?></a></th> + <th width="20%"><a <?php echo $lead_sort; ?> href="teams.php?<?php echo $qstr; ?>&sort=lead"><?php echo __('Team Lead');?></a></th> + <th width="15%"><a <?php echo $created_sort; ?> href="teams.php?<?php echo $qstr; ?>&sort=created"><?php echo __('Created');?></a></th> + <th width="20%"><a <?php echo $updated_sort; ?> href="teams.php?<?php echo $qstr; ?>&sort=updated"><?php echo __('Last Updated');?></a></th> </tr> </thead> <tbody> @@ -110,7 +110,7 @@ $qstr .= '&order='.urlencode($order=='DESC' ? 'ASC' : 'DESC'); $sel=true; ?> <tr id="<?php echo $id; ?>"> - <td width=7px> + <td align="center"> <input type="checkbox" class="ckb" name="ids[]" value="<?php echo $id; ?>" <?php echo $sel ? 'checked="checked"' : ''; ?>> </td> diff --git a/include/staff/templates.inc.php b/include/staff/templates.inc.php index c4ed0d78b..0ed4dea24 100644 --- a/include/staff/templates.inc.php +++ b/include/staff/templates.inc.php @@ -86,12 +86,12 @@ else <table class="list" border="0" cellspacing="1" cellpadding="0" width="940"> <thead> <tr> - <th width="7"> </th> - <th width="350"><a <?php echo $name_sort; ?> href="templates.php?<?php echo $qstr; ?>&sort=name"><?php echo __('Name'); ?></a></th> - <th width="100"><a <?php echo $status_sort; ?> href="templates.php?<?php echo $qstr; ?>&sort=status"><?php echo __('Status'); ?></a></th> - <th width="80"><a <?php echo $inuse_sort; ?> href="templates.php?<?php echo $qstr; ?>&sort=inuse"><?php echo __('In-Use'); ?></a></th> - <th width="120" nowrap><a <?php echo $created_sort; ?>href="templates.php?<?php echo $qstr; ?>&sort=created"><?php echo __('Date Added'); ?></a></th> - <th width="150" nowrap><a <?php echo $updated_sort; ?>href="templates.php?<?php echo $qstr; ?>&sort=updated"><?php echo __('Last Updated'); ?></a></th> + <th width="4%"> </th> + <th width="46%"><a <?php echo $name_sort; ?> href="templates.php?<?php echo $qstr; ?>&sort=name"><?php echo __('Name'); ?></a></th> + <th width="10%"><a <?php echo $status_sort; ?> href="templates.php?<?php echo $qstr; ?>&sort=status"><?php echo __('Status'); ?></a></th> + <th width="10%"><a <?php echo $inuse_sort; ?> href="templates.php?<?php echo $qstr; ?>&sort=inuse"><?php echo __('In-Use'); ?></a></th> + <th width="10%" nowrap><a <?php echo $created_sort; ?>href="templates.php?<?php echo $qstr; ?>&sort=created"><?php echo __('Date Added'); ?></a></th> + <th width="20%" nowrap><a <?php echo $updated_sort; ?>href="templates.php?<?php echo $qstr; ?>&sort=updated"><?php echo __('Last Updated'); ?></a></th> </tr> </thead> <tbody> @@ -109,7 +109,7 @@ else $default=($defaultTplId==$row['tpl_id'])?'<small class="fadded">('.__('System Default').')</small>':''; ?> <tr id="<?php echo $row['tpl_id']; ?>"> - <td width=7px> + <td align="center"> <input type="checkbox" class="ckb" name="ids[]" value="<?php echo $row['tpl_id']; ?>" <?php echo $sel?'checked="checked"':''; ?> <?php echo $default?'disabled="disabled"':''; ?> > </td> diff --git a/include/staff/tickets.inc.php b/include/staff/tickets.inc.php index 740d7bc66..373c89670 100644 --- a/include/staff/tickets.inc.php +++ b/include/staff/tickets.inc.php @@ -378,23 +378,23 @@ return false;"> <thead> <tr> <?php if ($thisstaff->canManageTickets()) { ?> - <th width="12px"> </th> + <th width="4%"> </th> <?php } ?> - <th width="70"> + <th width="10%"> <?php echo __('Ticket'); ?></th> - <th width="100"> + <th width="15%"> <?php echo $date_header ?: __('Date Created'); ?></th> - <th width="280"> + <th width="36%"> <?php echo __('Subject'); ?></th> - <th width="170"> + <th width="15%"> <?php echo __('From');?></th> <?php if($search && !$status) { ?> - <th width="60"> + <th width="5%"> <?php echo __('Status');?></th> <?php } else { ?> - <th width="60" <?php echo $pri_sort;?>> + <th width="5%" <?php echo $pri_sort;?>> <?php echo __('Priority');?></th> <?php } @@ -402,16 +402,16 @@ return false;"> if($showassigned ) { //Closed by if(!strcasecmp($status,'closed')) { ?> - <th width="150"> + <th width="15%"> <?php echo __('Closed By'); ?></th> <?php } else { //assigned to ?> - <th width="150"> + <th width="15%"> <?php echo __('Assigned To'); ?></th> <?php } } else { ?> - <th width="150"> + <th width="15%"> <?php echo __('Department');?></th> <?php } ?> diff --git a/include/staff/users.inc.php b/include/staff/users.inc.php index 23de378ba..b6980f5c6 100644 --- a/include/staff/users.inc.php +++ b/include/staff/users.inc.php @@ -63,7 +63,7 @@ $users->order_by($order . $order_column); <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']); ?>" + 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> @@ -149,14 +149,14 @@ else <table class="list" border="0" cellspacing="1" cellpadding="0" width="940"> <thead> <tr> - <th nowrap width="12"> </th> - <th width="350"><a <?php echo $name_sort; ?> href="users.php?<?php + <th nowrap width="4%"> </th> + <th width="45%"><a <?php echo $name_sort; ?> href="users.php?<?php echo $qstr; ?>&sort=name"><?php echo __('Name'); ?></a></th> - <th width="250"><a <?php echo $status_sort; ?> href="users.php?<?php + <th width="11%"><a <?php echo $status_sort; ?> href="users.php?<?php echo $qstr; ?>&sort=status"><?php echo __('Status'); ?></a></th> - <th width="100"><a <?php echo $create_sort; ?> href="users.php?<?php + <th width="20%"><a <?php echo $create_sort; ?> href="users.php?<?php echo $qstr; ?>&sort=create"><?php echo __('Created'); ?></a></th> - <th width="145"><a <?php echo $update_sort; ?> href="users.php?<?php + <th width="20%"><a <?php echo $update_sort; ?> href="users.php?<?php echo $qstr; ?>&sort=update"><?php echo __('Updated'); ?></a></th> </tr> </thead> @@ -181,7 +181,7 @@ else $sel=true; ?> <tr id="<?php echo $U['id']; ?>"> - <td nowrap> + <td nowrap align="center"> <input type="checkbox" value="<?php echo $U['id']; ?>" class="ckb mass nowarn"/> </td> <td> diff --git a/scp/css/scp.css b/scp/css/scp.css index 69fa5d08d..f1c46d4e6 100644 --- a/scp/css/scp.css +++ b/scp/css/scp.css @@ -483,6 +483,32 @@ a { text-align:center; font-size:0.9em; } +table.dashboard-stats { + text-align:right; +} +table.dashboard-stats tbody:first-child th { + border-bottom:1px dashed #ddd; + padding:0 4px 8px; +} +table.dashboard-stats tbody:nth-child(2) tr:nth-child(odd) { + background-color:#f0faff; +} + +table.dashboard-stats tbody:nth-child(2) th { + padding:5px 8px; + border-right: 1px solid #ccc; + color:#999; +} +table.dashboard-stats tbody:nth-child(2) td { + padding:5px 4px; + border-right: 1px solid #ccc; +} +table.dashboard-stats tbody:nth-child(2) tr:hover { + background-color:#FFFFDD; +} +table.dashboard-stats tbody:nth-child(2) tr:hover th { + color:#000; +} table { vertical-align:top; } -- GitLab