diff --git a/module/holiday/css/browse.css b/module/holiday/css/browse.css index 0a8cf7038e..9ee7e73529 100644 --- a/module/holiday/css/browse.css +++ b/module/holiday/css/browse.css @@ -7,3 +7,5 @@ .table-import {padding: 6px 5px 5px 5px; } .shadow-sm {box-shadow: 0 1px 1px rgb(0 0 0 / 5%), 0 2px 6px 0 rgb(0 0 0 / 25%)} .flex-center {display: flex; align-items: center; justify-content: center;} +.c-desc {width: 280px;} +p.c-desc {white-space: nowrap; margin-bottom: 0; text-overflow: clip; overflow: hidden;} diff --git a/module/holiday/css/index.html b/module/holiday/css/index.html deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/holiday/lang/index.html b/module/holiday/lang/index.html deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/module/holiday/view/browse.html.php b/module/holiday/view/browse.html.php index 1df026702b..55d203d8d4 100644 --- a/module/holiday/view/browse.html.php +++ b/module/holiday/view/browse.html.php @@ -41,7 +41,7 @@ holiday->name;?> holiday->holiday;?> holiday->type;?> - holiday->desc;?> + holiday->desc;?> actions;?> @@ -51,7 +51,7 @@ name;?> begin, DT_DATE1) . ' ~ ' . formatTime($holiday->end, DT_DATE1);?> holiday->typeList, $holiday->type);?> - desc;?> +

desc;?>

id", $holiday, 'list', '', '', 'iframe', 'yes');?> id", $holiday, 'list', '', 'hiddenwin');?> diff --git a/module/holiday/view/index.html b/module/holiday/view/index.html deleted file mode 100644 index e69de29bb2..0000000000