From dfee8dc5c016a3c1666458823afb3724ed4e7806 Mon Sep 17 00:00:00 2001 From: Sam Georges Date: Mon, 16 Jun 2014 17:59:29 +1000 Subject: [PATCH] When checkbox list has more than 10 items, display it in a scrollable area --- modules/backend/assets/css/october.css | 13 +++++++++++++ .../backend/assets/less/controls/forms.less | 18 +++++++++++++++++- modules/backend/lang/en/lang.php | 5 ++++- .../form/partials/_field_checkboxlist.htm | 19 ++++++++++++++++++- 4 files changed, 52 insertions(+), 3 deletions(-) diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css index e89dcbf7a..e1df0fd00 100644 --- a/modules/backend/assets/css/october.css +++ b/modules/backend/assets/css/october.css @@ -7433,6 +7433,19 @@ label { .field-textarea.size-giant { min-height: 350px; } +.field-checkboxlist-scrollable { + background: white; + border: 1px solid #e2e2e2; + padding-left: 15px; + height: 300px; +} +.field-checkboxlist-scrollable .checkbox { + margin-top: 15px; + margin-bottom: 5px; +} +.field-checkboxlist-scrollable .checkbox ~ .checkbox { + margin-top: 0; +} .form-buttons { padding-bottom: 20px; font-size: 0; diff --git a/modules/backend/assets/less/controls/forms.less b/modules/backend/assets/less/controls/forms.less index d0b8efe8f..7ec04c113 100644 --- a/modules/backend/assets/less/controls/forms.less +++ b/modules/backend/assets/less/controls/forms.less @@ -151,7 +151,7 @@ label { .custom-checkbox, .custom-radio { - label {cursor: default;} + label { cursor: default; } } } @@ -171,6 +171,22 @@ label { &.size-giant { min-height: @size-giant; } } +.field-checkboxlist-scrollable { + background: white; + border: 1px solid @color-list-border; + padding-left: 15px; + height: @size-large + 100; + + // First checkbox + .checkbox { + margin-top: 15px; + margin-bottom: 5px; + } + + // All others + .checkbox ~ .checkbox { margin-top: 0; } +} + .form-buttons { .clearfix(); padding-bottom: 20px; diff --git a/modules/backend/lang/en/lang.php b/modules/backend/lang/en/lang.php index 04bc73dd0..e7a7fe995 100644 --- a/modules/backend/lang/en/lang.php +++ b/modules/backend/lang/en/lang.php @@ -114,7 +114,10 @@ return [ 'or' => 'or', 'confirm_tab_close' => 'Do you really want to close the tab? Unsaved changes will be lost.', 'behavior_not_ready' => 'Form behavior has not been initialized, check that you have called initForm() in your controller.', - 'preview_no_files_message' => 'Files are not uploaded' + 'preview_no_files_message' => 'Files are not uploaded', + 'select' => 'Select', + 'select_all' => 'all', + 'select_none' => 'none', ], 'relation' => [ 'missing_definition' => "Relation behavior does not contain a definition for ':field'.", diff --git a/modules/backend/widgets/form/partials/_field_checkboxlist.htm b/modules/backend/widgets/form/partials/_field_checkboxlist.htm index 5d521473c..719c6f520 100644 --- a/modules/backend/widgets/form/partials/_field_checkboxlist.htm +++ b/modules/backend/widgets/form/partials/_field_checkboxlist.htm @@ -4,6 +4,19 @@ ?> options)): ?> + options) > 10): ?> + + + : + , + + + + +
+
+ + options as $value => $option): ?>
- + options) > 10): ?> +
+
+ +