From aa86a094ebee12d38d96962a5c4dad9a6eaadf05 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sat, 9 May 2015 15:01:22 -0400 Subject: [PATCH 1/7] #233 Fix some alignment issues --- admin/admin_settings.php | 4 ++-- admin/mail.php | 5 ++++- index.php | 5 +++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/admin/admin_settings.php b/admin/admin_settings.php index bf0d0872..880e4865 100644 --- a/admin/admin_settings.php +++ b/admin/admin_settings.php @@ -1155,8 +1155,8 @@ if ( defined('HESK_DEMO') ) $off = $hesk_settings['kb_enable'] ? '' : 'checked="checked"'; $only = $hesk_settings['kb_enable'] == 2 ? 'checked="checked"' : ''; echo ' -
    -
    +

+

'; ?> diff --git a/admin/mail.php b/admin/mail.php index 49ab99d6..e4d2547c 100644 --- a/admin/mail.php +++ b/admin/mail.php @@ -177,7 +177,10 @@ show_new_form(); /* Clean unneeded session variables */ hesk_cleanSessionVars('hide'); hesk_cleanSessionVars('mail'); - +?> + + + + @@ -1118,10 +1119,10 @@ function print_start()
- <?php echo $hesklang['sub_support']; ?> + <?php echo $hesklang['sub_ticket']; ?>
-

+

From d2a14c0c53d1e633f37aaf1308cdf450e9934cd5 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Mon, 11 May 2015 18:38:04 -0400 Subject: [PATCH 2/7] #233 Fix footer on reports page --- admin/reports.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/admin/reports.php b/admin/reports.php index 33d3c6a0..e857656f 100644 --- a/admin/reports.php +++ b/admin/reports.php @@ -339,9 +339,6 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); hesk_ticketsByDay(); } - require_once(HESK_PATH . 'inc/footer.inc.php'); - exit(); - /*** START FUNCTIONS ***/ @@ -949,4 +946,8 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); } // END hesk_ticketsByDay ?> - \ No newline at end of file + + Date: Mon, 11 May 2015 18:39:58 -0400 Subject: [PATCH 3/7] #233 Fix footer in knowledgebase --- admin/knowledgebase_private.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/knowledgebase_private.php b/admin/knowledgebase_private.php index 5bfa7d47..305ae5a5 100644 --- a/admin/knowledgebase_private.php +++ b/admin/knowledgebase_private.php @@ -101,7 +101,7 @@ else { hesk_show_kb_category($catid); } - +?> Date: Mon, 11 May 2015 18:48:25 -0400 Subject: [PATCH 4/7] #233 Fix undefined variable and checkbox alignment --- index.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/index.php b/index.php index 0b6eed1b..f36dc325 100644 --- a/index.php +++ b/index.php @@ -1092,7 +1092,9 @@ function print_start()
- /> +
Date: Mon, 11 May 2015 18:53:11 -0400 Subject: [PATCH 5/7] #233 Fix footer on new_ticket --- admin/new_ticket.php | 1 + 1 file changed, 1 insertion(+) diff --git a/admin/new_ticket.php b/admin/new_ticket.php index fde00456..577eabfd 100644 --- a/admin/new_ticket.php +++ b/admin/new_ticket.php @@ -1002,6 +1002,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); + Date: Mon, 11 May 2015 19:21:27 -0400 Subject: [PATCH 6/7] Fixes #240 show the sidebar regardless of number of articles --- admin/manage_knowledgebase.php | 147 +++++++++++++++------------------ 1 file changed, 65 insertions(+), 82 deletions(-) diff --git a/admin/manage_knowledgebase.php b/admin/manage_knowledgebase.php index e94fd461..31b0edea 100644 --- a/admin/manage_knowledgebase.php +++ b/admin/manage_knowledgebase.php @@ -1596,7 +1596,67 @@ function manage_category() { +
+ +
+
+
+
+
+
+
+ + +
+
+ + +
+
+ +
+ +

+
+
+ +

+
+
+
+ +
+ +
+
+ +
+ + + + + +
+
+
+
+
+
+ +
+ '.$hesklang['kb_no_art'].'   '.$hesklang['kb_i_art2'].'

'; @@ -1610,63 +1670,6 @@ function manage_category() { $num_nosticky = $num - $num_sticky; ?> - - -
-
-
-
-
-
-
-
- - -
-
- - -
-
- -
- -

-
-
- -

-
-
-
- -
- -
-
- -
- - - - - -
-
-
-
-
-
-

'.$hesklang['kb_i_art2'].''; ?>

@@ -1793,35 +1796,15 @@ function manage_category() { } // End while ?> -
-
- } // END if hide article list - /* Manage Category (except the default one) */ - if ($catid != 1) - { - ?> +
+
- - - - - - - - - - -
- -  
- -  '; From 02a49171d56c3a34d1f57169886134477f0e48d6 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Mon, 11 May 2015 19:25:16 -0400 Subject: [PATCH 7/7] #233 Fix panels when number of rows in top/latest are 0 --- inc/knowledgebase_functions.inc.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/inc/knowledgebase_functions.inc.php b/inc/knowledgebase_functions.inc.php index daf74b74..727207b9 100644 --- a/inc/knowledgebase_functions.inc.php +++ b/inc/knowledgebase_functions.inc.php @@ -97,7 +97,6 @@ function hesk_kbTopArticles($how_many, $index = 1) -  '; echo ''; } ?> @@ -129,7 +129,6 @@ function hesk_kbTopArticles($how_many, $index = 1) $colspan = 'colspan="2"'; } echo ''; - return true; } /* We have some results, print them out */ @@ -155,6 +154,8 @@ function hesk_kbTopArticles($how_many, $index = 1)
  ' . $hesklang['views'] . '
'.$hesklang['noa'].'
'.$hesklang['noa'].''; - return true; } /* We have some results, print them out */ @@ -261,6 +261,8 @@ function hesk_kbLatestArticles($how_many, $index = 1)