From 9fe358d4c6382b5e4b9fb3f4bc02706104660a59 Mon Sep 17 00:00:00 2001
From: WrinklyNinja <wrinklyninja1@gmail.com>
Date: Wed, 21 May 2014 13:45:51 +0100
Subject: [PATCH] Adjusted editor controls layout.

Still pretty rough. Conflict filter has been moved into the filters
panel, and been given a text box to specify the plugin to filter for.
---
 resources/report/css/style.css | 26 +++++++++++++++++++-------
 resources/report/report.html   | 18 +++++++++---------
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/resources/report/css/style.css b/resources/report/css/style.css
index e433bd57..b49e4811 100644
--- a/resources/report/css/style.css
+++ b/resources/report/css/style.css
@@ -195,7 +195,7 @@ section[data-active].flip .editor  {
     display:block;
 }
 
-section[data-active] .buttons {
+section[data-active] .icons {
     background: transparent;
     margin: 0;
     padding: 0;
@@ -205,15 +205,15 @@ section[data-active] .buttons {
     right: 0.5em;
     overflow:visible;
 }
-section .buttons > li:not(:last-child) {
-    opacity: 0.5;
+.icons .fa {
+    color: grey;
     text-align: center;
     display: inline-block;
     margin: 0.2em;
     cursor: pointer;
 }
-section .buttons  > li:hover {
-    opacity: 1;
+.icons  > li:hover {
+    color: black;
 }
 .pluginMenu {
     width: 1.5em;
@@ -227,7 +227,7 @@ section .buttons  > li:hover {
     list-style-type: none;
     position: absolute;
     right: 0.5em;
-    width: 13em;
+    width: 14em;
     z-index: 2;
     text-align: left;
     opacity: 1;
@@ -436,7 +436,7 @@ td input {
     background: #f8f8f8;
 }
 .tableTabs .editable {
-    margin: 0 1em 3em 0;
+    margin: 0;
     border-collapse: collapse;
     border: 1px black solid;
     width: 100%;
@@ -461,4 +461,16 @@ header.editMode #headerOverlay {
     position: absolute;
     top: 0;
     left: 0;
+}
+.editor .buttons {
+    text-align: right;
+}
+.conflictsPlugin {
+    margin-left: 2.5em;
+}
+.editorEnableEdits {
+    margin-bottom: 1em;
+}
+label[for=editorPriorityValue] {
+    margin-left: 0.5em;
 }
\ No newline at end of file
diff --git a/resources/report/report.html b/resources/report/report.html
index c8ae16c1..e770aeaa 100644
--- a/resources/report/report.html
+++ b/resources/report/report.html
@@ -84,7 +84,7 @@
                 <ul>
 
                 </ul>
-                <ol class="buttons">
+                <ol class="icons">
                     <li class="dummyPlugin fa fa-eye-slash hidden" title="Dummy Plugin">
                     <li class="loadsBSA fa fa-paperclip hidden" title="Loads BSA">
                     <li class="hasUserEdits fa fa-user hidden" title="Has User Metadata">
@@ -105,11 +105,11 @@
             <div class="crc"></div>
             <div class="version"></div>
             <input type="checkbox" class="editorEnableEdits">
-            <label for="editorEnableEdits">Enable Edits</label>
-            <label for="editorPriorityValue">Priority</label>
-            <input type="number" max="999999" min="-999999" step="1">
-            <label for="editorGlobalPriority">Compare priority against all other plugins</label>
+            <label for="editorEnableEdits">Enable Edits</label><br>
             <input type="checkbox" class="editorGlobalPriority">
+            <label for="editorGlobalPriority" title="Global priorities are compared against all other plugins. Normal priorities are compared against only conflicting plugins.">Global Priority</label><br>
+            <label for="editorPriorityValue">Priority Value:</label>
+            <input type="number" max="999999" min="-999999" step="1">
             <div class="tableTabs">
                 <span class="selected" data-for="loadAfter">Load After</span><span data-for="req">Requirements</span><span data-for="inc">Incompatibilities</span><span data-for="message">Messages</span><span data-for="tags">Bash Tags</span><span data-for="dirty">Dirty Info</span>
                 <table class="editable loadAfter">
@@ -149,10 +149,7 @@
                         <!-- Dirty info rows go here. -->
                 </table>
             </div>
-            <label for="editorShowOnlyConflicts">Show Only Conflicts</label>
-            <input type="checkbox" class="editorShowOnlyConflicts">
-            <label for="editorSimpleView">Simple View</label>
-            <input type="checkbox" class="editorSimpleView">
+            <hr>
             <div class="buttons">
                 <button class="accept">Apply</button>
                 <button class="cancel">Cancel</button>
@@ -225,6 +222,9 @@
                     <label for="hideAllPluginMessages">Hide all plugin messages</label><br>
                     <input type="checkbox" id="hideMessagelessPlugins" />
                     <label for="hideMessagelessPlugins">Hide messageless plugins</label><br>
+                    <input type="checkbox" class="showOnlyConflicts">
+                    <label for="editorShowOnlyConflicts">Show only conflicts for </label>
+                    <input type="text" class="conflictsPlugin">
                     <div>
                         <span>Hidden plugins</span>: <span id="hiddenPluginNo">0</span> / <span id="totalPluginNo"></span>
                     </div>