From f1e97f7112510220c09bc5c757d7e551f6c81e73 Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Fri, 7 Nov 2014 17:16:35 +0000 Subject: [PATCH] Started trying to use Polymer. Not very successfully, none of the icons show up, and I can't figure out why not. --- resources/report/bower.json | 23 ++++++++++ resources/report/css/style.css | 4 +- resources/report/js/script.js | 26 +++-------- resources/report/report.html | 83 ++++++++++++++++++---------------- 4 files changed, 77 insertions(+), 59 deletions(-) create mode 100644 resources/report/bower.json diff --git a/resources/report/bower.json b/resources/report/bower.json new file mode 100644 index 00000000..2cb4daf5 --- /dev/null +++ b/resources/report/bower.json @@ -0,0 +1,23 @@ +{ + "name": "report", + "version": "0.7.0", + "description": "Load order optimisation tool", + "main": "report.html", + "license": "GPL", + "private": true, + "ignore": [ + "**/.*", + "node_modules", + "bower_components", + "test", + "tests" + ], + "dependencies": { + "polymer": "Polymer/polymer#~0.4.2", + "paper-icon-button": "Polymer/paper-icon-button#~0.4.2", + "paper-dropdown-menu": "Polymer/paper-dropdown-menu#~0.4.2", + "core-header-panel": "Polymer/core-header-panel#~0.4.2", + "core-toolbar": "Polymer/core-toolbar#~0.4.2", + "core-icons": "Polymer/core-icons#~0.4.2" + } +} diff --git a/resources/report/css/style.css b/resources/report/css/style.css index 785163b0..cf4d1474 100644 --- a/resources/report/css/style.css +++ b/resources/report/css/style.css @@ -36,14 +36,14 @@ noscript { padding:10px 5px; color:white; } -header { +#mainToolbar { background:#e3e3e3; position:fixed; top:0; left:0; z-index:2; - box-shadow: 0 0 3px 1px rgba(0,0,0,0.5); width:100%; + font-size: 1em; height: 3em; } header > ol { diff --git a/resources/report/js/script.js b/resources/report/js/script.js index 6f2a613a..2690b0ef 100644 --- a/resources/report/js/script.js +++ b/resources/report/js/script.js @@ -37,12 +37,11 @@ var loot = { /* Call whenever game is changed or game menu / game table are rewritten. */ updateSelectedGame: function() { /* Highlight game in menu. Could use fa-chevron-right instead. */ - var gameMenuItems = document.getElementById('gameMenu').children[0].children; + var gameMenuItems = document.getElementById('gameMenu').children; for (var i = 0; i < gameMenuItems.length; ++i) { if (gameMenuItems[i].getAttribute('data-folder') == this.folder) { - gameMenuItems[i].getElementsByClassName('fa')[0].classList.toggle('fa-angle-double-right', true); - } else { - gameMenuItems[i].getElementsByClassName('fa')[0].classList.toggle('fa-angle-double-right', false); + document.getElementById('gameMenu').selected = i; + break; } } @@ -150,7 +149,7 @@ var loot = { /* Call whenever installedGames is changed or game menu is rewritten. */ updateEnabledGames: function() { /* Update the disabled games in the game menu. */ - var gameMenuItems = document.getElementById('gameMenu').firstElementChild.children; + var gameMenuItems = document.getElementById('gameMenu').children; for (var i = 0; i < gameMenuItems.length; ++i) { if (this.installedGames.indexOf(gameMenuItems[i].getAttribute('data-folder')) == -1) { gameMenuItems[i].classList.toggle('disabled', true); @@ -171,7 +170,7 @@ var loot = { /* Call whenever settings are changed. */ updateSettingsUI: function() { var gameSelect = document.getElementById('defaultGameSelect'); - var gameMenu = document.getElementById('gameMenu').firstElementChild; + var gameMenu = document.getElementById('gameMenu'); var gameTable = document.getElementById('gameTable'); /* First make sure game listing elements don't have any existing entries. */ @@ -193,17 +192,9 @@ var loot = { option.textContent = game.name; gameSelect.appendChild(option); - var li = document.createElement('li'); + var li = document.createElement('paper-item'); li.setAttribute('data-folder', game.folder); - - var icon = document.createElement('span'); - icon.className = 'fa fa-fw'; - li.appendChild(icon); - - var text = document.createElement('span'); - text.textContent = game.name; - li.appendChild(text); - + li.setAttribute('label', game.name); gameMenu.appendChild(li); var row = gameTable.addRow(game); @@ -1226,15 +1217,12 @@ function setupEventHandlers() { document.getElementById('hideMessagelessPlugins').addEventListener('click', applyFilters, false); /* Set up handlers for buttons. */ - document.getElementById('fileMenu').addEventListener('click', openMenu, false); document.getElementById('redatePluginsButton').addEventListener('click', redatePlugins, false); document.getElementById('openLogButton').addEventListener('click', openLogLocation, false); document.getElementById('wipeUserlistButton').addEventListener('click', clearAllMetadata, false); document.getElementById('copyContentButton').addEventListener('click', copyContent, false); document.getElementById('refreshContentButton').addEventListener('click', onFocus, false); - document.getElementById('gameMenu').addEventListener('click', openMenu, false); document.getElementById('settingsButton').addEventListener('click', showSettingsDialog, false); - document.getElementById('helpMenu').addEventListener('click', openMenu, false); document.getElementById('helpButton').addEventListener('click', openReadme, false); document.getElementById('aboutButton').addEventListener('click', showAboutDialog, false); document.getElementById('updateMasterlistButton').addEventListener('click', updateMasterlist, false); diff --git a/resources/report/report.html b/resources/report/report.html index b161fa0f..24fe0617 100644 --- a/resources/report/report.html +++ b/resources/report/report.html @@ -4,47 +4,54 @@ LOOT - - - - + + + + + + + + + + + + + + + + + + - -
-
- -
    -
  1. File - -
    2. -
  2. Game - -
    3. -
  3. Settings
    4. -
  4. Help - -
    5. -
-
    -
  1. Update Masterlist
    2. -
  2. Sort
    3. - - -
-
+ + + + + + + + + + + + + + + + + + + + +