From 7d39f901d6274242d6679fae217afa7120266bee Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Mon, 28 Apr 2014 16:26:56 -0500
Subject: [PATCH] pjax: Pjax can be used in a few new places
---
include/staff/org-view.inc.php | 2 +-
include/staff/templates/note.tmpl.php | 10 +++++-----
include/staff/templates/user.tmpl.php | 4 ++--
include/staff/ticket-view.inc.php | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/include/staff/org-view.inc.php b/include/staff/org-view.inc.php
index 91dbe5aea..b893c9f3f 100644
--- a/include/staff/org-view.inc.php
+++ b/include/staff/org-view.inc.php
@@ -74,7 +74,7 @@ if(!defined('OSTSCPINC') || !$thisstaff || !is_object($org)) die('Invalid path')
include STAFFINC_DIR . 'templates/users.tmpl.php';
?>
</div>
-<div class="tab_content no-pjax" id="tickets" style="display:none;">
+<div class="tab_content" id="tickets" style="display:none;">
<?php
include STAFFINC_DIR . 'templates/tickets.tmpl.php';
?>
diff --git a/include/staff/templates/note.tmpl.php b/include/staff/templates/note.tmpl.php
index f14fbe696..f36f1d81a 100644
--- a/include/staff/templates/note.tmpl.php
+++ b/include/staff/templates/note.tmpl.php
@@ -9,11 +9,11 @@
<?php
echo $note->getStaff()->getName();
if (isset($show_options) && $show_options) { ?>
- <div class="options">
- <a href="#" class="action edit-note no-pjax" title="edit"><i class="icon-pencil"></i></a>
- <a href="#" class="action save-note no-pjax" style="display:none" title="save"><i class="icon-save"></i></a>
- <a href="#" class="action cancel-edit no-pjax" style="display:none" title="undo"><i class="icon-undo"></i></a>
- <a href="#" class="action delete no-pjax" title="delete"><i class="icon-trash"></i></a>
+ <div class="options no-pjax">
+ <a href="#" class="action edit-note" title="edit"><i class="icon-pencil"></i></a>
+ <a href="#" class="action save-note" style="display:none" title="save"><i class="icon-save"></i></a>
+ <a href="#" class="action cancel-edit" style="display:none" title="undo"><i class="icon-undo"></i></a>
+ <a href="#" class="action delete" title="delete"><i class="icon-trash"></i></a>
</div>
<?php } ?>
</div>
diff --git a/include/staff/templates/user.tmpl.php b/include/staff/templates/user.tmpl.php
index 5cc1178ff..2aabe3ba5 100644
--- a/include/staff/templates/user.tmpl.php
+++ b/include/staff/templates/user.tmpl.php
@@ -47,7 +47,7 @@ if ($info['error']) {
<div class="floating-options">
<a href="#" id="edituser" class="action" title="Edit"><i class="icon-edit"></i></a>
<a href="users.php?id=<?php echo $user->getId(); ?>" title="Manage User"
- class="action no-pjax"><i class="icon-share"></i></a>
+ class="action"><i class="icon-share"></i></a>
</div>
<table class="custom-info">
<?php foreach ($user->getDynamicData() as $entry) {
@@ -69,7 +69,7 @@ if ($info['error']) {
<div class="tab_content" id="organization-tab" style="display:none">
<div class="floating-options">
<a href="orgs.php?id=<?php echo $org->getId(); ?>" title="Manage Organization"
- class="action no-pjax"><i class="icon-share"></i></a>
+ class="action"><i class="icon-share"></i></a>
</div>
<table class="custom-info" width="100%">
<?php foreach ($org->getDynamicData() as $entry) {
diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php
index a423e02c9..fe40708bf 100644
--- a/include/staff/ticket-view.inc.php
+++ b/include/staff/ticket-view.inc.php
@@ -196,9 +196,9 @@ if($ticket->isOverdue())
$user->getId(), $closed);
?>
<li><a href="tickets.php?a=search&uid=<?php echo $ticket->getOwnerId(); ?>"><i class="icon-double-angle-right icon-fixed-width"></i> All Tickets</a></li>
- <li><a href="users.php?id=<?php echo $user->getId(); ?>" class="no-pjax"><i class="icon-user icon-fixed-width"></i> Manage Client</a></li>
+ <li><a href="users.php?id=<?php echo $user->getId(); ?>"><i class="icon-user icon-fixed-width"></i> Manage Client</a></li>
<?php if ($user->getOrgId()) { ?>
- <li><a href="orgs.php?id=<?php echo $user->getOrgId(); ?>" class="no-pjax"><i class="icon-building icon-fixed-width"></i> Manage Organization</a></li>
+ <li><a href="orgs.php?id=<?php echo $user->getOrgId(); ?>"><i class="icon-building icon-fixed-width"></i> Manage Organization</a></li>
<?php } ?>
</u>
</div>
--
GitLab