Skip to content
Snippets Groups Projects
Commit 5d14396c authored by Jared Hancock's avatar Jared Hancock
Browse files

pjax: Add tip namespace cooperative with PJAX

parent 1ba59ea1
Branches
Tags
No related merge requests found
...@@ -102,7 +102,8 @@ if($api || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) { ...@@ -102,7 +102,8 @@ if($api || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
} }
$nav->setTabActive('manage'); $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.'header.inc.php');
require(STAFFINC_DIR.$page); require(STAFFINC_DIR.$page);
include(STAFFINC_DIR.'footer.inc.php'); include(STAFFINC_DIR.'footer.inc.php');
......
...@@ -17,11 +17,11 @@ require('admin.inc.php'); ...@@ -17,11 +17,11 @@ require('admin.inc.php');
include_once(INCLUDE_DIR.'class.banlist.php'); include_once(INCLUDE_DIR.'class.banlist.php');
/* Get the system ban list filter */ /* Get the system ban list filter */
if(!($filter=Banlist::getFilter())) if(!($filter=Banlist::getFilter()))
$warn = 'System ban list is empty.'; $warn = 'System ban list is empty.';
elseif(!$filter->isActive()) 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. $rule=null; //ban rule obj.
if($filter && $_REQUEST['id'] && !($rule=$filter->getRule($_REQUEST['id']))) if($filter && $_REQUEST['id'] && !($rule=$filter->getRule($_REQUEST['id'])))
$errors['err'] = 'Unknown or invalid ban list ID #'; $errors['err'] = 'Unknown or invalid ban list ID #';
...@@ -106,7 +106,7 @@ if($_POST && !$errors && $filter){ ...@@ -106,7 +106,7 @@ if($_POST && !$errors && $filter){
$warn = "$i of $count selected emails deleted from banlist"; $warn = "$i of $count selected emails deleted from banlist";
elseif(!$errors['err']) elseif(!$errors['err'])
$errors['err'] = 'Unable to delete selected emails'; $errors['err'] = 'Unable to delete selected emails';
break; break;
default: default:
$errors['err'] = 'Unknown action - get technical help'; $errors['err'] = 'Unknown action - get technical help';
...@@ -127,7 +127,8 @@ if(!$filter || ($rule || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add')))) ...@@ -127,7 +127,8 @@ if(!$filter || ($rule || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))))
} }
$nav->setTabActive('emails'); $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.'header.inc.php');
require(STAFFINC_DIR.$page); require(STAFFINC_DIR.$page);
include(STAFFINC_DIR.'footer.inc.php'); include(STAFFINC_DIR.'footer.inc.php');
......
...@@ -154,7 +154,8 @@ if($canned || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) { ...@@ -154,7 +154,8 @@ if($canned || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
} }
$nav->setTabActive('kbase'); $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.'header.inc.php');
require(STAFFINC_DIR.$page); require(STAFFINC_DIR.$page);
include(STAFFINC_DIR.'footer.inc.php'); include(STAFFINC_DIR.'footer.inc.php');
......
...@@ -55,7 +55,7 @@ if($_POST){ ...@@ -55,7 +55,7 @@ if($_POST){
case 'make_public': case 'make_public':
$sql='UPDATE '.FAQ_CATEGORY_TABLE.' SET ispublic=1 ' $sql='UPDATE '.FAQ_CATEGORY_TABLE.' SET ispublic=1 '
.' WHERE category_id IN ('.implode(',', db_input($_POST['ids'])).')'; .' WHERE category_id IN ('.implode(',', db_input($_POST['ids'])).')';
if(db_query($sql) && ($num=db_affected_rows())) { if(db_query($sql) && ($num=db_affected_rows())) {
if($num==$count) if($num==$count)
$msg = 'Selected categories made PUBLIC'; $msg = 'Selected categories made PUBLIC';
...@@ -111,7 +111,8 @@ if($category || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) { ...@@ -111,7 +111,8 @@ if($category || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
} }
$nav->setTabActive('kbase'); $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.'header.inc.php');
require(STAFFINC_DIR.$page); require(STAFFINC_DIR.$page);
include(STAFFINC_DIR.'footer.inc.php'); include(STAFFINC_DIR.'footer.inc.php');
......
...@@ -1784,4 +1784,5 @@ table.custom-info td { ...@@ -1784,4 +1784,5 @@ table.custom-info td {
.form_table tr i.help-tip { .form_table tr i.help-tip {
opacity: 0.2; opacity: 0.2;
margin-left: 5px;
} }
...@@ -15,7 +15,8 @@ ...@@ -15,7 +15,8 @@
**********************************************************************/ **********************************************************************/
require('staff.inc.php'); require('staff.inc.php');
$nav->setTabActive('dashboard'); $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'); require(STAFFINC_DIR.'header.inc.php');
?> ?>
......
...@@ -110,7 +110,8 @@ if($dept || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) { ...@@ -110,7 +110,8 @@ if($dept || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
} }
$nav->setTabActive('staff'); $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.'header.inc.php');
require(STAFFINC_DIR.$page); require(STAFFINC_DIR.$page);
include(STAFFINC_DIR.'footer.inc.php'); include(STAFFINC_DIR.'footer.inc.php');
......
...@@ -16,7 +16,8 @@ ...@@ -16,7 +16,8 @@
require('staff.inc.php'); require('staff.inc.php');
$page='directory.inc.php'; $page='directory.inc.php';
$nav->setTabActive('dashboard'); $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.'header.inc.php');
require(STAFFINC_DIR.$page); require(STAFFINC_DIR.$page);
include(STAFFINC_DIR.'footer.inc.php'); include(STAFFINC_DIR.'footer.inc.php');
......
...@@ -65,7 +65,7 @@ if($_POST){ ...@@ -65,7 +65,7 @@ if($_POST){
$warn = "$i of $count selected emails deleted"; $warn = "$i of $count selected emails deleted";
elseif(!$errors['err']) elseif(!$errors['err'])
$errors['err'] = 'Unable to delete selected emails'; $errors['err'] = 'Unable to delete selected emails';
} else { } else {
$errors['err'] = 'Unknown action - get technical help'; $errors['err'] = 'Unknown action - get technical help';
} }
...@@ -85,8 +85,9 @@ if($email || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) { ...@@ -85,8 +85,9 @@ if($email || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
} }
$nav->setTabActive('emails'); $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.'header.inc.php');
require(STAFFINC_DIR.$page); require(STAFFINC_DIR.$page);
include(STAFFINC_DIR.'footer.inc.php'); include(STAFFINC_DIR.'footer.inc.php');
?> ?>
\ No newline at end of file
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/********************************************************************* /*********************************************************************
emailtest.php emailtest.php
Email Diagnostic Email Diagnostic
Peter Rotich <peter@osticket.com> Peter Rotich <peter@osticket.com>
Copyright (c) 2006-2013 osTicket Copyright (c) 2006-2013 osTicket
...@@ -49,7 +49,8 @@ if($_POST){ ...@@ -49,7 +49,8 @@ if($_POST){
} }
$info=Format::htmlchars(($errors && $_POST)?$_POST:$info); $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
$nav->setTabActive('emails'); $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'); require(STAFFINC_DIR.'header.inc.php');
?> ?>
<form action="emailtest.php" method="post" id="save"> <form action="emailtest.php" method="post" id="save">
......
...@@ -102,7 +102,8 @@ if($faq) { ...@@ -102,7 +102,8 @@ if($faq) {
$inc='faq-category.inc.php'; $inc='faq-category.inc.php';
} }
$nav->setTabActive('kbase'); $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.'header.inc.php');
require_once(STAFFINC_DIR.$inc); require_once(STAFFINC_DIR.$inc);
require_once(STAFFINC_DIR.'footer.inc.php'); require_once(STAFFINC_DIR.'footer.inc.php');
......
...@@ -79,7 +79,7 @@ if($_POST){ ...@@ -79,7 +79,7 @@ if($_POST){
if(($f=Filter::lookup($v)) && !$f->isSystemBanlist() && $f->delete()) if(($f=Filter::lookup($v)) && !$f->isSystemBanlist() && $f->delete())
$i++; $i++;
} }
if($i && $i==$count) if($i && $i==$count)
$msg = 'Selected filters deleted successfully'; $msg = 'Selected filters deleted successfully';
elseif($i>0) elseif($i>0)
...@@ -106,7 +106,8 @@ if($filter || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) { ...@@ -106,7 +106,8 @@ if($filter || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
} }
$nav->setTabActive('manage'); $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.'header.inc.php');
require(STAFFINC_DIR.$page); require(STAFFINC_DIR.$page);
include(STAFFINC_DIR.'footer.inc.php'); include(STAFFINC_DIR.'footer.inc.php');
......
...@@ -74,7 +74,7 @@ if($_POST){ ...@@ -74,7 +74,7 @@ if($_POST){
foreach($_POST['ids'] as $k=>$v) { foreach($_POST['ids'] as $k=>$v) {
if(($g=Group::lookup($v)) && $g->delete()) if(($g=Group::lookup($v)) && $g->delete())
$i++; $i++;
} }
if($i && $i==$count) if($i && $i==$count)
$msg = 'Selected groups deleted successfully'; $msg = 'Selected groups deleted successfully';
...@@ -102,8 +102,9 @@ if($group || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) { ...@@ -102,8 +102,9 @@ if($group || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
} }
$nav->setTabActive('staff'); $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.'header.inc.php');
require(STAFFINC_DIR.$page); require(STAFFINC_DIR.$page);
include(STAFFINC_DIR.'footer.inc.php'); include(STAFFINC_DIR.'footer.inc.php');
?> ?>
\ No newline at end of file
...@@ -50,7 +50,7 @@ if($_POST){ ...@@ -50,7 +50,7 @@ if($_POST){
case 'enable': case 'enable':
$sql='UPDATE '.TOPIC_TABLE.' SET isactive=1 ' $sql='UPDATE '.TOPIC_TABLE.' SET isactive=1 '
.' WHERE topic_id IN ('.implode(',', db_input($_POST['ids'])).')'; .' WHERE topic_id IN ('.implode(',', db_input($_POST['ids'])).')';
if(db_query($sql) && ($num=db_affected_rows())) { if(db_query($sql) && ($num=db_affected_rows())) {
if($num==$count) if($num==$count)
$msg = 'Selected help topics enabled'; $msg = 'Selected help topics enabled';
...@@ -109,7 +109,8 @@ if($topic || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) { ...@@ -109,7 +109,8 @@ if($topic || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
} }
$nav->setTabActive('manage'); $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.'header.inc.php');
require(STAFFINC_DIR.$page); require(STAFFINC_DIR.$page);
include(STAFFINC_DIR.'footer.inc.php'); include(STAFFINC_DIR.'footer.inc.php');
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/********************************************************************* /*********************************************************************
kb.php kb.php
Knowlegebase Knowlegebase
Peter Rotich <peter@osticket.com> Peter Rotich <peter@osticket.com>
Copyright (c) 2006-2013 osTicket Copyright (c) 2006-2013 osTicket
...@@ -24,7 +24,8 @@ if($category && $_REQUEST['a']!='search') { ...@@ -24,7 +24,8 @@ if($category && $_REQUEST['a']!='search') {
$inc='faq-category.inc.php'; $inc='faq-category.inc.php';
} }
$nav->setTabActive('kbase'); $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.'header.inc.php');
require_once(STAFFINC_DIR.$inc); require_once(STAFFINC_DIR.$inc);
require_once(STAFFINC_DIR.'footer.inc.php'); require_once(STAFFINC_DIR.'footer.inc.php');
......
...@@ -181,7 +181,8 @@ if($_POST) { ...@@ -181,7 +181,8 @@ if($_POST) {
$page='dynamic-lists.inc.php'; $page='dynamic-lists.inc.php';
if($list || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) { if($list || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
$page='dynamic-list.inc.php'; $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'); $nav->setTabActive('manage');
......
...@@ -46,7 +46,8 @@ if($_POST){ ...@@ -46,7 +46,8 @@ if($_POST){
$page='syslogs.inc.php'; $page='syslogs.inc.php';
$nav->setTabActive('dashboard'); $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.'header.inc.php');
require(STAFFINC_DIR.$page); require(STAFFINC_DIR.$page);
include(STAFFINC_DIR.'footer.inc.php'); include(STAFFINC_DIR.'footer.inc.php');
......
...@@ -121,7 +121,8 @@ if($page || $_REQUEST['a']=='add') { ...@@ -121,7 +121,8 @@ if($page || $_REQUEST['a']=='add') {
} }
$nav->setTabActive('manage'); $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.'header.inc.php');
require_once(STAFFINC_DIR.$inc); require_once(STAFFINC_DIR.$inc);
require_once(STAFFINC_DIR.'footer.inc.php'); require_once(STAFFINC_DIR.'footer.inc.php');
......
...@@ -41,7 +41,8 @@ elseif($thisstaff->onVacation() && !$warn) ...@@ -41,7 +41,8 @@ elseif($thisstaff->onVacation() && !$warn)
$inc='profile.inc.php'; $inc='profile.inc.php';
$nav->setTabActive('dashboard'); $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_once(STAFFINC_DIR.'header.inc.php');
require(STAFFINC_DIR.$inc); require(STAFFINC_DIR.$inc);
require_once(STAFFINC_DIR.'footer.inc.php'); require_once(STAFFINC_DIR.'footer.inc.php');
......
...@@ -48,7 +48,7 @@ if($_POST){ ...@@ -48,7 +48,7 @@ if($_POST){
case 'enable': case 'enable':
$sql='UPDATE '.SLA_TABLE.' SET isactive=1 ' $sql='UPDATE '.SLA_TABLE.' SET isactive=1 '
.' WHERE id IN ('.implode(',', db_input($_POST['ids'])).')'; .' WHERE id IN ('.implode(',', db_input($_POST['ids'])).')';
if(db_query($sql) && ($num=db_affected_rows())) { if(db_query($sql) && ($num=db_affected_rows())) {
if($num==$count) if($num==$count)
$msg = 'Selected SLA plans enabled'; $msg = 'Selected SLA plans enabled';
...@@ -98,7 +98,8 @@ if($_POST){ ...@@ -98,7 +98,8 @@ if($_POST){
$page='slaplans.inc.php'; $page='slaplans.inc.php';
if($sla || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) { if($sla || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
$page='slaplan.inc.php'; $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'); $nav->setTabActive('manage');
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment