From 52d80491df3d15906c56ef5f7809e3ebffcf4373 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Fri, 15 May 2015 18:50:43 -0400 Subject: [PATCH 1/2] #205 Tweaked index page layout and now show top/latest articles based on value in settings --- css/hesk_newStyle.php | 22 +++++++ css/hesk_newStyleRTL.php | 40 +++++++++--- inc/knowledgebase_functions.inc.php | 17 +++--- index.php | 95 ++++++++++++++++++----------- language/en/text.php | 5 +- 5 files changed, 125 insertions(+), 54 deletions(-) diff --git a/css/hesk_newStyle.php b/css/hesk_newStyle.php index f1f1f4e1..98c6e4f0 100644 --- a/css/hesk_newStyle.php +++ b/css/hesk_newStyle.php @@ -401,4 +401,26 @@ button.dropdown-submit { .indent-15 { margin-left: 15px; +} + +.button-link { + color: #4a5571; +} + +.button-link:hover { + text-decoration: none; + color: #000; +} + +.button-link .col-xs-1 { + margin: 0 auto; + padding: 0; +} + +.button-link .panel-body:hover { + background-color: #EEE; +} + +.default-row-margins { + margin: 0 -15px; } \ No newline at end of file diff --git a/css/hesk_newStyleRTL.php b/css/hesk_newStyleRTL.php index aab80934..39d18ff9 100644 --- a/css/hesk_newStyleRTL.php +++ b/css/hesk_newStyleRTL.php @@ -371,28 +371,50 @@ button.dropdown-submit { } .attachment-table > tbody > tr > td > i { -color: #ddd; -text-shadow: 2px 2px #ccc; + color: #ddd; + text-shadow: 2px 2px #ccc; } .attachment-table > tbody > tr > td { -vertical-align: middle; + vertical-align: middle; } .attachment-table > tbody > tr > td > span > img { -max-height: 80px; -max-width: 80px; -cursor: pointer; + max-height: 80px; + max-width: 80px; + cursor: pointer; } .plaintext-editor { -font-family: monospace; + font-family: monospace; } .table-fixed { -table-layout: fixed; + table-layout: fixed; } .indent-15 { -margin-right: 15px; + margin-right: 15px; +} + +.button-link { + color: #4a5571; +} + +.button-link:hover { + text-decoration: none; + color: #000; +} + +.button-link .col-xs-1 { + margin: 0 auto; + padding: 0; +} + +.button-link .panel-body:hover { + background-color: #EEE; +} + +.default-row-margins { + margin: 0 -15px; } \ No newline at end of file diff --git a/inc/knowledgebase_functions.inc.php b/inc/knowledgebase_functions.inc.php index 727207b9..53814835 100644 --- a/inc/knowledgebase_functions.inc.php +++ b/inc/knowledgebase_functions.inc.php @@ -287,10 +287,7 @@ function hesk_kbSearchLarge($admin = '') - +
@@ -325,10 +322,14 @@ function hesk_kbSearchSmall()
- - +
+ + + + +


diff --git a/index.php b/index.php index 7e91e765..408facee 100644 --- a/index.php +++ b/index.php @@ -1126,46 +1126,69 @@ function print_start() echo ' '; } ?> -
- -
-
- <?php echo $hesklang['sub_ticket']; ?> -
-
-

-
-
- - -
-
- <?php echo $hesklang['view_existing']; ?> +
+
+ +
+
+
+
+ <?php echo $hesklang['sub_support']; ?> +
+
+
+ +
+
+
-
-

+ +
+
+ +
+
+
+
+ <?php echo $hesklang['view_existing']; ?> +
+
+
+ +
+
+
-
- - +
+
+ - -
-
- <?php echo $hesklang['kb_text']; ?> -
-
-

-
+
+
+ +
+
+
+
+ <?php echo $hesklang['kb_text']; ?> +
+
+
+ +
+
+
+
+
- - -
+
+
diff --git a/language/en/text.php b/language/en/text.php index 5e82c7cb..460a94f5 100644 --- a/language/en/text.php +++ b/language/en/text.php @@ -40,7 +40,10 @@ $hesklang['x_merged'] = '(+%s merged)'; // %s number of tickets merged $hesklang['merged_tickets'] = 'Merged tickets: '; $hesklang['show_number_merged'] = 'Show number of tickets merged'; $hesklang['show_number_merged_descr'] = 'Show number of tickets merged next to Tracking ID'; -$hesklang['show_number_merged_help'] = 'If enabled, the user will be able to see which tickets were merged into the other on the ticket serarch screen.'; +$hesklang['show_number_merged_help'] = 'If enabled, the user will be able to see which tickets were merged into the other on the ticket search screen.'; +$hesklang['latest_top_on_home'] = 'Latest/Top articles on home page'; +$hesklang['latest_top_on_home_help'] = 'Select YES to display the top and latest knowledgebase articles on the home page. + Otherwise, a link to the knowledgebase will appear on the home page.'; // ADDED OR MODIFIED IN Mods for HESK 2.2.1 $hesklang['popart_no_colon']='Top Knowledgebase Articles'; // same as $hesklang['popart'] but without a colon (:) From 43216a93ec551fcb9c645c8fc414904ef56d6b49 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Fri, 15 May 2015 18:53:21 -0400 Subject: [PATCH 2/2] #205 Remove unused CSS --- css/hesk_newStyle.php | 40 ---------------------------------------- css/hesk_newStyleRTL.php | 40 ---------------------------------------- 2 files changed, 80 deletions(-) diff --git a/css/hesk_newStyle.php b/css/hesk_newStyle.php index 98c6e4f0..236d8b28 100644 --- a/css/hesk_newStyle.php +++ b/css/hesk_newStyle.php @@ -245,46 +245,6 @@ div.blankSpace { div.footerWithBorder { border-top: 1px solid #cfd4d6; } - -.blockRow > a:hover { - text-decoration: none; -} - -.block { - height: 114px; - width: 114px; - display: inline-block; - border: 1px solid #c9cfd7; - background-color: #fff; - border-radius: 4px; - font-size: .83em; - margin-right: 5px; - vertical-align: top; -} - -.block > .upper { - height:57px; - padding-top:10px; -} - -.block > .upper > img { - padding-top:5px; - padding-bottom:5px; - padding-left:41px; -} - -.block > .lower { - height:57px; - text-align:center; -} - -.block > .lower > p:hover { - text-decoration: underline; -} - -div.block:hover { - background-color: #e9ecef; -} div.rightSideDash { padding-left: 18px; padding-right: 18px; diff --git a/css/hesk_newStyleRTL.php b/css/hesk_newStyleRTL.php index 39d18ff9..5355d765 100644 --- a/css/hesk_newStyleRTL.php +++ b/css/hesk_newStyleRTL.php @@ -244,46 +244,6 @@ div.blankSpace { div.footerWithBorder { border-top: 1px solid #cfd4d6; } - -.blockRow > a:hover { - text-decoration: none; -} - -.block { - height: 114px; - width: 114px; - display: inline-block; - border: 1px solid #c9cfd7; - background-color: #fff; - border-radius: 4px; - font-size: .83em; - margin-left: 5px; - vertical-align: top; -} - -.block > .upper { - height:57px; - padding-top:10px; -} - -.block > .upper > img { - padding-top:5px; - padding-bottom:5px; - padding-right:41px; -} - -.block > .lower { - height:57px; - text-align:center; -} - -.block > .lower > p:hover { - text-decoration: underline; -} - -div.block:hover { - background-color: #e9ecef; -} div.rightSideDash { padding-right: 18px; padding-left: 18px;