diff --git a/scp/apikeys.php b/scp/apikeys.php index 58daf6eeaa32b8518895016de8203c6d8983a08d..9f511ecda98a261651a7a2695382138357cdbef1 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 6c1e2611ffbba9904dc73529e6fbe1f75d994181..f2ec48446d0db70566e6c03db6dc629e38e922ad 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 13c6cfbb138193f4150ffdfc7118242865352de4..b567b0ea6f9790cb106a2a1de5c5225219046af4 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 47877202d1e41fbc1d0017cb87d248c1d687005a..d6b66f485b91feb7cf5c3273a7e6d8566e23fe5d 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 cd76d90054025a398305b3742b1916177c8a281f..5a941720036dd094ab0f5fe74b1e115a6005ed4b 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 d9fcfec63e885b9689776f2f9b9838cb74c7bf16..ab930683e132fdd64befdbfa90cf237217470c7a 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 c6efd1cbf46425346798f6c932642fc9c01370eb..b1b4dbdce637a6e5bab4b8511dd8538448cae4a4 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 d974bb10d8d1270aec2a6b2446b6f800ab772d28..a5717f6de3d4a3f62caaddd39967b44312e3be68 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 cb2cf35e6d73bf73460e319ee124f19249ebad6f..e577044217e385e8a64c5d4b8630286c8697b329 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 17af9a364eacd056e1e8c96b39e916d734f5d4e9..6941944246f31cd824dc96dd8f9c3308cec26dc0 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 3e9d2c643e535e9e9e029c45de03d98525170413..8adbe88370f8b9ccc000507779ae9c6cab436694 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 5d29e0d5262835dc984552ab416538de280006a8..8a5209016505c7e0dde9da23f2dc357f5fd09ca9 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 7a0772319ffd7019a03cf010224824a2fafbdf0d..a2730a58d638e556806208a71913954d110143c3 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 cd34daf67e4354b01b4e715c23ba6e85bd70dca7..228ddff21f88f1d3ec79e6e394a6607c4d903341 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 365ec15644ea6569ec109403fc510255ab7668a1..4b083c0558f195c6241fd8e5bea4f1a8e027e2db 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 2cd6702347bb49d1181cfffc9026769eeb58f447..479ea804620e0495897ac4cfb67a3eb59a2a5164 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 782d19c27233e95a41fe5479e631307d28cc722c..2931cd9c1f6453dc9002c1db69e92f64e8eef210 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 d9f0d7e3432faeeeecab1a8d172358a83a621a1e..91bd9173304010e68f0214869f0f2314bcd7bb91 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 7c5715779b50aefd64a408ee86f5e34a291b35c3..27ed0b41425184ebc363e9c1019c63cedc7238c1 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 947a232ab9a96fbe7ad2725548d3ff2ec7ed5542..03368fbaabea19a1aace6acac893219e782e516b 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 85329b7e057fcfeefa51b759c573ed91a6776825..ae2f8e24053a417b413e43fe4ffefd7f3ecbaffd 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 3e5963db791ae4d12bfaca72e8b34f6f110f61c9..98cb82b898ebdad185cd24289f11a53553672e28 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 f2a35acb9a75bb432dc8d23dd14a8a8544ed9c35..79b0a01e6ac818e22ea3b3215e55c4f68b5f04f7 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 9aebe65e154fda66c95edd7a97e2cc0c169e5411..81f9984acac5cf3827a0f23a31a5640b36b38648 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');