From 21f8bbba668896515ae540e1c212cd981aa6268d Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 8 Feb 2016 14:14:41 -0500 Subject: [PATCH 01/11] update item editor --- .../metadataeditor/metadataeditor.js | 26 ++++++++++--------- .../metadataeditor.template.html | 5 ++-- dashboard-ui/scripts/librarybrowser.js | 8 +++--- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/dashboard-ui/components/metadataeditor/metadataeditor.js b/dashboard-ui/components/metadataeditor/metadataeditor.js index 9329a2df9f..c661b036f3 100644 --- a/dashboard-ui/components/metadataeditor/metadataeditor.js +++ b/dashboard-ui/components/metadataeditor/metadataeditor.js @@ -757,34 +757,36 @@ var lastType = ''; var html = ''; - var elem = $('#peopleList', context); + var elem = context.querySelector('#peopleList'); for (var i = 0, length = people.length; i < length; i++) { var person = people[i]; - var type = person.Type || Globalize.translate('PersonTypePerson'); + html += ''; - if (type != lastType) { - html += '
  • ' + type + '
  • '; - lastType = type; - } + html += ''; - html += '
  • '; + html += ''; + html += ''; - html += '

    ' + (person.Name || '') + '

    '; + html += '
    '; + html += (person.Name || ''); + html += '
    '; if (person.Role && person.Role != lastType) { - html += '

    ' + (person.Role) + '

    '; + html += '
    ' + (person.Role) + '
    '; } + html += '
    '; + html += ''; - html += '' + Globalize.translate('Delete') + ''; + html += ''; - html += '
  • '; + html += '
    '; } - //elem.html(html); + elem.innerHTML = html; $('.btnDeletePerson', elem).on('click', function () { diff --git a/dashboard-ui/components/metadataeditor/metadataeditor.template.html b/dashboard-ui/components/metadataeditor/metadataeditor.template.html index 073feaa129..55cc0c02f0 100644 --- a/dashboard-ui/components/metadataeditor/metadataeditor.template.html +++ b/dashboard-ui/components/metadataeditor/metadataeditor.template.html @@ -1,5 +1,5 @@ 
    - +
    ${ButtonEdit}
    @@ -236,8 +236,7 @@ ${ButtonAdd} -
    -
      +
      From 41e82fa02db90e735a226b1a2cbac49558210809 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 8 Feb 2016 15:05:55 -0500 Subject: [PATCH 04/11] update people editor --- dashboard-ui/components/metadataeditor/personeditor.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dashboard-ui/components/metadataeditor/personeditor.js b/dashboard-ui/components/metadataeditor/personeditor.js index 293723f625..e33e75673c 100644 --- a/dashboard-ui/components/metadataeditor/personeditor.js +++ b/dashboard-ui/components/metadataeditor/personeditor.js @@ -43,6 +43,11 @@ } }); + dlg.querySelector('.btnCancel').addEventListener('click', function (e) { + + paperDialogHelper.close(dlg); + }); + dlg.querySelector('form').addEventListener('submit', function (e) { submitted = true; From eb5228218b51a0e07b7e890251899a5b38f9b719 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 8 Feb 2016 15:10:25 -0500 Subject: [PATCH 05/11] switch to paper text area --- dashboard-ui/components/metadataeditor/metadataeditor.js | 2 +- .../components/metadataeditor/metadataeditor.template.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dashboard-ui/components/metadataeditor/metadataeditor.js b/dashboard-ui/components/metadataeditor/metadataeditor.js index 1d504fdea5..68412a961c 100644 --- a/dashboard-ui/components/metadataeditor/metadataeditor.js +++ b/dashboard-ui/components/metadataeditor/metadataeditor.js @@ -1,4 +1,4 @@ -define(['paperdialoghelper', 'paper-checkbox', 'paper-dialog', 'paper-input', 'paper-item-body', 'paper-icon-item'], function (paperDialogHelper) { +define(['paperdialoghelper', 'paper-checkbox', 'paper-dialog', 'paper-input', 'paper-item-body', 'paper-icon-item', 'paper-textarea'], function (paperDialogHelper) { var currentDialog; var metadataEditorInfo; diff --git a/dashboard-ui/components/metadataeditor/metadataeditor.template.html b/dashboard-ui/components/metadataeditor/metadataeditor.template.html index 5a37a51c1e..c059dd5461 100644 --- a/dashboard-ui/components/metadataeditor/metadataeditor.template.html +++ b/dashboard-ui/components/metadataeditor/metadataeditor.template.html @@ -74,7 +74,7 @@
      - +