diff --git a/core/static/sas/album.scss b/core/static/sas/album.scss index 18808bda..766e0b84 100644 --- a/core/static/sas/album.scss +++ b/core/static/sas/album.scss @@ -27,6 +27,11 @@ &:hover { background-color: #d4d4d4; } + + &:disabled { + background-color: #f2f2f2; + color: #d4d4d4; + } } } @@ -144,6 +149,8 @@ padding: 0; box-shadow: none; + border: 1px solid rgba(0, 0, 0, .3); + @media (max-width: 500px) { width: 100%; } @@ -162,7 +169,7 @@ color: white; &:hover { - background: rgba(0, 0, 0, .7); + background: rgba(0, 0, 0, .5); } } @@ -192,8 +199,8 @@ } > .album > div { - background: rgba(0, 0, 0, .3); - background: linear-gradient(0deg, rgba(0, 0, 0, .7) 0%, rgba(0, 0, 0, 0) 100%); + background: rgba(0, 0, 0, .5); + background: linear-gradient(0deg, rgba(0, 0, 0, .5) 0%, rgba(0, 0, 0, 0) 100%); text-align: left; word-break: break-word; } diff --git a/sas/templates/sas/album.jinja b/sas/templates/sas/album.jinja index 80b16942..75e74556 100644 --- a/sas/templates/sas/album.jinja +++ b/sas/templates/sas/album.jinja @@ -37,7 +37,7 @@ {% trans %}Edit{% endtrans %} - + @@ -112,7 +112,7 @@ {% endif %} - {% if edit_mode %} + {% if user.is_in_group(settings.SITH_GROUP_SAS_ADMIN_ID) %}
{% csrf_token %}
diff --git a/sas/templates/sas/main.jinja b/sas/templates/sas/main.jinja index 3982bf47..d72d70dc 100644 --- a/sas/templates/sas/main.jinja +++ b/sas/templates/sas/main.jinja @@ -1,56 +1,103 @@ {% extends "core/base.jinja" %} +{%- block additional_css -%} + + +{%- endblock -%} + {% block title %} -{% trans %}SAS{% endtrans %} + {% trans %}SAS{% endtrans %} {% endblock %} -{% macro display_album(a) %} -{% if a.is_moderated %} - -
-
- {% if a.file %} - {% trans %}preview{% endtrans %} - {% elif a.children.filter(is_folder=False, is_moderated=True).exists() %} - {% trans %}preview{% endtrans %} - {% else %} - {% trans %}preview{% endtrans %} - {% endif %} -
- {{ a.name }} -
-
-{% elif user.is_in_group(settings.SITH_GROUP_SAS_ADMIN_ID) %} -
-

Moderate or Delete

- {{ a.name }} -
-{% endif %} +{% set edit_mode = user.is_in_group(settings.SITH_GROUP_SAS_ADMIN_ID) %} + +{% macro display_album(a, checkbox) %} + + {% if a.file %} + {% set img = a.get_download_url() %} + {% elif a.children.filter(is_folder=False, is_moderated=True).exists() %} + {% set img = a.children.filter(is_folder=False).first().as_picture.get_download_thumb_url() %} + {% else %} + {% set img = static('core/img/sas.jpg') %} + {% endif %} + +
+
+ {{ a.name }} +
+
+ {# {% if edit_mode and checkbox %} + + {% endif %} #} +
{% endmacro %} {% block content %} -

{% trans %}SAS{% endtrans %}

-
-

{% trans %}Latest albums{% endtrans %}

-
- {% for a in latest %} - {{ display_album(a) }} - {% endfor %} -
-
-

{% trans %}All categories{% endtrans %}

-
- {% for a in categories %} - {{ display_album(a) }} - {% endfor %} -
-{% if user.is_in_group(settings.SITH_GROUP_SAS_ADMIN_ID) %} - - {% csrf_token %} - {{ form.non_field_errors() }} -

{{ form.album_name.errors }} - {{ form.album_name }}

-

- -{% endif %} +

{% trans %}SAS{% endtrans %}

+
+

{% trans %}Latest albums{% endtrans %}

+
+ {% for a in latest %} + {{ display_album(a) }} + {% endfor %} +
+ +
+ + {% if edit_mode %} +
+ {% csrf_token %} + + + + {% if clipboard %} +
+ {% trans %}Clipboard: {% endtrans %} +
    + {% for f in clipboard %} +
  • {{ f.get_full_path() }}
  • + {% endfor %} +
+ +
+ {% endif %} + {% else %} +

{% trans %}All categories{% endtrans %}

+ {% endif %} + +
+ {% for a in categories %} + {{ display_album(a, true) }} + {% endfor %} +
+ + {% if edit_mode %} +
+ +
+ +
+ {% csrf_token %} + +
+
+ + {{ form.album_name }} +
+ +
+ + {{ form.non_field_errors() }} + {{ form.album_name.errors }} +
+ {% endif %} {% endblock %}