loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Combined summary and general messages cards.

Browse Source 
Removed their card item from the sidebar, and added a "Home" icon button
to the top that navigates to their card.

Also added a divider above the content filter to distinguish it from the
tabbed content, and changed the refresh content icon.
This commit is contained in:
Oliver Hamlet
2014-12-26 11:34:20 +00:00
parent 21b877e69c
commit 326b7da03f
5 changed files with 27 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/report/css/style.css
+5 -5
View File
@@ -133,6 +133,9 @@ core-toolbar, div[drawer] > div:first-child {
color: white;
height: 56px;
}
core-toolbar > a {
color: white;
}
#mainToolbar {
box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.26);
z-index: 1;
@@ -140,9 +143,9 @@ core-toolbar, div[drawer] > div:first-child {
#gameMenu {
margin-top: -0.5em;
}
#applySortButton, #cancelSortButton {
#drawerToggle, #applySortButton, #cancelSortButton {
position: relative;
top: -4px;
top: -3px;
}
#applySortButton {
color: #64B5F6;
@@ -157,9 +160,6 @@ div[drawer] {
div[drawer] > * {
border-right: 1px rgba(0, 0, 0, 0.12) solid;
}
#cardsNav {
overflow: auto;
}
paper-item > a {
-webkit-user-drag: none;
color: inherit;
resources/report/js/filters.js
+2 -2
View File
@@ -154,7 +154,7 @@ function setFilteredUIData(evt) {
getConflictingPluginsFromFilter().then(function(conflicts) {
filters.conflicts = conflicts;
var filtered = filters.applyPluginFilters(loot.game.plugins);
document.getElementById('cardsNav').lastElementChild.data = filtered;
document.getElementById('cardsNav').data = filtered;
document.getElementById('main').lastElementChild.data = filtered;
/* Also run message filters on the current card elements. */
@@ -163,4 +163,4 @@ function setFilteredUIData(evt) {
cards[i].onMessagesChange(); // Calls Plugin.getUIMessages(), which calls filters.applyMessageFilters().
}
});
}
}
resources/report/js/l10n.js
+1 -6
View File
@@ -177,8 +177,6 @@
document.getElementById('cancelSortButton').textContent = l10n.translate("Cancel").fetch();
/* Nav items */
document.getElementById('cardsNav').firstElementChild.firstElementChild.textContent = l10n.translate("Summary").fetch();
document.getElementById('cardsNav').firstElementChild.nextElementSibling.firstElementChild.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 or click outside the input to set the filter.").fetch();
@@ -196,7 +194,7 @@
document.getElementById('hiddenMessagesTxt').textContent = l10n.translate("Hidden messages:").fetch();
/* Summary */
document.getElementById('summary').firstElementChild.textContent = l10n.translate("Summary").fetch();
document.getElementById('summary').firstElementChild.textContent = l10n.translate("Summary & General Messages").fetch();
document.getElementById('masterlistRevision').previousElementSibling.textContent = l10n.translate("Masterlist Revision").fetch();
document.getElementById('masterlistDate').previousElementSibling.textContent = l10n.translate("Masterlist Date").fetch();
document.getElementById('totalWarningNo').previousElementSibling.textContent = l10n.translate("Warnings").fetch();
@@ -206,9 +204,6 @@
document.getElementById('dirtyPluginNo').previousElementSibling.textContent = l10n.translate("Dirty Plugins").fetch();
document.getElementById('totalPluginNo').previousElementSibling.textContent = l10n.translate("Total Plugins").fetch();
/* General messages */
document.getElementById('generalMessages').firstElementChild.textContent = l10n.translate("General Messages").fetch();
/* Settings dialog */
document.getElementById('settingsDialog').heading = l10n.translate("Settings").fetch();
resources/report/js/script.js
+7 -7
View File
@@ -237,7 +237,7 @@ var loot = {
});
/* Remove old messages from UI. */
var generalMessagesList = document.getElementById('generalMessages').getElementsByTagName('ul')[0];
var generalMessagesList = document.getElementById('summary').getElementsByTagName('ul')[0];
while (generalMessagesList.firstElementChild) {
generalMessagesList.removeChild(generalMessagesList.firstElementChild);
}
@@ -451,7 +451,7 @@ function changeGame(evt) {
/* Clear the UI of all existing game-specific data. Also
clear the card and li variables for each plugin object. */
var globalMessages = document.getElementById('generalMessages').getElementsByTagName('ul')[0];
var globalMessages = document.getElementById('summary').getElementsByTagName('ul')[0];
while (globalMessages.firstElementChild) {
globalMessages.removeChild(globalMessages.firstElementChild);
}
@@ -465,7 +465,7 @@ function changeGame(evt) {
loot.game.plugins = gameInfo.plugins;
/* Reset virtual list positions. */
document.getElementById('cardsNav').lastElementChild.scrollToItem(0);
document.getElementById('cardsNav').scrollToItem(0);
document.getElementById('main').lastElementChild.scrollToItem(0);
/* Now update virtual lists. */
@@ -711,7 +711,7 @@ function copyContent(evt) {
});
}
} else {
var message = document.getElementById('generalMessagesList').getElementsByTagName('ul')[0].firstElementChild;
var message = document.getElementById('summary').getElementsByTagName('ul')[0].firstElementChild;
if (message) {
messages.push({
type: 'error',
@@ -1097,7 +1097,7 @@ function initVars() {
loot.query('getInitErrors').then(JSON.parse).then(function(result){
if (result) {
var generalMessagesList = document.getElementById('generalMessages').getElementsByTagName('ul')[0];
var generalMessagesList = document.getElementById('summary').getElementsByTagName('ul')[0];
result.forEach(function(message){
var li = document.createElement('li');
@@ -1174,11 +1174,11 @@ function initVars() {
loot.game.masterlist = game.masterlist;
loot.game.globalMessages = game.globalMessages;
loot.game.plugins = game.plugins;
document.getElementById('cardsNav').lastElementChild.data = loot.game.plugins;
document.getElementById('cardsNav').data = loot.game.plugins;
document.getElementById('main').lastElementChild.data = loot.game.plugins;
setTimeout(function() {
document.getElementById('cardsNav').lastElementChild.updateSize();
document.getElementById('cardsNav').updateSize();
closeProgressDialog();
}, 100);
resources/report/report.html
+12 -21
View File
@@ -51,22 +51,14 @@
</div>
<div flex layout vertical>
<core-animated-pages selected="cardsNav" valueattr="id" transitions="" flex>
<nav id="cardsNav" class="tab-content" layout vertical>
<paper-item>
<a href="#summary">Summary</a>
</paper-item>
<paper-item>
<a href="#generalMessages">General Messages</a>
</paper-item>
<core-list flex>
<template>
<loot-plugin-item data-id="{{model.id}}" data-bsa?="{{model.loadsBSA}}" data="{{model}}" data-index="{{index}}">
{{model.name}}
</loot-plugin-item>
</template>
<!-- Generated <loot-plugin-item> elements go here. -->
</core-list>
</nav>
<core-list id="cardsNav" class="tab-content" flex>
<template>
<loot-plugin-item data-id="{{model.id}}" data-bsa?="{{model.loadsBSA}}" data="{{model}}" data-index="{{index}}">
{{model.name}}
</loot-plugin-item>
</template>
<!-- Generated <loot-plugin-item> elements go here. -->
</core-list>
<div id="filters" class="tab-content" flex>
<paper-checkbox id="hideVersionNumbers" data-class="version" label="Hide version numbers"></paper-checkbox>
<paper-checkbox id="hideCRCs" data-class="crc" label="Hide CRCs"></paper-checkbox>
@@ -86,6 +78,7 @@
</div>
</div>
</core-animated-pages>
<div class="divider"></div>
<core-tooltip label="Press Enter or click outside the input to set the filter." position="top" noarrow>
<paper-input id="searchBox" label="Filter content..."></paper-input>
</core-tooltip>
@@ -94,6 +87,7 @@
<div main layout vertical>
<core-toolbar id="mainToolbar">
<paper-icon-button icon="menu" id="drawerToggle" core-drawer-toggle></paper-icon-button>
<a href="#summary"><paper-icon-button icon="home"></paper-icon-button></a>
<loot-dropdown-menu id="gameMenu" class="title dark">
<!-- Generated game <li> elements go here. -->
</loot-dropdown-menu>
@@ -123,7 +117,7 @@
Copy Content
</paper-item>
<paper-item id="refreshContentButton" noink>
<core-icon icon="cached"></core-icon>
<core-icon icon="refresh"></core-icon>
Refresh Content
</paper-item>
<div class="divider"></div>
@@ -155,7 +149,7 @@
</core-toolbar>
<div id="main" flex layout vertical>
<section id="summary">
<h1>Summary</h1>
<h1>Summary &amp; General Messages</h1>
<table>
<tbody>
<tr>
@@ -200,9 +194,6 @@
</tr>
</tbody>
</table>
</section>
<section id="generalMessages">
<h1>General Messages</h1>
<ul>
<!-- Generated message <li> elements go here. -->
</ul>