Added page legend #637

getgrav · Jun 2, 2016 · 2bbcc16 · 2bbcc16
1 parent 45e9e77
commit 2bbcc16
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,8 +3,10 @@
 
 1. [](#improved)
     * Cleaned up the Page Preview CSS to make it more 'standard' [#634](https://github.com/getgrav/grav-plugin-admin/issues/634)
+    * Added a legend with the Page colors explained [#637](https://github.com/getgrav/grav-plugin-admin/issues/637)
 1. [](#bugfix)
     * Fixed "Data type `System` doesn't exist!" error when activating a theme [#635](https://github.com/getgrav/grav-plugin-admin/issues/635)
+    * Fixed issue with custom media types not deleting on save [#633](https://github.com/getgrav/grav-plugin-admin/issues/633)
     * Fixed issue when saving `List` field type in plugins + pages
 
 

diff --git a/languages/en.yaml b/languages/en.yaml
@@ -559,4 +559,5 @@ PLUGIN_ADMIN:
   MIME_TYPE: "Mime Type"
   THUMB: "Thumb"
   TYPE: "Type"
-  FILE_EXTENSION: "File Extension"
+  FILE_EXTENSION: "File Extension"
+  LEGEND: "Page Legend"
diff --git a/themes/grav/css-compiled/template.css b/themes/grav/css-compiled/template.css
diff --git a/themes/grav/css-compiled/template.css.map b/themes/grav/css-compiled/template.css.map
diff --git a/themes/grav/scss/template/_pages.scss b/themes/grav/scss/template/_pages.scss
@@ -99,8 +99,19 @@
         &.modular {
             color: #9055AF;
         }
+    }
+
+    #pages-legend {
+        margin-top: 1.5rem;
+        text-align: center;
 
+        h2, ul, li {
+            display: inline-block;
+        }
 
+        li {
+            margin-right: 0.75rem;
+        }
     }
 }
 

diff --git a/themes/grav/templates/pages.html.twig b/themes/grav/templates/pages.html.twig
@@ -270,9 +270,12 @@
                 <span class="button button-x-small" data-page-toggleall="collapse"><i class="fa fa-fw fa-minus-circle"></i> {{ "PLUGIN_ADMIN.COLLAPSE_ALL"|tu }}</span>
             </div>
         </form>
-        <ul class="pages-list depth-0">
-            {{ _self.loop(pages, 0, _context) }}
-        </ul>
+        <div class="pages-list">
+            <ul class="depth-0">
+                {{ _self.loop(pages, 0, _context) }}
+            </ul>
+            {% include 'partials/page-legend.html.twig' %}
+        </div>
     {% endif %}
     </div>
 

diff --git a/themes/grav/templates/partials/page-legend.html.twig b/themes/grav/templates/partials/page-legend.html.twig
@@ -0,0 +1,11 @@
+{% set legend = {'VISIBLE':'', 'NON_ROUTABLE':'not-routable', 'NON_VISIBLE':'not-visible', 'MODULAR':'modular'} %}
+<div id="pages-legend">
+    <strong>{{ 'PLUGIN_ADMIN.LEGEND'|tu }}:</strong>
+    <ul>
+        {% for key, class in legend %}
+        <li><i class="page-icon fa fa-fw fa-circle-o {{ class }}"></i> {{ ('PLUGIN_ADMIN.'~key)|tu }}</li>
+        {% endfor %}
+    </ul>
+</div>
+
+