From d9fd2c52e80afdb070026be6c2ad4f02e704ec16 Mon Sep 17 00:00:00 2001 From: Marius BALTEANU Date: Sun, 2 Jun 2019 08:32:29 +0000 Subject: [PATCH] Icon classes for toggle select diff --git a/app/views/workflows/edit.html.erb b/app/views/workflows/edit.html.erb index 66d9b71..66eb11a 100644 --- a/app/views/workflows/edit.html.erb +++ b/app/views/workflows/edit.html.erb @@ -16,12 +16,12 @@ - + - + <%= submit_tag l(:button_edit), :name => nil %> @@ -64,9 +64,11 @@ $("a[data-expands]").click(function(e){ e.preventDefault(); var target = $($(this).attr("data-expands")); if (target.attr("multiple")) { + $(event.target).switchClass('icon-toggle-minus', 'icon-toggle-plus'); target.attr("multiple", false); target.find("option[value=all]").show(); } else { + $(event.target).switchClass('icon-toggle-plus', 'icon-toggle-minus'); target.attr("multiple", true); target.find("option[value=all]").attr("selected", false).hide(); } diff --git a/app/views/workflows/permissions.html.erb b/app/views/workflows/permissions.html.erb index 0983bb7..a9af3d2 100644 --- a/app/views/workflows/permissions.html.erb +++ b/app/views/workflows/permissions.html.erb @@ -16,12 +16,12 @@ - + - + <%= submit_tag l(:button_edit), :name => nil %> diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 5dfd260..25dc501 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -121,7 +121,8 @@ function initFilters() { toggleFilter($(this).val()); }); $('#filters-table').on('click', '.toggle-multiselect', function() { - toggleMultiSelect($(this).siblings('select')); + toggleMultiSelect($(this).siblings('select')) + $(this).toggleClass('icon-toggle-plus icon-toggle-minus') }); $('#filters-table').on('keypress', 'input[type=text]', function(e) { if (e.keyCode == 13) $(this).closest('form').submit(); @@ -188,7 +189,7 @@ function buildFilterRow(field, operator, values) { case "list_subprojects": tr.find('td.values').append( '' + - '  ' + '  ' ); select = tr.find('td.values select'); if (values.length > 1) { select.attr('multiple', true); } diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 9c7ebfb..f08ef30 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -531,7 +531,7 @@ fieldset#filters td.values select {min-width:130px;} .add-filter {width:35%; float:right; text-align: right; vertical-align: top;} #issue_is_private_wrap {float:right; margin-right:1em;} -.toggle-multiselect {background: url(../images/bullet_toggle_plus.png) no-repeat 0% 40%; padding-left:16px; margin-left:0; margin-right:5px; cursor:pointer;} +.toggle-multiselect { no-repeat 0% 40%; padding-left:16px; margin-left:0; margin-right:5px; cursor:pointer;} .buttons { font-size: 0.9em; margin-bottom: 1.4em; margin-top: 1em; } div#issue-changesets {float:right; width:45%; margin-left: 1em; margin-bottom: 1em; background: #fff; padding-left: 1em; font-size: 90%;} @@ -1502,6 +1502,8 @@ td.gantt_selected_column .gantt_hdr,.gantt_selected_column_container { .icon-bookmark-off { background-image: url(../images/tag_blue_add.png); } .icon-sorted-asc { background-image: url(../images/arrow_down.png); } .icon-sorted-desc { background-image: url(../images/arrow_up.png); } +.icon-toggle-plus { background: url(../images/bullet_toggle_plus.png) } +.icon-toggle-minus { background: url(../images/bullet_toggle_minus.png) } .icon-file { background-image: url(../images/files/default.png); } .icon-file.text-plain { background-image: url(../images/files/text.png); } -- 2.1.4