From 5d14396cf6914ae103bdbb937cf4f6da162cf2e9 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Fri, 25 Apr 2014 15:44:20 -0500
Subject: [PATCH] pjax: Add tip namespace cooperative with PJAX

---
 scp/apikeys.php     |  3 ++-
 scp/banlist.php     | 11 ++++++-----
 scp/canned.php      |  3 ++-
 scp/categories.php  |  5 +++--
 scp/css/scp.css     |  1 +
 scp/dashboard.php   |  3 ++-
 scp/departments.php |  3 ++-
 scp/directory.php   |  3 ++-
 scp/emails.php      |  7 ++++---
 scp/emailtest.php   |  5 +++--
 scp/faq.php         |  3 ++-
 scp/filters.php     |  5 +++--
 scp/groups.php      |  7 ++++---
 scp/helptopics.php  |  5 +++--
 scp/kb.php          |  5 +++--
 scp/lists.php       |  3 ++-
 scp/logs.php        |  3 ++-
 scp/pages.php       |  3 ++-
 scp/profile.php     |  3 ++-
 scp/slas.php        |  5 +++--
 scp/staff.php       |  5 +++--
 scp/teams.php       |  3 ++-
 scp/templates.php   |  3 ++-
 scp/tickets.php     |  4 +++-
 24 files changed, 63 insertions(+), 38 deletions(-)

diff --git a/scp/apikeys.php b/scp/apikeys.php
index 58daf6eea..9f511ecda 100644
--- a/scp/apikeys.php
+++ b/scp/apikeys.php
@@ -102,7 +102,8 @@ if($api || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
 }
 
 $nav->setTabActive('manage');
-$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />');
+$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />',
+    "$('#content').data('tipNamespace', '".$tip_namespace."');");
 require(STAFFINC_DIR.'header.inc.php');
 require(STAFFINC_DIR.$page);
 include(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/banlist.php b/scp/banlist.php
index 6c1e2611f..f2ec48446 100644
--- a/scp/banlist.php
+++ b/scp/banlist.php
@@ -17,11 +17,11 @@ require('admin.inc.php');
 include_once(INCLUDE_DIR.'class.banlist.php');
 
 /* Get the system ban list filter */
-if(!($filter=Banlist::getFilter())) 
+if(!($filter=Banlist::getFilter()))
     $warn = 'System ban list is empty.';
 elseif(!$filter->isActive())
-    $warn = 'SYSTEM BAN LIST filter is <b>DISABLED</b> - <a href="filters.php">enable here</a>.'; 
- 
+    $warn = 'SYSTEM BAN LIST filter is <b>DISABLED</b> - <a href="filters.php">enable here</a>.';
+
 $rule=null; //ban rule obj.
 if($filter && $_REQUEST['id'] && !($rule=$filter->getRule($_REQUEST['id'])))
     $errors['err'] = 'Unknown or invalid ban list ID #';
@@ -106,7 +106,7 @@ if($_POST && !$errors && $filter){
                             $warn = "$i of $count selected emails deleted from banlist";
                         elseif(!$errors['err'])
                             $errors['err'] = 'Unable to delete selected emails';
-                    
+
                         break;
                     default:
                         $errors['err'] = 'Unknown action - get technical help';
@@ -127,7 +127,8 @@ if(!$filter || ($rule || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))))
 }
 
 $nav->setTabActive('emails');
-$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />');
+$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />',
+    "$('#content').data('tipNamespace', '".$tip_namespace."');");
 require(STAFFINC_DIR.'header.inc.php');
 require(STAFFINC_DIR.$page);
 include(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/canned.php b/scp/canned.php
index 13c6cfbb1..b567b0ea6 100644
--- a/scp/canned.php
+++ b/scp/canned.php
@@ -154,7 +154,8 @@ if($canned || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
 }
 
 $nav->setTabActive('kbase');
-$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />');
+$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />',
+    "$('#content').data('tipNamespace', '".$tip_namespace."');");
 require(STAFFINC_DIR.'header.inc.php');
 require(STAFFINC_DIR.$page);
 include(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/categories.php b/scp/categories.php
index 47877202d..d6b66f485 100644
--- a/scp/categories.php
+++ b/scp/categories.php
@@ -55,7 +55,7 @@ if($_POST){
                     case 'make_public':
                         $sql='UPDATE '.FAQ_CATEGORY_TABLE.' SET ispublic=1 '
                             .' WHERE category_id IN ('.implode(',', db_input($_POST['ids'])).')';
-                    
+
                         if(db_query($sql) && ($num=db_affected_rows())) {
                             if($num==$count)
                                 $msg = 'Selected categories made PUBLIC';
@@ -111,7 +111,8 @@ if($category || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
 }
 
 $nav->setTabActive('kbase');
-$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />');
+$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />',
+    "$('#content').data('tipNamespace', '".$tip_namespace."');");
 require(STAFFINC_DIR.'header.inc.php');
 require(STAFFINC_DIR.$page);
 include(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/css/scp.css b/scp/css/scp.css
index cd76d9005..5a9417200 100644
--- a/scp/css/scp.css
+++ b/scp/css/scp.css
@@ -1784,4 +1784,5 @@ table.custom-info td {
 
 .form_table tr i.help-tip {
     opacity: 0.2;
+    margin-left: 5px;
 }
diff --git a/scp/dashboard.php b/scp/dashboard.php
index d9fcfec63..ab930683e 100644
--- a/scp/dashboard.php
+++ b/scp/dashboard.php
@@ -15,7 +15,8 @@
 **********************************************************************/
 require('staff.inc.php');
 $nav->setTabActive('dashboard');
-$ost->addExtraHeader('<meta name="tip-namespace" content="dashboard.dashboard" />');
+$ost->addExtraHeader('<meta name="tip-namespace" content="dashboard.dashboard" />',
+    "$('#content').data('tipNamespace', 'dashboard.dashboard');");
 require(STAFFINC_DIR.'header.inc.php');
 ?>
 
diff --git a/scp/departments.php b/scp/departments.php
index c6efd1cbf..b1b4dbdce 100644
--- a/scp/departments.php
+++ b/scp/departments.php
@@ -110,7 +110,8 @@ if($dept || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
 }
 
 $nav->setTabActive('staff');
-$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />');
+$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />',
+    "$('#content').data('tipNamespace', '".$tip_namespace."');");
 require(STAFFINC_DIR.'header.inc.php');
 require(STAFFINC_DIR.$page);
 include(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/directory.php b/scp/directory.php
index d974bb10d..a5717f6de 100644
--- a/scp/directory.php
+++ b/scp/directory.php
@@ -16,7 +16,8 @@
 require('staff.inc.php');
 $page='directory.inc.php';
 $nav->setTabActive('dashboard');
-$ost->addExtraHeader('<meta name="tip-namespace" content="dashboard.staff_directory" />');
+$ost->addExtraHeader('<meta name="tip-namespace" content="dashboard.staff_directory" />',
+    "$('#content').data('tipNamespace', 'dashboard.staff_directory');");
 require(STAFFINC_DIR.'header.inc.php');
 require(STAFFINC_DIR.$page);
 include(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/emails.php b/scp/emails.php
index cb2cf35e6..e57704421 100644
--- a/scp/emails.php
+++ b/scp/emails.php
@@ -65,7 +65,7 @@ if($_POST){
                         $warn = "$i of $count selected emails deleted";
                     elseif(!$errors['err'])
                         $errors['err'] = 'Unable to delete selected emails';
-                    
+
                 } else {
                     $errors['err'] = 'Unknown action - get technical help';
                 }
@@ -85,8 +85,9 @@ if($email || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
 }
 
 $nav->setTabActive('emails');
-$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />');
+$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />',
+    "$('#content').data('tipNamespace', '".$tip_namespace."');");
 require(STAFFINC_DIR.'header.inc.php');
 require(STAFFINC_DIR.$page);
 include(STAFFINC_DIR.'footer.inc.php');
-?>
\ No newline at end of file
+?>
diff --git a/scp/emailtest.php b/scp/emailtest.php
index 17af9a364..694194424 100644
--- a/scp/emailtest.php
+++ b/scp/emailtest.php
@@ -2,7 +2,7 @@
 /*********************************************************************
     emailtest.php
 
-    Email Diagnostic 
+    Email Diagnostic
 
     Peter Rotich <peter@osticket.com>
     Copyright (c)  2006-2013 osTicket
@@ -49,7 +49,8 @@ if($_POST){
 }
 $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
 $nav->setTabActive('emails');
-$ost->addExtraHeader('<meta name="tip-namespace" content="emails.diagnostic" />');
+$ost->addExtraHeader('<meta name="tip-namespace" content="emails.diagnostic" />',
+    "$('#content').data('tipNamespace', '".$tip_namespace."');");
 require(STAFFINC_DIR.'header.inc.php');
 ?>
 <form action="emailtest.php" method="post" id="save">
diff --git a/scp/faq.php b/scp/faq.php
index 3e9d2c643..8adbe8837 100644
--- a/scp/faq.php
+++ b/scp/faq.php
@@ -102,7 +102,8 @@ if($faq) {
     $inc='faq-category.inc.php';
 }
 $nav->setTabActive('kbase');
-$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />');
+$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />',
+    "$('#content').data('tipNamespace', '".$tip_namespace."');");
 require_once(STAFFINC_DIR.'header.inc.php');
 require_once(STAFFINC_DIR.$inc);
 require_once(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/filters.php b/scp/filters.php
index 5d29e0d52..8a5209016 100644
--- a/scp/filters.php
+++ b/scp/filters.php
@@ -79,7 +79,7 @@ if($_POST){
                             if(($f=Filter::lookup($v)) && !$f->isSystemBanlist() && $f->delete())
                                 $i++;
                         }
-                        
+
                         if($i && $i==$count)
                             $msg = 'Selected filters deleted successfully';
                         elseif($i>0)
@@ -106,7 +106,8 @@ if($filter || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
 }
 
 $nav->setTabActive('manage');
-$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />');
+$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />',
+    "$('#content').data('tipNamespace', '".$tip_namespace."');");
 require(STAFFINC_DIR.'header.inc.php');
 require(STAFFINC_DIR.$page);
 include(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/groups.php b/scp/groups.php
index 7a0772319..a2730a58d 100644
--- a/scp/groups.php
+++ b/scp/groups.php
@@ -74,7 +74,7 @@ if($_POST){
                         foreach($_POST['ids'] as $k=>$v) {
                             if(($g=Group::lookup($v)) && $g->delete())
                                 $i++;
-                        }   
+                        }
 
                         if($i && $i==$count)
                             $msg = 'Selected groups deleted successfully';
@@ -102,8 +102,9 @@ if($group || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
 }
 
 $nav->setTabActive('staff');
-$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />');
+$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />',
+    "$('#content').data('tipNamespace', '".$tip_namespace."');");
 require(STAFFINC_DIR.'header.inc.php');
 require(STAFFINC_DIR.$page);
 include(STAFFINC_DIR.'footer.inc.php');
-?>
\ No newline at end of file
+?>
diff --git a/scp/helptopics.php b/scp/helptopics.php
index cd34daf67..228ddff21 100644
--- a/scp/helptopics.php
+++ b/scp/helptopics.php
@@ -50,7 +50,7 @@ if($_POST){
                     case 'enable':
                         $sql='UPDATE '.TOPIC_TABLE.' SET isactive=1 '
                             .' WHERE topic_id IN ('.implode(',', db_input($_POST['ids'])).')';
-                    
+
                         if(db_query($sql) && ($num=db_affected_rows())) {
                             if($num==$count)
                                 $msg = 'Selected help topics enabled';
@@ -109,7 +109,8 @@ if($topic || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
 }
 
 $nav->setTabActive('manage');
-$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />');
+$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />',
+    "$('#content').data('tipNamespace', '".$tip_namespace."');");
 require(STAFFINC_DIR.'header.inc.php');
 require(STAFFINC_DIR.$page);
 include(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/kb.php b/scp/kb.php
index 365ec1564..4b083c055 100644
--- a/scp/kb.php
+++ b/scp/kb.php
@@ -2,7 +2,7 @@
 /*********************************************************************
     kb.php
 
-    Knowlegebase 
+    Knowlegebase
 
     Peter Rotich <peter@osticket.com>
     Copyright (c)  2006-2013 osTicket
@@ -24,7 +24,8 @@ if($category && $_REQUEST['a']!='search') {
     $inc='faq-category.inc.php';
 }
 $nav->setTabActive('kbase');
-$ost->addExtraHeader('<meta name="tip-namespace" content="knowledgebase.faqs" />');
+$ost->addExtraHeader('<meta name="tip-namespace" content="knowledgebase.faqs" />',
+    "$('#content').data('tipNamespace', '".$tip_namespace."');");
 require_once(STAFFINC_DIR.'header.inc.php');
 require_once(STAFFINC_DIR.$inc);
 require_once(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/lists.php b/scp/lists.php
index 2cd670234..479ea8046 100644
--- a/scp/lists.php
+++ b/scp/lists.php
@@ -181,7 +181,8 @@ if($_POST) {
 $page='dynamic-lists.inc.php';
 if($list || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
     $page='dynamic-list.inc.php';
-    $ost->addExtraHeader('<meta name="tip-namespace" content="manage.addnew_custom_list" />');
+    $ost->addExtraHeader('<meta name="tip-namespace" content="manage.addnew_custom_list" />',
+        "$('#content').data('tipNamespace', 'manage.addnew_custom_list');");
 }
 
 $nav->setTabActive('manage');
diff --git a/scp/logs.php b/scp/logs.php
index 782d19c27..2931cd9c1 100644
--- a/scp/logs.php
+++ b/scp/logs.php
@@ -46,7 +46,8 @@ if($_POST){
 
 $page='syslogs.inc.php';
 $nav->setTabActive('dashboard');
-$ost->addExtraHeader('<meta name="tip-namespace" content="dashboard.system_logs" />');
+$ost->addExtraHeader('<meta name="tip-namespace" content="dashboard.system_logs" />',
+    "$('#content').data('tipNamespace', 'dashboard.system_logs');");
 require(STAFFINC_DIR.'header.inc.php');
 require(STAFFINC_DIR.$page);
 include(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/pages.php b/scp/pages.php
index d9f0d7e34..91bd91733 100644
--- a/scp/pages.php
+++ b/scp/pages.php
@@ -121,7 +121,8 @@ if($page || $_REQUEST['a']=='add') {
 }
 
 $nav->setTabActive('manage');
-$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />');
+$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />',
+    "$('#content').data('tipNamespace', '".$tip_namespace."');");
 require_once(STAFFINC_DIR.'header.inc.php');
 require_once(STAFFINC_DIR.$inc);
 require_once(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/profile.php b/scp/profile.php
index 7c5715779..27ed0b414 100644
--- a/scp/profile.php
+++ b/scp/profile.php
@@ -41,7 +41,8 @@ elseif($thisstaff->onVacation() && !$warn)
 
 $inc='profile.inc.php';
 $nav->setTabActive('dashboard');
-$ost->addExtraHeader('<meta name="tip-namespace" content="dashboard.my_profile" />');
+$ost->addExtraHeader('<meta name="tip-namespace" content="dashboard.my_profile" />',
+    "$('#content').data('tipNamespace', 'dashboard.my_profile');");
 require_once(STAFFINC_DIR.'header.inc.php');
 require(STAFFINC_DIR.$inc);
 require_once(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/slas.php b/scp/slas.php
index 947a232ab..03368fbaa 100644
--- a/scp/slas.php
+++ b/scp/slas.php
@@ -48,7 +48,7 @@ if($_POST){
                     case 'enable':
                         $sql='UPDATE '.SLA_TABLE.' SET isactive=1 '
                             .' WHERE id IN ('.implode(',', db_input($_POST['ids'])).')';
-                    
+
                         if(db_query($sql) && ($num=db_affected_rows())) {
                             if($num==$count)
                                 $msg = 'Selected SLA plans enabled';
@@ -98,7 +98,8 @@ if($_POST){
 $page='slaplans.inc.php';
 if($sla || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
     $page='slaplan.inc.php';
-    $ost->addExtraHeader('<meta name="tip-namespace" content="manage.addnew_sla_plan" />');
+    $ost->addExtraHeader('<meta name="tip-namespace" content="manage.addnew_sla_plan" />',
+        "$('#content').data('tipNamespace', 'manage.addnew_sla_plan');");
 }
 
 $nav->setTabActive('manage');
diff --git a/scp/staff.php b/scp/staff.php
index 85329b7e0..ae2f8e240 100644
--- a/scp/staff.php
+++ b/scp/staff.php
@@ -87,7 +87,7 @@ if($_POST){
                     default:
                         $errors['err'] = 'Unknown action. Get technical help!';
                 }
-                    
+
             }
             break;
         default:
@@ -104,7 +104,8 @@ if($staff || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
 }
 
 $nav->setTabActive('staff');
-$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />');
+$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />',
+    "$('#content').data('tipNamespace', '".$tip_namespace."');");
 require(STAFFINC_DIR.'header.inc.php');
 require(STAFFINC_DIR.$page);
 include(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/teams.php b/scp/teams.php
index 3e5963db7..98cb82b89 100644
--- a/scp/teams.php
+++ b/scp/teams.php
@@ -100,7 +100,8 @@ if($team || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
 }
 
 $nav->setTabActive('staff');
-$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />');
+$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />',
+    "$('#content').data('tipNamespace', '".$tip_namespace."');");
 require(STAFFINC_DIR.'header.inc.php');
 require(STAFFINC_DIR.$page);
 include(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/templates.php b/scp/templates.php
index f2a35acb9..79b0a01e6 100644
--- a/scp/templates.php
+++ b/scp/templates.php
@@ -143,7 +143,8 @@ if($template && !strcasecmp($_REQUEST['a'],'manage')){
 }
 
 $nav->setTabActive('emails');
-$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />');
+$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />',
+    "$('#content').data('tipNamespace', '".$tip_namespace."');");
 require(STAFFINC_DIR.'header.inc.php');
 require(STAFFINC_DIR.$page);
 include(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/tickets.php b/scp/tickets.php
index 9aebe65e1..81f9984ac 100644
--- a/scp/tickets.php
+++ b/scp/tickets.php
@@ -622,7 +622,9 @@ if($ticket) {
 }
 
 $ost->addExtraHeader('<script type="text/javascript" src="js/ticket.js"></script>');
-$ost->addExtraHeader('<meta name="tip-namespace" content="tickets.queue" />');
+$ost->addExtraHeader('<meta name="tip-namespace" content="tickets.open" />',
+    "$('#content').data('tipNamespace', 'tickets.open');");
+
 require_once(STAFFINC_DIR.'header.inc.php');
 require_once(STAFFINC_DIR.$inc);
 require_once(STAFFINC_DIR.'footer.inc.php');
-- 
GitLab