CONCD-924 yet more fixes (#2565)

LibraryOfCongress · Oct 17, 2024 · b73c134 · b73c134
1 parent 8346f69
commit b73c134
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 44 deletions.
diff --git a/concordia/static/js/src/base.js b/concordia/static/js/src/base.js
@@ -156,7 +156,7 @@ if (screenfull.isEnabled) {
         .removeAttr('hidden')
         .on('click', function (event) {
             event.preventDefault();
-            var targetElement = document.getElementById(this.dataset.target);
+            var targetElement = document.getElementById(this.dataset.bsTarget);
 
             if (screenfull.isFullscreen) {
                 screenfull.exit();

diff --git a/concordia/static/scss/base.scss b/concordia/static/scss/base.scss
@@ -58,6 +58,7 @@ $carousel-control-width: 8%;
 $carousel-control-opacity: 1;
 $carousel-indicator-width: 12px;
 $carousel-indicator-height: 12px;
+$carousel-control-icon-height: 3.5rem;
 $carousel-control-icon-width: 3.5rem;
 
 // dropdown
@@ -274,7 +275,8 @@ p a,
 }
 
 p a:hover,
-.simple-page a:hover {
+.simple-page a:hover,
+.btn:hover {
     text-decoration: none;
 }
 
@@ -396,12 +398,6 @@ a.btn-outline-dark:hover {
     color: $gray-800;
 }
 
-body .btn-group > .btn:not(:last-child),
-body .btn-group > .btn:not(.dropdown-toggle),
-body .btn-group > :not(.btn-check) + .btn {
-    border-radius: 0.25rem;
-}
-
 body .form-check-input {
     border-color: $gray-800;
 }
@@ -891,10 +887,6 @@ body .disabled > .page-link {
     max-width: 270px;
 }
 
-.call-to-action {
-    min-width: 292px;
-}
-
 // Campaign small blocks
 
 .small-campaign-title {
@@ -965,6 +957,12 @@ body .disabled > .page-link {
     }
 }
 
+.carousel .carousel-control-next-icon,
+.carousel .carousel-control-prev-icon {
+    height: $carousel-control-icon-height;
+    width: $carousel-control-icon-width;
+}
+
 .carousel .carousel-indicators {
     > button {
         border-radius: 50%;
@@ -1142,12 +1140,14 @@ body .disabled > .page-link {
     resize: none;
 }
 
-a.btn-outline-primary {
+a.btn-outline-primary,
+button.btn-outline-primary {
     border-color: $blue;
     color: $blue;
 }
 
-a.btn-outline-primary:hover {
+a.btn-outline-primary:hover,
+button.btn-outline-primary:hover {
     background-color: $blue;
     border-color: $blue;
 }

diff --git a/concordia/templates/home.html b/concordia/templates/home.html
@@ -65,7 +65,7 @@ <h3 class="mt-3 text-uppercase">Review</h3>
         <div id="homepage-carousel" class="carousel slide container" data-bs-ride="carousel" data-bs-pause="hover">
             <div class="carousel-indicators d-none d-lg-flex">
                 {% for slide in slides %}
-                    <button type="button" data-bs-target="#homepage-carousel" data-bs-slide-to="{{ forloop.counter0 }}" {% if forloop.first %}class="active" aria-current="true" {% endif %}aria-label="Slide {{ forloop.counter }}">></button>
+                    <button type="button" data-bs-target="#homepage-carousel" data-bs-slide-to="{{ forloop.counter0 }}" {% if forloop.first %}class="active" aria-current="true" {% endif %}aria-label="Slide {{ forloop.counter }}"></button>
                 {% endfor %}
             </div>
 

diff --git a/concordia/templates/transcriptions/asset_detail/editor.html b/concordia/templates/transcriptions/asset_detail/editor.html
@@ -1,34 +1,33 @@
 <div class="flex-grow-1 d-flex d-print-block flex-column">
-    <div id="transcription-status-display">
-        <h2 id="display-submitted" {% if transcription_status != 'submitted' %}hidden{% endif %}>
-            <span class="fas fa-list"></span>
-            Needs review
-        </h2>
-        <h2 id="display-completed" {% if transcription_status != 'completed' %}hidden{% endif %}>
-            <span class="fas fa-check"></span>
-            Completed
-        </h2>
-        <h2 id="display-notstarted" {% if transcription_status != "not_started" %}hidden{% endif %}>
-            <span class="fas fa-edit"></span>
-            Not started
-        </h2>
-        <h2 id="display-inprogress" {% if transcription_status != "in_progress" %}hidden{% endif %}>
-            <span class="fas fa-edit"></span>
-            In progress
-        </h2>
-        <span id="display-conflict" hidden>
-            <span class="fas fa-exclamation-triangle"></span>
-            Another user is transcribing this page
-        </span>
-    </div>
-
     <form id="transcription-editor" class="ajax-submission flex-grow-1 d-flex flex-column d-print-block" method="post" action="{% url 'save-transcription' asset_pk=asset.pk %}" data-transcription-status="{{ transcription_status }}" {% if transcription %}data-transcription-id="{{ transcription.pk|default:'' }}" {% if transcription.submitted %}data-unsaved-changes="true"{% endif %} data-submit-url="{% url 'submit-transcription' pk=transcription.pk %}" data-review-url="{% url 'review-transcription' pk=transcription.pk %}"{% endif %}>
         {% csrf_token %}
         <input type="hidden" name="supersedes" value="{{ transcription.pk|default:'' }}" />
 
-        <div class="row justify-content-sm-between ps-3 pe-2">
+        <div class="row justify-content-sm-between align-items-end pe-2">
             <div class="col">
-                <span id="transcription-status-message">
+                <div id="transcription-status-message" class="">
+                    <div id="transcription-status-display" class="row">
+                        <h2 id="display-submitted" {% if transcription_status != 'submitted' %}hidden{% endif %}>
+                            <span class="fas fa-list"></span>
+                            Needs review
+                        </h2>
+                        <h2 id="display-completed" {% if transcription_status != 'completed' %}hidden{% endif %}>
+                            <span class="fas fa-check"></span>
+                            Completed
+                        </h2>
+                        <h2 id="display-notstarted" {% if transcription_status != "not_started" %}hidden{% endif %}>
+                            <span class="fas fa-edit"></span>
+                            Not started
+                        </h2>
+                        <h2 id="display-inprogress" {% if transcription_status != "in_progress" %}hidden{% endif %}>
+                            <span class="fas fa-edit"></span>
+                            In progress
+                        </h2>
+                        <span id="display-conflict" hidden>
+                            <span class="fas fa-exclamation-triangle"></span>
+                            Another user is transcribing this page
+                        </span>
+                    </div>
                     <h2 id="message-contributors" {% if transcription_status == 'not_started' %}hidden{% endif %}>
                         Registered Contributors: <span id="message-contributors-num" class="fw-normal">{{ registered_contributors }}</span>
                     </h2>
@@ -44,10 +43,10 @@ <h2 id="message-contributors" {% if transcription_status == 'not_started' %}hidd
                     <span id="message-completed" {% if transcription_status != 'completed' %}hidden{% endif %}>
                         This transcription is finished! You can read and add tags.
                     </span>
-                </span>
+                </div>
             </div>
             {% if cards %}
-                <div class="align-items-end btn-group col call-to-action pe-0">
+                <div class="align-items-end btn-group pe-0 col">
                     <a class="fw-bold" id="quick-tips" data-bs-toggle="modal" data-bs-target="#tutorial-popup" role="button">
                         <u>Campaign Tips</u>
                     </a>
@@ -89,7 +88,7 @@ <h2 id="message-contributors" {% if transcription_status == 'not_started' %}hidd
                         </a>
                     </div>
 
-                    <div class="btn-group">
+                    <div>
                         <button id="save-transcription-button" disabled type="submit" class="btn btn-primary mx-1" title="Save the text you entered above">
                             Save
                         </button>

diff --git a/concordia/templates/transcriptions/campaign_topic_list.html b/concordia/templates/transcriptions/campaign_topic_list.html
@@ -71,7 +71,7 @@ <h3 class="mb-3"><a href="{{ campaign.get_absolute_url }}">{{ campaign.title }}<
         </ul>
         {% with campaigns|length as campaigns_count %}
             {% if campaigns_count > 10 %}
-                <div class="align-items-center justify-content-center row">
+                <div class="align-items-center justify-content-center d-flex">
                     <a id="show-more" class="btn btn-primary">Show More Campaigns ({{ campaigns_count|add:"-10" }})</a>
                 </div>
             {% endif %}