Merge pull request #80 from Teknologforeningen/hidden-folder-tag

Hidden folder tag
Teknologforeningen · Jan 28, 2020 · ec9875d · ec9875d
2 parents 2b4babc + de6e1fc
commit ec9875d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/fotogalleri/gallery/static/css/folder.css b/fotogalleri/gallery/static/css/folder.css
@@ -37,4 +37,15 @@
 
 .folder-link:hover::before {
     color: rgb(255, 153, 161);
-}
+}
+
+.hidden-folder-tag {
+    border-color: var(--dark-red);
+    color: var(--dark-red);
+    border-width: 1px;
+    border-style: solid;
+}
+
+.has-margin-left-10 {
+    margin-left: 10px;
+}
diff --git a/fotogalleri/gallery/templates/components/folder.html b/fotogalleri/gallery/templates/components/folder.html
@@ -7,6 +7,11 @@
   data-url="/view/{{ folder.full_path }}"
   data-id="{{ folder.pk }}"
 >
-{{ folder.path }}
-  <input type="checkbox" style="display: none; margin-left: 10px;" />  
+  {{ folder.path }}
+
+  {% if folder.hidden %}
+    <span class="tag hidden-folder-tag is-normal has-margin-left-10">Hidden</span>
+  {% endif %}
+
+  <input type="checkbox" class="has-margin-left-10" style="display: none;" />
 </a>
diff --git a/fotogalleri/gallery/templates/view_images.html b/fotogalleri/gallery/templates/view_images.html
@@ -38,12 +38,12 @@
       class="content folders-content"
       style="{% if not folders %}display: none;{% endif %}"
     >
-    <div>
-      {% for folder in folders %}
       <div>
-        {% include "components/folder.html" with folder=folder %}
-      </div>
-      {% endfor %}
+        {% for folder in folders %}
+          <div>
+            {% include "components/folder.html" with folder=folder %}
+          </div>
+        {% endfor %}
       </div>
     </div>