From 91d46243bb711ff7fc0bcf4da95b7f63872e5c87 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bernd=20Ble=C3=9Fmann?= Date: Fri, 9 Dec 2016 21:15:22 +0100 Subject: [PATCH] Auftrags-Controller: Icons f. Detailanzeige mit svg MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Damit kann man besser treffen. Ausserdem waren die +/- -Icons mehrdeutig (hinzufügen/entfernen). --- css/kivitendo/main.css | 7 +++++++ css/lx-office-erp/main.css | 6 ++++++ image/collapse.svg | 4 ++++ image/expand.svg | 4 ++++ js/kivi.Order.js | 8 ++++---- templates/webpages/order/tabs/_row.html | 4 ++-- templates/webpages/order/tabs/basic_data.html | 4 ++-- 7 files changed, 29 insertions(+), 8 deletions(-) create mode 100644 image/collapse.svg create mode 100644 image/expand.svg diff --git a/css/kivitendo/main.css b/css/kivitendo/main.css index 26446b173..df43f05e7 100644 --- a/css/kivitendo/main.css +++ b/css/kivitendo/main.css @@ -510,3 +510,10 @@ span.toggle_selected { .customer_dunning_level { font-weight: bold; } + +#expand_all, .expand { + cursor: pointer; + display: block; + max-width: 16px; + max-height: 16px; +} diff --git a/css/lx-office-erp/main.css b/css/lx-office-erp/main.css index b306e1ea8..90b5be576 100644 --- a/css/lx-office-erp/main.css +++ b/css/lx-office-erp/main.css @@ -518,3 +518,9 @@ a.red { border:none; } +#expand_all, .expand { + cursor: pointer; + display: block; + max-width: 16px; + max-height: 16px; +} diff --git a/image/collapse.svg b/image/collapse.svg new file mode 100644 index 000000000..340b0e68f --- /dev/null +++ b/image/collapse.svg @@ -0,0 +1,4 @@ + + + diff --git a/image/expand.svg b/image/expand.svg new file mode 100644 index 000000000..efbd11b4a --- /dev/null +++ b/image/expand.svg @@ -0,0 +1,4 @@ + + + diff --git a/js/kivi.Order.js b/js/kivi.Order.js index ef16ddce4..5d891d56e 100644 --- a/js/kivi.Order.js +++ b/js/kivi.Order.js @@ -221,7 +221,7 @@ namespace('kivi.Order', function(ns) { $(row).children().not(':first').hide(); $(row).data('expanded', 0); var elt = $(row).find('.expand'); - elt.attr('src', "image/expand3.gif"); + elt.attr('src', "image/expand.svg"); elt.attr('alt', kivi.t8('Show details')); elt.attr('title', kivi.t8('Show details')); }; @@ -230,7 +230,7 @@ namespace('kivi.Order', function(ns) { $(row).children().not(':first').show(); $(row).data('expanded', 1); var elt = $(row).find('.expand'); - elt.attr('src', "image/collapse3.gif"); + elt.attr('src', "image/collapse.svg"); elt.attr('alt', kivi.t8('Hide details')); elt.attr('title', kivi.t8('Hide details')); }; @@ -550,7 +550,7 @@ $(function(){ event.preventDefault(); if ($('#expand_all').data('expanded') == 1) { $('#expand_all').data('expanded', 0); - $('#expand_all').attr('src', 'image/expand3.gif'); + $('#expand_all').attr('src', 'image/expand.svg'); $('#expand_all').attr('alt', kivi.t8('Show all details')); $('#expand_all').attr('title', kivi.t8('Show all details')); $('.row_entry').each(function(idx, elt) { @@ -558,7 +558,7 @@ $(function(){ }); } else { $('#expand_all').data('expanded', 1); - $('#expand_all').attr('src', "image/collapse3.gif"); + $('#expand_all').attr('src', "image/collapse.svg"); $('#expand_all').attr('alt', kivi.t8('Hide all details')); $('#expand_all').attr('title', kivi.t8('Hide all details')); kivi.Order.load_all_second_rows(); diff --git a/templates/webpages/order/tabs/_row.html b/templates/webpages/order/tabs/_row.html index a681dedb1..89889c69e 100644 --- a/templates/webpages/order/tabs/_row.html +++ b/templates/webpages/order/tabs/_row.html @@ -7,10 +7,10 @@ [%- IF MYCONFIG.show_form_details %] - [% L.img_tag(src="image/collapse3.gif", + [% L.img_tag(src="image/collapse.svg", alt=LxERP.t8('Hide details'), title=LxERP.t8('Hide details'), class="expand") %] [%- ELSE %] - [% L.img_tag(src="image/expand3.gif", + [% L.img_tag(src="image/expand.svg", alt=LxERP.t8('Show details'), title=LxERP.t8('Show details'), class="expand") %] [%- END %] [% L.hidden_tag("orderitem_ids[+]", ID) %] diff --git a/templates/webpages/order/tabs/basic_data.html b/templates/webpages/order/tabs/basic_data.html index 46578ad9c..1a055379c 100644 --- a/templates/webpages/order/tabs/basic_data.html +++ b/templates/webpages/order/tabs/basic_data.html @@ -157,9 +157,9 @@ [%- IF MYCONFIG.show_form_details %] - [%- L.img_tag(src="image/collapse3.gif", alt=LxERP.t8('Hide all details'), title=LxERP.t8('Hide all details'), id='expand_all', "data-expanded"="1") %] + [%- L.img_tag(src="image/collapse.svg", alt=LxERP.t8('Hide all details'), title=LxERP.t8('Hide all details'), id='expand_all', "data-expanded"="1") %] [%- ELSE %] - [%- L.img_tag(src="image/expand3.gif", alt=LxERP.t8('Show all details'), title=LxERP.t8('Show all details'), id='expand_all') %] + [%- L.img_tag(src="image/expand.svg", alt=LxERP.t8('Show all details'), title=LxERP.t8('Show all details'), id='expand_all') %] [%- END %] [%- 'position' | $T8 %] -- 2.20.1