From b3f1457eb4aea64e89be4e03d90eec8e47b6fcf8 Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Thu, 13 Nov 2014 01:08:29 +0000 Subject: [PATCH] Updated for Polymer 0.5.1. Which removed the label and icon attributes from paper-item elements. --- resources/report/css/style.css | 6 ++- resources/report/html/loot-plugin-card.html | 15 ++++-- resources/report/html/loot-plugin-item.html | 60 ++++++--------------- resources/report/js/l10n.js | 28 +++++----- resources/report/js/plugin.js | 3 +- resources/report/js/script.js | 6 +-- resources/report/report.html | 50 ++++++++++++----- 7 files changed, 87 insertions(+), 81 deletions(-) diff --git a/resources/report/css/style.css b/resources/report/css/style.css index 80d83e8f..74ef7b40 100644 --- a/resources/report/css/style.css +++ b/resources/report/css/style.css @@ -63,7 +63,11 @@ div[drawer] > core-tooltip { overflow: auto; } #cardsNav > paper-item, #cardsNav > loot-plugin-item { - height: 2em; + /*height: 2em;*/ +} +paper-item > a { + text-decoration: none; + color: black; } #container { position: fixed; diff --git a/resources/report/html/loot-plugin-card.html b/resources/report/html/loot-plugin-card.html index 2ff52c67..9f008cd5 100644 --- a/resources/report/html/loot-plugin-card.html +++ b/resources/report/html/loot-plugin-card.html @@ -206,9 +206,18 @@ loot-clear-metadata - - - + + + Edit Metadata + + + + Copy Metadata As Text + + + + Clear User Metadata + diff --git a/resources/report/html/loot-plugin-item.html b/resources/report/html/loot-plugin-item.html index 5a0f4258..c537b9c3 100644 --- a/resources/report/html/loot-plugin-item.html +++ b/resources/report/html/loot-plugin-item.html @@ -4,7 +4,7 @@ - + diff --git a/resources/report/js/l10n.js b/resources/report/js/l10n.js index 0aef32f1..0da9cf20 100644 --- a/resources/report/js/l10n.js +++ b/resources/report/js/l10n.js @@ -120,9 +120,9 @@ pluginCard.getElementById('cancel').textContent = l10n.translate("Cancel").fetch(); pluginCard.getElementById('showOnlyConflicts').label = l10n.translate("Show Only Conflicts").fetch(); - pluginCard.getElementById('editMetadata').label = l10n.translate("Edit Metadata").fetch(); - pluginCard.getElementById('copyMetadata').label = l10n.translate("Copy Metadata As Text").fetch(); - pluginCard.getElementById('clearMetadata').label = l10n.translate("Clear User Metadata").fetch(); + pluginCard.getElementById('editMetadata').lastChild.textContent = l10n.translate("Edit Metadata").fetch(); + pluginCard.getElementById('copyMetadata').lastChild.textContent = l10n.translate("Copy Metadata As Text").fetch(); + pluginCard.getElementById('clearMetadata').lastChild.textContent = l10n.translate("Clear User Metadata").fetch(); /* Plugin List Item Template */ var pluginItem = document.querySelector('link[rel="import"][href$="loot-plugin-item.html"]'); @@ -158,20 +158,20 @@ tagRow.querySelector('.type').children[1].textContent = l10n.translate("Remove").fetch(); /* Toolbar menu */ - document.getElementById('redatePluginsButton').label = l10n.translate("Redate Plugins").fetch(); - document.getElementById('openLogButton').label = l10n.translate("Open Debug Log Location").fetch(); - document.getElementById('wipeUserlistButton').label = l10n.translate("Clear All User Metadata").fetch(); - document.getElementById('copyContentButton').label = l10n.translate("Copy Content As Text").fetch(); - document.getElementById('refreshContentButton').label = l10n.translate("Refresh Content").fetch(); - document.getElementById('helpButton').label = l10n.translate("View Documentation").fetch(); - document.getElementById('aboutButton').label = l10n.translate("About").fetch(); - document.getElementById('settingsButton').label = l10n.translate("Settings").fetch(); + document.getElementById('redatePluginsButton').lastChild.textContent = l10n.translate("Redate Plugins").fetch(); + document.getElementById('openLogButton').lastChild.textContent = l10n.translate("Open Debug Log Location").fetch(); + document.getElementById('wipeUserlistButton').lastChild.textContent = l10n.translate("Clear All User Metadata").fetch(); + document.getElementById('copyContentButton').lastChild.textContent = l10n.translate("Copy Content As Text").fetch(); + document.getElementById('refreshContentButton').lastChild.textContent = l10n.translate("Refresh Content").fetch(); + document.getElementById('helpButton').lastChild.textContent = l10n.translate("View Documentation").fetch(); + document.getElementById('aboutButton').lastChild.textContent = l10n.translate("About").fetch(); + document.getElementById('settingsButton').lastChild.textContent = l10n.translate("Settings").fetch(); document.getElementById('applySortButton').textContent = l10n.translate("Apply").fetch(); document.getElementById('cancelSortButton').textContent = l10n.translate("Cancel").fetch(); /* Nav items */ - document.getElementById('container').querySelector('div[drawer] > core-menu > paper-item[label=Summary]').label = l10n.translate("Summary").fetch(); - document.getElementById('container').querySelector('div[drawer] > core-menu > paper-item[label^=General]').label = l10n.translate("General Messages").fetch(); + document.getElementById('container').querySelector('div[drawer] > core-menu > paper-item[label=Summary]').lastChild.textContent = l10n.translate("Summary").fetch(); + document.getElementById('container').querySelector('div[drawer] > core-menu > paper-item[label^=General]').lastChild.textContent = l10n.translate("General Messages").fetch(); document.getElementById('sidebarTabs').firstElementChild.textContent = l10n.translate("Plugins").fetch(); document.getElementById('sidebarTabs').firstElementChild.nextElementSibling.textContent = l10n.translate("Filters").fetch(); document.getElementById('searchBox').parentElement.label = l10n.translate("Press Enter when searching to select the next match.").fetch(); @@ -206,7 +206,7 @@ document.getElementById('settingsDialog').heading = l10n.translate("Settings").fetch(); document.getElementById('defaultGameSelect').previousElementSibling.textContent = l10n.translate("Default Game").fetch(); - document.getElementById('defaultGameSelect').firstElementChild.label = l10n.translate("Autodetect").fetch(); + document.getElementById('defaultGameSelect').firstElementChild.textContent = l10n.translate("Autodetect").fetch(); document.getElementById('languageSelect').previousElementSibling.textContent = l10n.translate("Language").fetch(); diff --git a/resources/report/js/plugin.js b/resources/report/js/plugin.js index dcb391bd..2c57d175 100644 --- a/resources/report/js/plugin.js +++ b/resources/report/js/plugin.js @@ -161,8 +161,7 @@ function Plugin(obj) { Plugin.prototype.createListItem = function() { this.li = document.createElement('loot-plugin-item'); - this.li.label = this.name; - this.li.setLink('#' + this.id); + this.li.setLink(this.id, this.name); this.li.setPriority(this.getPriorityString()); this.li.setAttribute('data-dummy', this.isDummy); diff --git a/resources/report/js/script.js b/resources/report/js/script.js index 76c4ef0c..b564dbb7 100644 --- a/resources/report/js/script.js +++ b/resources/report/js/script.js @@ -174,7 +174,7 @@ var loot = { this.settings.games.forEach(function(game){ var menuItem = document.createElement('paper-item'); menuItem.setAttribute('value', game.folder); - menuItem.setAttribute('label', game.name); + menuItem.textContent = game.name; gameMenu.appendChild(menuItem); gameSelect.appendChild(menuItem.cloneNode()); @@ -656,7 +656,7 @@ function sortUIElements(pluginNames) { /* Also need to move plugin sidebar entry. */ var li; for (var i = 0; i < entries.length; ++i) { - if (entries[i].label == name) { + if (entries[i].getName() == name) { li = entries[i]; } } @@ -1251,7 +1251,7 @@ function initVars() { for (var i = 0; i < loot.languages.length; ++i) { var settingsItem = document.createElement('paper-item'); settingsItem.setAttribute('value', loot.languages[i].locale); - settingsItem.setAttribute('label', loot.languages[i].name); + settingsItem.textContent = loot.languages[i].name; settingsLangSelect.appendChild(settingsItem); var option = document.createElement('option'); diff --git a/resources/report/report.html b/resources/report/report.html index 830db5a2..302ac78d 100644 --- a/resources/report/report.html +++ b/resources/report/report.html @@ -44,16 +44,40 @@ - - - - + + + Redate Plugins + + + + Clear All User Metadata + + + + Copy Content As Text + + + + Refresh Content + - + + + Settings + - - - + + + View Documentation + + + + Open Debug Log Location + + + + About + @@ -77,11 +101,11 @@ Filters - - + + Summary - - + + General Messages @@ -191,7 +215,7 @@ along with LOOT. If not, see <http://www.gnu.org/licenses/>.
Default Game
- + Autodetect