Merge branch 'master' into bw-as-default

MTG · Oct 26, 2023 · b23e5af · b23e5af
2 parents 10c50c6 + 32cd416
commit b23e5af
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 35 deletions.
diff --git a/freesound/static/bw-frontend/src/pages/moderation.js b/freesound/static/bw-frontend/src/pages/moderation.js
@@ -144,7 +144,7 @@ ticketCheckboxes.forEach(checkbox => {
 
     // NOTE: the 'change' event is triggered when the checkbox is clicked by the user, but not when programatically setting .checked to true/false
     checkbox.addEventListener('change', () => {
-        if (checkbox.dataset.altKey === "true") {
+        if (checkbox.dataset.altKey !== "true" && checkbox.dataset.shiftKey !== "true") {
             // Unselect all other checkboxes
             ticketCheckboxes.forEach(otherCheckbox => {
                 if (otherCheckbox !== checkbox) {

diff --git a/templates_bw/moderation/assigned.html b/templates_bw/moderation/assigned.html
@@ -29,7 +29,7 @@ <h5>No sound tickets in your queue... &#128543</h5>
                         <a id="stop-sounds" class="bw-link--grey cursor-pointer" href="javascript:void(0);">Stop all sounds</a>
                     </div>
                 </div>
-                <div>
+                <div class="v-spacing-3" style="overflow-y:auto;max-height:450px;">
                     <table id="assigned-tickets-table" class="w-100 tickets-table">
                     {% for ticket in page.object_list %}
                         {% if ticket.sound %}
@@ -66,38 +66,40 @@ <h5>No sound tickets in your queue... &#128543</h5>
                         </label>
                     </div>
                     <div class="text-grey">
-                        You can do alt+click on a row to select <i>only</i> this row
+                        You can do alt+click on a row to select <i>multiple</i> rows
                         <br>You can do shift+click on a row to select all the rows since the last previously selected row
                     </div>
                 </div>
             {% endif %}
             </div>
         </div>
         <div class="col-lg-5">
-            <div id="moderate-form-wrapper" class="display-none">
-                <h4 id="moderate-form-title-label"></h4>
-                <div>
-                    <form action="." method="post" class="bw-form disable-on-submit do-not-submit-on-enter">{% csrf_token %}
-                        <div class="bw-inline-radio">
-                        {{ mod_sound_form.as_p }}
-                        </div>
-                        <div id="template-responses" class="v-spacing-top-2">
-                            <span class="h-spacing-1">Template repsonses:</span>
-                            {% for label, text in moderation_texts %}
-                                <a class="bw-link--grey cursor-pointer" href="javascript:void(0);"
-                                    data-text="{{text|escape}}" title="{{text|escape}}">{{ label }}</a>
-                                {% if not forloop.last %}
-                                <span class="h-spacing-left-1 h-spacing-1 text-grey">·</span>
-                                {% endif%}
-                            {% endfor %}
-                        </div>
-                        <div class="v-spacing-top-2 v-spacing-4">
-                        {{ msg_form }}
-                        </div>
-                        <button class="btn-primary w-100" type="submit">Update ticket(s)</button>
-                    </form>
-                </div>  
-                <div id="selected-sounds-info" class="v-spacing-top-4 v-spacing-4"></div>
+            <div class="bw-sticky-top3">
+                <div id="moderate-form-wrapper" class="display-none">
+                    <h4 id="moderate-form-title-label"></h4>
+                    <div>
+                        <form action="." method="post" class="bw-form disable-on-submit do-not-submit-on-enter">{% csrf_token %}
+                            <div class="bw-inline-radio">
+                            {{ mod_sound_form.as_p }}
+                            </div>
+                            <div id="template-responses" class="v-spacing-top-2">
+                                <span class="h-spacing-1">Template repsonses:</span>
+                                {% for label, text in moderation_texts %}
+                                    <a class="bw-link--grey cursor-pointer" href="javascript:void(0);"
+                                        data-text="{{text|escape}}" title="{{text|escape}}">{{ label }}</a>
+                                    {% if not forloop.last %}
+                                    <span class="h-spacing-left-1 h-spacing-1 text-grey">·</span>
+                                    {% endif%}
+                                {% endfor %}
+                            </div>
+                            <div class="v-spacing-top-2 v-spacing-4">
+                            {{ msg_form }}
+                            </div>
+                            <button class="btn-primary w-100" type="submit">Update ticket(s)</button>
+                        </form>
+                    </div>  
+                    <div id="selected-sounds-info" class="v-spacing-top-4 v-spacing-4" style="padding-bottom:1000px;"></div>
+                </div>
             </div>
         </div>
     </div>

diff --git a/templates_bw/molecules/footer.html b/templates_bw/molecules/footer.html
@@ -1,6 +1,6 @@
 {% load static %}
 
-<footer class="bw-footer padding-7 v-spacing-top-7">
+<footer class="bw-footer padding-7 v-spacing-top-6">
   <div class="center">
     <div class="footer-logo-container">
         <div class="row">
@@ -17,7 +17,7 @@
         </div>
     </div>
   </div>
-  <div class="row v-spacing-top-4 center">
+  <div class="row v-spacing-top-3 center">
     <a class="bw-link--grey h-spacing-1" href="{% url 'wiki' %}about/">About Freesound</a>
     <a class="bw-link--grey h-spacing-1" href="{% url 'wiki' %}tos_web/">Terms of use</a>
     <a class="bw-link--grey h-spacing-1" href="{% url 'wiki' %}privacy/">Privacy</a>
@@ -29,11 +29,7 @@
     <a class="bw-link--grey h-spacing-1" href="https://labs.freesound.org">Freesound Labs</a>
     <a class="bw-link--grey h-spacing-1" href="{% url 'wiki' %}tshirt/">Get your t-shirt!</a>
   </div>
-  <div class="center v-spacing-top-4">
-    <span>© {% now "Y" %}</span>
+  <div class="center v-spacing-top-3">
+    <span>© {% now "Y" %} Universitat Pompeu Fabra</span>
   </div>
-  <div class="center">
-    <span>Freesound</span>
-  </div>
-
 </footer>