From 0a4207258bff1b26896312569ffe3cb9840b3740 Mon Sep 17 00:00:00 2001 From: nathangray Date: Tue, 6 Dec 2016 09:45:55 -0700 Subject: [PATCH] - Fix a bug in print dialog, clicking header was also toggling first checkbox - Missing translations from Stefan Unverricht --- api/js/etemplate/et2_extension_nextmatch.js | 2 +- api/js/etemplate/et2_widget_selectbox.js | 9 ++++++--- api/lang/egw_de.lang | 2 ++ api/lang/egw_en.lang | 2 ++ api/templates/default/nm_print_dialog.xet | 3 ++- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/api/js/etemplate/et2_extension_nextmatch.js b/api/js/etemplate/et2_extension_nextmatch.js index 3819a650bf..ef3335810a 100644 --- a/api/js/etemplate/et2_extension_nextmatch.js +++ b/api/js/etemplate/et2_extension_nextmatch.js @@ -2249,7 +2249,7 @@ var et2_nextmatch = (function(){ "use strict"; return et2_DOMWidget.extend([et2_ // If you use a template, the second parameter will be the value of the template, as if it were submitted. callback: callback, // return false to prevent dialog closing buttons: et2_dialog.BUTTONS_OK_CANCEL, - title: 'Print', + title: this.egw().lang('Print'), template:this.egw().link(base_url+'/api/templates/default/nm_print_dialog.xet'), value: { content: { diff --git a/api/js/etemplate/et2_widget_selectbox.js b/api/js/etemplate/et2_widget_selectbox.js index a520c42166..68a015bcbd 100644 --- a/api/js/etemplate/et2_widget_selectbox.js +++ b/api/js/etemplate/et2_widget_selectbox.js @@ -384,10 +384,13 @@ var et2_selectbox = (function(){ "use strict"; return et2_inputWidget.extend( var header_controls = { check: { icon_class: 'ui-icon-check', - label: 'Check all', + label: this.egw().lang('Check all'), click: function(e) { - var all_set = jQuery("input[type='checkbox']",e.data).prop("checked"); - jQuery("input[type='checkbox']",e.data).prop("checked", !all_set); + var all_off = false; + jQuery("input[type='checkbox']",e.data).each(function() { + if(!jQuery(this).prop("checked")) all_off = true; + }); + jQuery("input[type='checkbox']",e.data).prop("checked", all_off); } } }; diff --git a/api/lang/egw_de.lang b/api/lang/egw_de.lang index 634f119ac1..2abb7f73de 100644 --- a/api/lang/egw_de.lang +++ b/api/lang/egw_de.lang @@ -282,6 +282,7 @@ collection listing common de Auflistung der Collection colombia common de KOLUMBIEN column... common de Spalte... columnname common de Spaltenname +columns to print common de Spalten zum Drucken command ⌘ common de Cmd ⌘ comment common de Kommentar common preferences common de Allgemeine Einstellungen @@ -627,6 +628,7 @@ how many days to sync in the future (default %1) groupdav de Wie viele Tage soll how many days to sync in the past (default %1) groupdav de Wie viele Tage soll in die Vergangenheit gesynced werden (Vorgabe %1) how many entries should the list show common de Wie viele Einträge soll die Liste anzeigen how many icons should be shown in the navbar (top of the page). additional icons go into a kind of pulldown menu, callable by the icon on the far right side of the navbar. common de Wie viele Icons sollen in der Navigation angezeigt werden (die obere Navigation). Weitere Applikationen werden über ein Auswahlmenü angeboten. Das Auswahlmenü kann über das rechte Icon geöffnet werden +how many rows to print common de Zeilen zum Drucken how to show the general egroupware menu ? common de Wie soll das allgemeine EGroupware Menü angezeigt werden? html common de HTML html link to the current record common de HTML-Link zum aktuellen Eintrag. diff --git a/api/lang/egw_en.lang b/api/lang/egw_en.lang index 0b3112ee89..389d06e756 100644 --- a/api/lang/egw_en.lang +++ b/api/lang/egw_en.lang @@ -282,6 +282,7 @@ collection listing common en Collection listing colombia common en COLOMBIA column... common en Column... columnname common en Column name +columns to print common en Columns to print command ⌘ common en Command ⌘ comment common en Comment common preferences common en Common preferences @@ -629,6 +630,7 @@ how many days to sync in the future (default %1) groupdav en How many days to sy how many days to sync in the past (default %1) groupdav en How many days to sync in the past (default %1) how many entries should the list show common en How many entries should the list show how many icons should be shown in the navbar (top of the page). additional icons go into a kind of pulldown menu, callable by the icon on the far right side of the navbar. common en How many icons should be shown in the top navigation bar. Additional icons go into a pull down menu, callable by the icon on the far right side of the navigation bar. +how many rows to print common en How many rows to print how to show the general egroupware menu ? common en How to show the general EGroupware menu html common en HTML html link to the current record common en HTML link to the current record diff --git a/api/templates/default/nm_print_dialog.xet b/api/templates/default/nm_print_dialog.xet index 052e9ef00a..455aaa3119 100644 --- a/api/templates/default/nm_print_dialog.xet +++ b/api/templates/default/nm_print_dialog.xet @@ -4,7 +4,8 @@