diff --git a/include/staff/dynamic-list.inc.php b/include/staff/dynamic-list.inc.php
index fbeb002087925034a5e08ad7f6135e3b979af9c2..c0e009bc46984267efebd989a398ebc3d7701eba 100644
--- a/include/staff/dynamic-list.inc.php
+++ b/include/staff/dynamic-list.inc.php
@@ -27,7 +27,7 @@ $info=Format::htmlchars(($errors && $_POST) ? array_merge($info,$_POST) : $info)
<h2><?php echo __('Custom List'); ?>
<?php echo $list ? $list->getName() : 'Add new list'; ?></h2>
-<ul class="tabs">
+<ul class="tabs" id="list-tabs">
<li class="active"><a href="#definition">
<i class="icon-plus"></i> <?php echo __('Definition'); ?></a></li>
<li><a href="#items">
@@ -35,7 +35,7 @@ $info=Format::htmlchars(($errors && $_POST) ? array_merge($info,$_POST) : $info)
<li><a href="#properties">
<i class="icon-asterisk"></i> <?php echo __('Properties'); ?></a></li>
</ul>
-
+<div id="list-tabs_container">
<div id="definition" class="tab_content">
<table class="form_table" width="940" border="0" cellspacing="0" cellpadding="2">
<thead>
@@ -108,7 +108,7 @@ $info=Format::htmlchars(($errors && $_POST) ? array_merge($info,$_POST) : $info)
</tbody>
</table>
</div>
-<div id="properties" class="tab_content" style="display:none">
+<div id="properties" class="hidden tab_content">
<table class="form_table" width="940" border="0" cellspacing="0" cellpadding="2">
<thead>
<tr>
@@ -211,7 +211,7 @@ $info=Format::htmlchars(($errors && $_POST) ? array_merge($info,$_POST) : $info)
</tbody>
</table>
</div>
-<div id="items" class="tab_content" style="display:none">
+<div id="items" class="hidden tab_content">
<table class="form_table" width="940" border="0" cellspacing="0" cellpadding="2">
<thead>
<?php if ($list) {
@@ -331,6 +331,7 @@ $info=Format::htmlchars(($errors && $_POST) ? array_merge($info,$_POST) : $info)
</tbody>
</table>
</div>
+</div>
<p class="centered">
<input type="submit" name="submit" value="<?php echo $submit_text; ?>">
<input type="reset" name="reset" value="<?php echo __('Reset'); ?>">
diff --git a/include/staff/org-view.inc.php b/include/staff/org-view.inc.php
index 06119767db764a3110a46a224aa3cf136186d811..112570e2e8c0f7679281b1d0a2cb88dbbfb31f06 100644
--- a/include/staff/org-view.inc.php
+++ b/include/staff/org-view.inc.php
@@ -63,32 +63,34 @@ if(!defined('OSTSCPINC') || !$thisstaff || !is_object($org)) die('Invalid path')
</table>
<br>
<div class="clear"></div>
-<ul class="tabs">
- <li class="active"><a id="users_tab" href="#users"><i
+<ul class="tabs" id="orgtabs">
+ <li class="active"><a href="#users"><i
class="icon-user"></i> <?php echo __('Users'); ?></a></li>
- <li><a id="tickets_tab" href="#tickets"><i
+ <li><a href="#tickets"><i
class="icon-list-alt"></i> <?php echo __('Tickets'); ?></a></li>
- <li><a id="notes_tab" href="#notes"><i
+ <li><a href="#notes"><i
class="icon-pushpin"></i> <?php echo __('Notes'); ?></a></li>
</ul>
+<div id="orgtabs_container">
<div class="tab_content" id="users">
<?php
include STAFFINC_DIR . 'templates/users.tmpl.php';
?>
</div>
-<div class="tab_content" id="tickets" style="display:none;">
+<div class="hidden tab_content" id="tickets">
<?php
include STAFFINC_DIR . 'templates/tickets.tmpl.php';
?>
</div>
-<div class="tab_content" id="notes" style="display:none">
+<div class="hidden tab_content" id="notes">
<?php
$notes = QuickNote::forOrganization($org);
$create_note_url = 'orgs/'.$org->getId().'/note';
include STAFFINC_DIR . 'templates/notes.tmpl.php';
?>
</div>
+</div>
<script type="text/javascript">
$(function() {
diff --git a/include/staff/templates/org-profile.tmpl.php b/include/staff/templates/org-profile.tmpl.php
index 68819629cbb3d01a142ba1e68f6bdea4feda2975..c73a4f5a34d503a05a2ff8a2c2a5394bcdf1fdd7 100644
--- a/include/staff/templates/org-profile.tmpl.php
+++ b/include/staff/templates/org-profile.tmpl.php
@@ -13,16 +13,16 @@ if ($info['error']) {
} elseif ($info['msg']) {
echo sprintf('<p id="msg_notice">%s</p>', $info['msg']);
} ?>
-<ul class="tabs">
- <li class="active"><a href="#tab-profile"
+<ul class="tabs" id="orgprofile">
+ <li class="active"><a href="#profile"
><i class="icon-edit"></i> <?php echo __('Fields'); ?></a></li>
<li><a href="#contact-settings"
><i class="icon-fixed-width icon-cogs faded"></i> <?php
echo __('Settings'); ?></a></li>
</ul>
<form method="post" class="org" action="<?php echo $action; ?>">
-
-<div class="tab_content" id="tab-profile" style="margin:5px;">
+<div id="orgprofile_container">
+<div class="tab_content" id="profile" style="margin:5px;">
<?php
$action = $info['action'] ? $info['action'] : ('#orgs/'.$org->getId());
if ($ticket && $ticket->getOwnerId() == $user->getId())
@@ -38,7 +38,7 @@ if ($ticket && $ticket->getOwnerId() == $user->getId())
</table>
</div>
-<div class="tab_content" id="contact-settings" style="display:none;margin:5px;">
+<div class="hidden tab_content" id="contact-settings" style="margin:5px;">
<table style="width:100%">
<tbody>
<tr>
@@ -139,7 +139,7 @@ if ($ticket && $ticket->getOwnerId() == $user->getId())
</tbody>
</table>
</div>
-
+</div>
<div class="clear"></div>
<hr>
diff --git a/include/staff/templates/ticket-preview.tmpl.php b/include/staff/templates/ticket-preview.tmpl.php
index 55276c6d62b9d01aad30773a532d672295eb805a..05b78747f9b9f76ec699c965f3eaad2863689beb 100644
--- a/include/staff/templates/ticket-preview.tmpl.php
+++ b/include/staff/templates/ticket-preview.tmpl.php
@@ -29,7 +29,7 @@ elseif($msg)
elseif($warn)
echo sprintf('<div id="msg_warning">%s</div>',$warn);
-echo '<ul class="tabs">';
+echo '<ul class="tabs" id="ticket-preview">';
echo '
<li class="active"><a id="preview_tab" href="#preview"
@@ -42,7 +42,7 @@ echo sprintf('
$ticket->getNumCollaborators());
}
echo '</ul>';
-
+echo '<div id="ticket-preview_container">';
echo '<div class="tab_content" id="preview">';
echo '<table border="0" cellspacing="" cellpadding="1" width="100%" class="ticket_info">';
@@ -117,7 +117,7 @@ echo '
</table>';
echo '</div>'; // ticket preview content.
?>
-<div class="tab_content" id="collab" style="display:none;">
+<div class="hidden tab_content" id="collab">
<table border="0" cellspacing="" cellpadding="1">
<colgroup><col style="min-width: 250px;"></col></colgroup>
<?php
@@ -146,6 +146,7 @@ echo '</div>'; // ticket preview content.
);
?>
</div>
+</div>
<?php
$options = array();
$options[]=array('action'=>sprintf(__('Thread (%d)'),$ticket->getThreadCount()),'url'=>"tickets.php?id=$tid");
diff --git a/include/staff/templates/user-account.tmpl.php b/include/staff/templates/user-account.tmpl.php
index 0bb5d0793a9a6b108c16b51a5cb7b06e9f821385..82674810bc82844d2a0afec587dfbfdeca6b1b1c 100644
--- a/include/staff/templates/user-account.tmpl.php
+++ b/include/staff/templates/user-account.tmpl.php
@@ -15,8 +15,7 @@ if ($info['error']) {
} elseif ($info['msg']) {
echo sprintf('<p id="msg_notice">%s</p>', $info['msg']);
} ?>
-<form method="post" class="user" action="#users/<?php echo $user->getId(); ?>/manage" >
-<ul class="tabs">
+<ul class="tabs" id="user-account-tabs">
<li <?php echo !$access? 'class="active"' : ''; ?>><a href="#user-account"
><i class="icon-user"></i> <?php echo __('User Information'); ?></a></li>
<li <?php echo $access? 'class="active"' : ''; ?>><a href="#user-access"
@@ -25,6 +24,7 @@ if ($info['error']) {
<input type="hidden" name="id" value="<?php echo $user->getId(); ?>" />
+<div id="user-account-tabs_container">
<div class="tab_content" id="user-account" style="display:<?php echo $access? 'none' : 'block'; ?>; margin:5px;">
<form method="post" class="user" action="#users/<?php echo $user->getId(); ?>/manage" >
<input type="hidden" name="id" value="<?php echo $user->getId(); ?>" />
@@ -150,6 +150,7 @@ if ($info['error']) {
</tbody>
</table>
</div>
+ </div>
<hr>
<p class="full-width">
<span class="buttons pull-left">
diff --git a/include/staff/templates/user-import.tmpl.php b/include/staff/templates/user-import.tmpl.php
index ad57afc165b4c4ac140cd5d4031d4493c12f7bb4..b9ca02007d39bb21c5806edd74c79acbdd8216b8 100644
--- a/include/staff/templates/user-import.tmpl.php
+++ b/include/staff/templates/user-import.tmpl.php
@@ -10,6 +10,12 @@ if ($info['error']) {
} elseif ($info['msg']) {
echo sprintf('<p id="msg_notice">%s</p>', $info['msg']);
} ?>
+<ul class="tabs" id="user-import-tabs">
+ <li class="active"><a href="#copy-paste"
+ ><i class="icon-edit"></i> <?php echo __('Copy Paste'); ?></a></li>
+ <li><a href="#upload"
+ ><i class="icon-fixed-width icon-cloud-upload"></i> <?php echo __('Upload'); ?></a></li>
+</ul>
<form action="<?php echo $info['action']; ?>" method="post" enctype="multipart/form-data"
onsubmit="javascript:
if ($(this).find('[name=import]').val()) {
@@ -26,7 +32,7 @@ if ($info['error']) {
if ($org_id) { ?>
<input type="hidden" name="id" value="<?php echo $org_id; ?>"/>
<?php } ?>
-
+<div id="user-import-tabs_container">
<div class="tab_content" id="copy-paste" style="margin:5px;">
<h2 style="margin-bottom:10px"><?php echo __('Name and Email'); ?></h2>
<p><?php echo __(
@@ -39,7 +45,7 @@ if ($org_id) { ?>
</textarea>
</div>
-<div class="tab_content" id="upload" style="display:none;margin:5px;">
+<div class="hidden tab_content" id="upload" style="margin:5px;">
<h2 style="margin-bottom:10px"><?php echo __('Import a CSV File'); ?></h2>
<p>
<em><?php echo sprintf(__(
@@ -71,6 +77,7 @@ if ($org_id) { ?>
</tr></table>
<br/>
<input type="file" name="import"/>
+</div>
</div>
<hr>
<p class="full-width">
diff --git a/include/staff/templates/user.tmpl.php b/include/staff/templates/user.tmpl.php
index aabd5cd17e3f488c3d014e201d08fa439099e8fd..4737aaea25e1d0c5b923912c7d9dc1a67c197622 100644
--- a/include/staff/templates/user.tmpl.php
+++ b/include/staff/templates/user.tmpl.php
@@ -34,11 +34,11 @@ if ($info['error']) {
} ?>
<div class="clear"></div>
-<ul class="tabs" style="margin-top:5px">
+<ul class="tabs" id="user_tabs" style="margin-top:5px">
<li class="active"><a href="#info-tab"
><i class="icon-info-sign"></i> <?php echo __('User'); ?></a></li>
<?php if ($org) { ?>
- <li><a href="#organization-tab"
+ <li><a href="#org-tab"
><i class="icon-fixed-width icon-building"></i> <?php echo __('Organization'); ?></a></li>
<?php }
$ext_id = "U".$user->getId();
@@ -47,6 +47,7 @@ if ($info['error']) {
><i class="icon-fixed-width icon-pushpin"></i> <?php echo __('Notes'); ?></a></li>
</ul>
+<div id="user_tabs_container">
<div class="tab_content" id="info-tab">
<div class="floating-options">
<a href="<?php echo $info['useredit'] ?: '#'; ?>" id="edituser" class="action" title="<?php echo __('Edit'); ?>"><i class="icon-edit"></i></a>
@@ -70,7 +71,7 @@ if ($info['error']) {
</div>
<?php if ($org) { ?>
-<div class="tab_content" id="organization-tab" style="display:none">
+<div class="hidden tab_content" id="org-tab">
<div class="floating-options">
<a href="orgs.php?id=<?php echo $org->getId(); ?>" title="<?php
echo __('Manage Organization'); ?>" class="action"><i class="icon-share"></i></a>
@@ -92,7 +93,7 @@ if ($info['error']) {
</div>
<?php } # endif ($org) ?>
-<div class="tab_content" id="notes-tab" style="display:none">
+<div class="hidden tab_content" id="notes-tab">
<?php $show_options = true;
foreach ($notes as $note)
include STAFFINC_DIR . 'templates/note.tmpl.php';
@@ -107,6 +108,7 @@ foreach ($notes as $note)
</div>
</div>
</div>
+</div>
</div>
<div id="user-form" style="display:<?php echo $forms ? 'block' : 'none'; ?>;">
diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php
index 3871578ca35d48cbe3fe1ec6929a50a7db1addfd..54095699b6015dee25b897cf47df82cb2b4ab717 100644
--- a/include/staff/ticket-view.inc.php
+++ b/include/staff/ticket-view.inc.php
@@ -376,8 +376,8 @@ foreach (DynamicFormEntry::forTicket($ticket->getId()) as $form) {
$tcount = $ticket->getThreadCount();
$tcount+= $ticket->getNumNotes();
?>
-<ul id="threads">
- <li><a class="active" id="toggle_ticket_thread" href="#"><?php echo sprintf(__('Ticket Thread (%d)'), $tcount); ?></a></li>
+<ul class="tabs threads" id="ticket_tabs" >
+ <li><a class="active" href="#ticket_thread"><?php echo sprintf(__('Ticket Thread (%d)'), $tcount); ?></a></li>
</ul>
<div id="ticket_tabs_container">
<div id="ticket_thread" class="tab_content">
@@ -436,7 +436,6 @@ $tcount+= $ticket->getNumNotes();
} else {
echo '<p>'.__('Error fetching ticket thread - get technical help.').'</p>';
}?>
-</div>
<div class="clear" style="padding-bottom:10px;"></div>
<?php if($errors['err']) { ?>
<div id="msg_error"><?php echo $errors['err']; ?></div>
@@ -453,7 +452,7 @@ $tcount+= $ticket->getNumNotes();
<li class="active"><a href="#reply"><?php echo __('Post Reply');?></a></li>
<?php
} ?>
- <li><a id="note_tab" href="#note"><?php echo __('Post Internal Note');?></a></li>
+ <li><a href="#note"><?php echo __('Post Internal Note');?></a></li>
<?php
if ($role->canTransferTickets()) { ?>
<li><a href="#transfer"><?php echo __('Department Transfer');?></a></li>
@@ -579,9 +578,9 @@ $tcount+= $ticket->getNumNotes();
echo $attrs; ?>><?php echo $draft ?: $info['response'];
?></textarea>
<div id="reply_form_attachments" class="attachments">
-<?php
-print $response_form->getField('attachments')->render();
-?>
+ <?php
+ print $response_form->getField('attachments')->render();
+ ?>
</div>
</td>
</tr>
@@ -655,7 +654,8 @@ print $response_form->getField('attachments')->render();
</form>
<?php
} ?>
- <form id="note" class="tab_content" action="tickets.php?id=<?php echo $ticket->getId(); ?>#note" name="note" method="post" enctype="multipart/form-data">
+ <form id="note" class="hidden tab_content" action="tickets.php?id=<?php
+ echo $ticket->getId(); ?>#note" name="note" method="post" enctype="multipart/form-data">
<?php csrf_token(); ?>
<input type="hidden" name="id" value="<?php echo $ticket->getId(); ?>">
<input type="hidden" name="locktime" value="<?php echo $cfg->getLockTime(); ?>">
@@ -692,9 +692,9 @@ print $response_form->getField('attachments')->render();
echo $attrs; ?>><?php echo $draft ?: $info['note'];
?></textarea>
<div class="attachments">
-<?php
-print $note_form->getField('attachments')->render();
-?>
+ <?php
+ print $note_form->getField('attachments')->render();
+ ?>
</div>
</td>
</tr>
@@ -893,6 +893,8 @@ print $note_form->getField('attachments')->render();
</form>
<?php
} ?>
+ </div>
+ </div>
</div>
<div style="display:none;" class="dialog" id="print-options">
<h3><?php echo __('Ticket Print Options');?></h3>
diff --git a/include/staff/user-view.inc.php b/include/staff/user-view.inc.php
index edc9464c97907a108e1a5bc2f7803b2f33e392ad..6d29d8b2492287165369760ba3ca7320eaaa9526 100644
--- a/include/staff/user-view.inc.php
+++ b/include/staff/user-view.inc.php
@@ -124,27 +124,28 @@ $org = $user->getOrganization();
</table>
<br>
<div class="clear"></div>
-<ul class="tabs">
- <li class="active"><a id="tickets_tab" href="#tickets"><i
+<ul class="tabs" id="user-view-tabs">
+ <li class="active"><a href="#tickets"><i
class="icon-list-alt"></i> <?php echo __('User Tickets'); ?></a></li>
- <li><a id="notes_tab" href="#notes"><i
+ <li><a href="#notes"><i
class="icon-pushpin"></i> <?php echo __('Notes'); ?></a></li>
</ul>
-<div id="tickets" class="tab_content">
-<?php
-include STAFFINC_DIR . 'templates/tickets.tmpl.php';
-?>
-</div>
+<div id="user-view-tabs_container">
+ <div id="tickets" class="tab_content">
+ <?php
+ include STAFFINC_DIR . 'templates/tickets.tmpl.php';
+ ?>
+ </div>
-<div class="tab_content" id="notes" style="display:none">
-<?php
-$notes = QuickNote::forUser($user);
-$create_note_url = 'users/'.$user->getId().'/note';
-include STAFFINC_DIR . 'templates/notes.tmpl.php';
-?>
+ <div class="hidden tab_content" id="notes">
+ <?php
+ $notes = QuickNote::forUser($user);
+ $create_note_url = 'users/'.$user->getId().'/note';
+ include STAFFINC_DIR . 'templates/notes.tmpl.php';
+ ?>
+ </div>
</div>
-
-<div style="display:none;" class="dialog" id="confirm-action">
+<div class="hidden dialog" id="confirm-action">
<h3><?php echo __('Please Confirm'); ?></h3>
<a class="close" href=""><i class="icon-remove-circle"></i></a>
<hr/>
diff --git a/scp/css/scp.css b/scp/css/scp.css
index b3a05e7a8cf7b60d80014a880d37d86dc257ca6c..917746f3bbe4f6705e68d13918742e16130128f4 100644
--- a/scp/css/scp.css
+++ b/scp/css/scp.css
@@ -774,40 +774,6 @@ h2 .reload {
margin:0;
}
-#threads {
- margin:0;
- padding:5px 10px 0 10px;
- border:1px solid #aaa;
- background:#F4FAFF;
- height:30px;
-}
-
-#threads li {
- list-style:none;
- margin:0;
- padding:0;
- display:inline;
-}
-
-#threads li a {
- display:inline-block;
- width:auto;
- height:30px;
- line-height:30px;
- border-top:1px solid #F4FAFF;
- padding:0 10px 0 32px;
- margin-right:10px;
-}
-
-#threads li a.active {
- height:29px;
- background-color:#fff;
- border:1px solid #aaa;
- border-bottom:none;
- border-top:2px solid #ed9100;
- font-weight:bold;
-}
-
#toggle_ticket_thread {
background:url(../images/icons/open.gif) 10px 50% no-repeat;
}
@@ -816,9 +782,7 @@ h2 .reload {
background:url(../images/icons/note.gif) 10px 50% no-repeat;
}
-#ticket_thread table.message,
-#ticket_thread table.response,
-#ticket_thread table.note {
+table.thread-entry {
margin-top:10px;
border:1px solid #aaa;
border-bottom:2px solid #aaa;
@@ -830,7 +794,7 @@ h2 .reload {
border-bottom:2px solid #ddd;
}
-#ticket_thread table th, #ticket_notes table th {
+table.thread-entry th, #ticket_notes table th {
text-align:left;
border-bottom:1px solid #aaa;
font-size:10pt;
@@ -858,15 +822,15 @@ h2 .reload {
text-align:right;
}
-#ticket_thread > .message th {
+.thread-entry.message th {
background:#C3D9FF;
}
-#ticket_thread > .response th {
+.thread-entry.response th {
background:#FFE0B3;
}
-#ticket_thread > .note th {
+.thread-entry.note th {
background:#FFE;
}
@@ -878,7 +842,7 @@ h2 .reload {
background:#f9f9f9;
}
-#ticket_thread .info, #ticket_notes .info {
+.thread-entry .info, #ticket_notes .info {
padding:5px;
background:#F4FAFF;
height:16px;
diff --git a/scp/js/scp.js b/scp/js/scp.js
index 5c3101c667d134e0dfb1957ace6105d1f2bef1a6..19f85f34a289927aa9fb85e0ad480d24abbfd6e5 100644
--- a/scp/js/scp.js
+++ b/scp/js/scp.js
@@ -626,7 +626,7 @@ $.orgLookup = function (url, cb) {
$.uid = 1;
-//Tabs
+// Tabs
$(document).on('click.tab', 'ul.tabs li a', function(e) {
e.preventDefault();
var $this = $(this),
@@ -661,6 +661,7 @@ $(document).on('click.tab', 'ul.tabs li a', function(e) {
$tab.fadeIn('fast');
return false;
}
+
});
$.changeHash = function(hash, quiet) {
if (quiet) {
diff --git a/scp/js/ticket.js b/scp/js/ticket.js
index 8a1bbc6ecae18dd2001b22b6b682461a367c6227..729529c4fe03725f8a9c46c2eee40c94001abe1f 100644
--- a/scp/js/ticket.js
+++ b/scp/js/ticket.js
@@ -319,44 +319,6 @@ $.refreshTicketView = function() {
}
var ticket_onload = function($) {
- if (!location.hash || !$('#response_options .tab_content' + location.hash).length) {
- $('#response_options ul.tabs li:first a').trigger('click');
- }
-
- $('#reply_tab').click(function() {
- $(this).removeClass('tell');
- });
-
- $('#note_tab').click(function() {
- if($('#response').val() != '') {
- $('#reply_tab').addClass('tell');
- }
- });
-
- $('#response_options ul.tabs li a').click(function(e) {
- $("#msg_error, #msg_notice, #msg_warning").fadeOut();
- });
-
- $('#toggle_ticket_thread, #toggle_notes, .show_notes').click(function(e) {
- e.preventDefault();
- $('#threads a').removeClass('active');
-
- if($(this).attr('id') == 'toggle_ticket_thread') {
- $('#ticket_notes').hide();
- $('#ticket_thread').show();
- $('#toggle_ticket_thread').addClass('active');
- $('#reply_tab').removeClass('tell').click();
- } else {
- $('#ticket_thread').hide();
- $('#ticket_notes').show();
- $('#toggle_notes').addClass('active');
- $('#note_tab').click();
- if($('#response').val() != '') {
- $('#reply_tab').addClass('tell');
- }
- }
- });
-
//Start watching the form for activity.
autoLock.Init();
@@ -384,8 +346,8 @@ var ticket_onload = function($) {
return false;
});
- $(document).on('change', 'form#reply select#emailreply', function(e) {
- var $cc = $('form#reply tbody#cc_sec');
+ $(document).on('change', 'form[name=reply] select#emailreply', function(e) {
+ var $cc = $('form[name=reply] tbody#cc_sec');
if($(this).val() == 0)
$cc.hide();
else