From 0fdc62734c6a513e26121edb2dccf9263255c92d Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sun, 29 May 2016 01:13:24 -0400
Subject: [PATCH] #379 Tweak calendar catgory display to prevent overflow
 issues

---
 admin/calendar.php    | 11 +++++++----
 calendar.php          | 11 +++++++----
 css/mods-for-hesk.css |  9 +++++++++
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/admin/calendar.php b/admin/calendar.php
index 7c8ed88d..9a47d762 100644
--- a/admin/calendar.php
+++ b/admin/calendar.php
@@ -65,7 +65,7 @@ while ($row = hesk_dbFetchAssoc($rs)) {
         continue;
     }
 
-    $row['css_style'] = $row['color'] == null ? 'color: black; border: solid 1px #000' : 'background: ' . $row['color'];
+    $row['css_style'] = $row['color'] == null ? 'color: black; border: solid 1px #000; padding-left: 14px' : 'background: ' . $row['color'];
     $categories[] = $row;
 }
 
@@ -93,9 +93,12 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                         <div class="checkbox">
                             <input type="checkbox" data-select-target="category-toggle" name="category-toggle" value="<?php echo $category['id']; ?>" checked>
                         </div>
-                        <span class="label background-volatile category-label" style="<?php echo $category['css_style']; ?>">
-                            <?php echo $category['name']; ?>
-                        </span>
+                        <div class="row">
+                            <div class="col-sm-1" style="<?php echo $category['css_style']; ?>">&nbsp;</div>
+                            <div class="col-sm-11 hide-on-overflow no-wrap">
+                                <?php echo $category['name']; ?>
+                            </div>
+                        </div>
                     </li>
                 <?php endforeach; ?>
                 </ul>
diff --git a/calendar.php b/calendar.php
index 22c82673..cb66c66a 100644
--- a/calendar.php
+++ b/calendar.php
@@ -58,7 +58,7 @@ $categorySql = "SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "c
 $categoryRs = hesk_dbQuery($categorySql);
 while ($row = hesk_dbFetchAssoc($categoryRs))
 {
-    $row['css_style'] = $row['color'] == null ? 'color: black; border: solid 1px #000' : 'background: ' . $row['color'];
+    $row['css_style'] = $row['color'] == null ? 'color: black; border: solid 1px #000; padding-right: 14px' : 'background: ' . $row['color'];
     $categories[] = $row;
 }
 
@@ -82,9 +82,12 @@ require_once(HESK_PATH . 'inc/header.inc.php');
                             <div class="checkbox">
                                 <input type="checkbox" data-select-target="category-toggle" name="category-toggle" value="<?php echo $category['id']; ?>" checked>
                             </div>
-                        <span class="label background-volatile category-label" style="<?php echo $category['css_style']; ?>">
-                            <?php echo $category['name']; ?>
-                        </span>
+                            <div class="row">
+                                <div class="col-sm-1" style="<?php echo $category['css_style']; ?>">&nbsp;</div>
+                                <div class="col-sm-11 hide-on-overflow no-wrap">
+                                    <?php echo $category['name']; ?>
+                                </div>
+                            </div>
                         </li>
                     <?php endforeach; ?>
                 </ul>
diff --git a/css/mods-for-hesk.css b/css/mods-for-hesk.css
index 7e894def..47bb4c3d 100644
--- a/css/mods-for-hesk.css
+++ b/css/mods-for-hesk.css
@@ -342,4 +342,13 @@ div.setupButtons {
 .file-row p.name {
     overflow: hidden;
     text-overflow: ellipsis;
+}
+
+.no-wrap {
+    white-space: nowrap;
+}
+
+.hide-on-overflow {
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
\ No newline at end of file