Netsyms/Mods-for-HESK-Netsyms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#379 Tweak calendar catgory display to prevent overflow issues

Browse Source
This commit is contained in:
Mike Koch 2016-05-29 01:13:24 -04:00
parent f8f9372ccb
commit 0fdc62734c
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
admin/calendar.php
View File

@ -65,7 +65,7 @@ while ($row = hesk_dbFetchAssoc($rs)) {
continue; 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; $categories[] = $row;
} }
@ -93,9 +93,12 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
<div class="checkbox"> <div class="checkbox">
<input type="checkbox" data-select-target="category-toggle" name="category-toggle" value="<?php echo $category['id']; ?>" checked> <input type="checkbox" data-select-target="category-toggle" name="category-toggle" value="<?php echo $category['id']; ?>" checked>
</div> </div>
<span class="label background-volatile category-label" style="<?php echo $category['css_style']; ?>"> <div class="row">
<?php echo $category['name']; ?> <div class="col-sm-1" style="<?php echo $category['css_style']; ?>">&nbsp;</div>
</span> <div class="col-sm-11 hide-on-overflow no-wrap">
<?php echo $category['name']; ?>
</div>
</div>
</li> </li>
<?php endforeach; ?> <?php endforeach; ?>
</ul> </ul>

11
calendar.php
View File

@ -58,7 +58,7 @@ $categorySql = "SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "c
$categoryRs = hesk_dbQuery($categorySql); $categoryRs = hesk_dbQuery($categorySql);
while ($row = hesk_dbFetchAssoc($categoryRs)) 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; $categories[] = $row;
} }
@ -82,9 +82,12 @@ require_once(HESK_PATH . 'inc/header.inc.php');
<div class="checkbox"> <div class="checkbox">
<input type="checkbox" data-select-target="category-toggle" name="category-toggle" value="<?php echo $category['id']; ?>" checked> <input type="checkbox" data-select-target="category-toggle" name="category-toggle" value="<?php echo $category['id']; ?>" checked>
</div> </div>
<span class="label background-volatile category-label" style="<?php echo $category['css_style']; ?>"> <div class="row">
<?php echo $category['name']; ?> <div class="col-sm-1" style="<?php echo $category['css_style']; ?>">&nbsp;</div>
</span> <div class="col-sm-11 hide-on-overflow no-wrap">
<?php echo $category['name']; ?>
</div>
</div>
</li> </li>
<?php endforeach; ?> <?php endforeach; ?>
</ul> </ul>

9
css/mods-for-hesk.css
View File

@ -342,4 +342,13 @@ div.setupButtons {
.file-row p.name { .file-row p.name {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
}
.no-wrap {
white-space: nowrap;
}
.hide-on-overflow {
overflow: hidden;
text-overflow: ellipsis;
} }