Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix some labels in import/export dialogs not pointing to inputs/selects

Browse source
This commit is contained in:
Aleksander Machniak 2019-02-21 11:22:31 +00:00
parent 7288bac122
commit f5c586cf7b
3 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plugins/calendar/lib/calendar_ui.php
View file

@ -513,6 +513,7 @@ class calendar_ui
} }
$input = new html_inputfield(array( $input = new html_inputfield(array(
'id' => 'importfile',
'type' => 'file', 'type' => 'file',
'name' => '_data', 'name' => '_data',
'size' => $attrib['uploadfieldsize'], 'size' => $attrib['uploadfieldsize'],
@ -533,7 +534,7 @@ class calendar_ui
$html = html::div('form-section form-group row', $html = html::div('form-section form-group row',
html::label(array('class' => 'col-sm-4 col-form-label', 'for' => 'importfile'), rcube::Q($this->rc->gettext('importfromfile'))) html::label(array('class' => 'col-sm-4 col-form-label', 'for' => 'importfile'), rcube::Q($this->rc->gettext('importfromfile')))
. html::div('col-sm-8', $input->show() . html::div('col-sm-8', $input->show()
. html::div('hint', $this->rc->gettext(array('id' => 'importfile', 'name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize))))) . html::div('hint', $this->rc->gettext(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize)))))
); );
$html .= html::div('form-section form-group row', $html .= html::div('form-section form-group row',

24
plugins/tasklist/tasklist.js
View file

@ -862,6 +862,16 @@ function rcube_tasklist_ui(settings)
loadstate.lists = active_lists(); loadstate.lists = active_lists();
} }
var init_cloned_form = function(form) {
// update element IDs after clone
$('select,input,label', form).each(function() {
if (this.htmlFor)
this.htmlFor += '-clone';
else if (this.id)
this.id += '-clone';
});
}
// open a dialog to upload an .ics file with tasks to be imported // open a dialog to upload an .ics file with tasks to be imported
this.import_tasks = function(tasklist) this.import_tasks = function(tasklist)
{ {
@ -876,6 +886,8 @@ function rcube_tasklist_ui(settings)
if (tasklist) if (tasklist)
$('#task-import-list').val(tasklist); $('#task-import-list').val(tasklist);
init_cloned_form(form);
buttons[rcmail.gettext('import', 'tasklist')] = function() { buttons[rcmail.gettext('import', 'tasklist')] = function() {
if (form && form.elements._data.value) { if (form && form.elements._data.value) {
rcmail.async_upload_form(form, 'import', function(e) { rcmail.async_upload_form(form, 'import', function(e) {
@ -939,22 +951,22 @@ function rcube_tasklist_ui(settings)
this.export_tasks = function() this.export_tasks = function()
{ {
// close show dialog first // close show dialog first
var $dialog = $("#tasksexport").clone(true).removeClass('uidialog'), var list, $dialog = $("#tasksexport").clone(true).removeClass('uidialog'),
form = $dialog.find('form').get(0), form = $dialog.find('form').get(0),
buttons = {}; buttons = {};
if ($dialog.is(':ui-dialog')) if ($dialog.is(':ui-dialog'))
$dialog.dialog('close'); $dialog.dialog('close');
$("#task-export-list").val(''); list = $("#task-export-list").val('');
init_cloned_form(form);
buttons[rcmail.gettext('export', 'tasklist')] = function() { buttons[rcmail.gettext('export', 'tasklist')] = function() {
var data = {}, var data = {}, form_elements = $('select, input', form);
source = $('#task-export-list').val(),
form_elements = $('select, input', form);
// "current view" export, use hidden form to POST task IDs // "current view" export, use hidden form to POST task IDs
if (source === '') { if (list.val() === '') {
var cache = {}, tasks = [], inputs = [], var cache = {}, tasks = [], inputs = [],
postform = $('#tasks-export-form-post'); postform = $('#tasks-export-form-post');

3
plugins/tasklist/tasklist_ui.php
View file

@ -500,6 +500,7 @@ class tasklist_ui
} }
$input = new html_inputfield(array( $input = new html_inputfield(array(
'id' => 'importfile',
'type' => 'file', 'type' => 'file',
'name' => '_data', 'name' => '_data',
'size' => $attrib['uploadfieldsize'], 'size' => $attrib['uploadfieldsize'],
@ -509,7 +510,7 @@ class tasklist_ui
$html = html::div('form-section form-group row', $html = html::div('form-section form-group row',
html::label(array('class' => 'col-sm-4 col-form-label', 'for' => 'importfile'), rcube::Q($this->rc->gettext('importfromfile'))) html::label(array('class' => 'col-sm-4 col-form-label', 'for' => 'importfile'), rcube::Q($this->rc->gettext('importfromfile')))
. html::div('col-sm-8', $input->show() . html::div('col-sm-8', $input->show()
. html::div('hint', $this->rc->gettext(array('id' => 'importfile', 'name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize))))) . html::div('hint', $this->rc->gettext(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize)))))
); );
$html .= html::div('form-section form-group row', $html .= html::div('form-section form-group row',