Update web/templates/entry_view.html

web/templates/entry_view.html

@@ -1,11 +1,11 @@
 {% extends "base.html" %}
-{% load static %}
 {% block body_class %}themed-bg{% endblock %}
+{% load static %}
 
 {% block content %}
 <div class="result-wrap">
 
-  <!-- Top bar: back + counter + Prev/Next -->
+  <!-- Top bar: back + counter + clear Prev/Next -->
   <div class="result-toolbar">
     <div class="rt-left">
       <a class="btn btn-secondary" href="{% url 'search' %}">← Back to Search</a>
@@ -14,34 +14,20 @@
       {% endif %}
     </div>
     <div class="rt-right">
-      <!-- Prev -->
       <form method="get" action="{% url 'nav_prev' %}" class="inline">
+        <!-- send current zero-based index (position-1); view will subtract 1 -->
         <input type="hidden" name="i" value="{{ position|add:'-1' }}">
         <button class="btn btn-lg" {% if position <= 1 %}disabled{% endif %}>‹ Prev</button>
       </form>
-
-      <!-- Next -->
       <form method="get" action="{% url 'nav_next' %}" class="inline">
+        <!-- send current zero-based index (position-1); view will add 1 -->
         <input type="hidden" name="i" value="{{ position|add:'-1' }}">
         <button class="btn btn-lg btn-primary" {% if position >= count %}disabled{% endif %}>Next ›</button>
       </form>
 
-      <!-- Share -->
-      <button id="share-btn" class="btn btn-lg btn-primary" type="button" style="margin-left:6px;">
-        <span style="display:flex;align-items:center;gap:6px;">
-          <!-- iOS-style share icon (SVG) -->
-          <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor"
-               viewBox="0 0 16 16" aria-hidden="true" focusable="false">
-            <path d="M8 1a.5.5 0 0 1 .5.5V9a.5.5 0 0 1-1 0V1.5A.5.5 0 0 1 8 1z"/>
-            <path d="M5.646 3.646a.5.5 0 0 1 .708 0L8 5.293l1.646-1.647a.5.5 0 0 1 .708.708L8.354 6.354a.5.5 0 0 1-.708 0L5.646 4.354a.5.5 0 0 1 0-.708z"/>
-            <path d="M4.5 6A1.5 1.5 0 0 0 3 7.5v5A1.5 1.5 0 0 0 4.5 14h7A1.5 1.5 0 0 0 13 12.5v-5A1.5 1.5 0 0 0 11.5 6H10a.5.5 0 0 0 0 1h1.5a.5.5 0 0 1 .5.5v5a.5.5 0 0 1-.5.5h-7a.5.5 0 0 1-.5-.5v-5a.5.5 0 0 1 .5-.5H6a.5.5 0 0 0 0-1H4.5z"/>
-          </svg>
-          Share
-        </span>
-      </button>
-
       {% if user.is_authenticated and user.is_staff %}
-        <a class="btn btn-outline" href="{% url 'entry_edit' entry.id %}">Edit</a>
+        <a class="btn btn-outline" href="{% url 'entry_edit' entry.id %}">Unlock / Edit</a>
+        <a class="btn btn-danger" href="{% url 'entry_delete' entry.id %}">Delete</a>
       {% endif %}
     </div>
   </div>
@@ -67,7 +53,7 @@
     <!-- ILLUSTRATION -->
     <div class="section">
       <div class="section-label">Illustration</div>
-      <div class="section-body lead-text" id="illustration-text">
+      <div class="section-body lead-text">
         {{ entry.illustration|linebreaksbr|default:"—" }}
       </div>
     </div>
@@ -75,7 +61,7 @@
     <!-- APPLICATION -->
     <div class="section">
       <div class="section-label">Application</div>
-      <div class="section-body lead-text" id="application-text">
+      <div class="section-body lead-text">
         {{ entry.application|linebreaksbr|default:"—" }}
       </div>
     </div>
@@ -86,35 +72,16 @@
         <div class="meta-label">Source</div>
         <div class="meta-value">
           {% if entry.source %}
-            {% with s=entry.source|default:"" %}
+            {% with s=entry.source %}
-            {% with sl=s|lower|cut:" " %}
+            {% with sl=s|lower %}
-              {% if
+              {% if sl|slice:":2" == "wp" or sl|slice:":2" == "ws" or sl|slice:":2" == "yb" or sl|slice:":2" == "km" or sl|slice:":3" == "mwb" or sl|slice:":1" == "w" or sl|slice:":1" == "g" or sl|slice:":2" == "ap" or sl|slice:":3" == "apf" or sl|slice:":2" == "be" or sl|slice:":2" == "bh" or sl|slice:":2" == "br" or sl|slice:":2" == "bt" or sl|slice:":3" == "btg" or sl|slice:":2" == "cf" or sl|slice:":2" == "cl" or sl|slice:":2" == "ct" or sl|slice:":2" == "dp" or sl|slice:":2" == "fg" or sl|slice:":2" == "fy" or sl|slice:":2" == "gt" or sl|slice:":2" == "hb" or sl|slice:":2" == "im" or sl|slice:":2" == "ip" or sl|slice:":2" == "it" or sl|slice:":2" == "jv" or sl|slice:":2" == "ka" or sl|slice:":2" == "kj" or sl|slice:":2" == "kl" or sl|slice:":2" == "lf" or sl|slice:":3" == "lff" or sl|slice:":2" == "ll" or sl|slice:":2" == "ly" or sl|slice:":2" == "my" or sl|slice:":2" == "od" or sl|slice:":2" == "pe" or sl|slice:":2" == "po" or sl|slice:":2" == "pt" or sl|slice:":2" == "rr" or sl|slice:":2" == "rs" or sl|slice:":2" == "sg" or sl|slice:":2" == "sh" or sl|slice:":2" == "si" or sl|slice:":2" == "td" or sl|slice:":2" == "tp" or sl|slice:":2" == "tr" or sl|slice:":2" == "ts" or sl|slice:":2" == "un" %}
-                sl|slice:":1" == "w"  or sl|slice:":2" == "wp" or sl|slice:":2" == "ws" or
-                sl|slice:":1" == "g"  or sl|slice:":2" == "yb" or sl|slice:":2" == "kt" or
-                sl|slice:":2" == "km" or sl|slice:":3" == "mwb" or
-                sl|slice:":2" == "ap" or sl|slice:":3" == "apf" or sl|slice:":2" == "be" or sl|slice:":2" == "bh" or
-                sl|slice:":2" == "br" or sl|slice:":2" == "bt" or sl|slice:":3" == "btg" or sl|slice:":2" == "cf" or
-                sl|slice:":2" == "cl" or sl|slice:":2" == "ct" or sl|slice:":2" == "dp" or sl|slice:":2" == "fg" or
-                sl|slice:":2" == "fy" or sl|slice:":2" == "gt" or sl|slice:":2" == "hb" or sl|slice:":2" == "im" or
-                sl|slice:":2" == "ip" or sl|slice:":2" == "it" or sl|slice:":2" == "jv" or sl|slice:":2" == "ka" or
-                sl|slice:":2" == "kj" or sl|slice:":2" == "kl" or sl|slice:":2" == "lf" or sl|slice:":3" == "lff" or
-                sl|slice:":2" == "ll" or sl|slice:":2" == "ly" or sl|slice:":2" == "my" or sl|slice:":2" == "od" or
-                sl|slice:":2" == "pe" or sl|slice:":2" == "po" or sl|slice:":2" == "pt" or sl|slice:":2" == "rr" or
-                sl|slice:":2" == "rs" or sl|slice:":2" == "sg" or sl|slice:":2" == "sh" or sl|slice:":2" == "si" or
-                sl|slice:":2" == "td" or sl|slice:":2" == "tp" or sl|slice:":2" == "tr" or sl|slice:":2" == "ts" or
-                sl|slice:":2" == "un"
-              %}
                 <a class="chip chip-link"
                    href="https://wol.jw.org/en/wol/l/r1/lp-e?q={{ s|urlencode }}"
-                   target="_blank" rel="noopener noreferrer">
+                   target="_blank" rel="noopener noreferrer">{{ s }}</a>
-                  {{ s }}
-                </a>
               {% else %}
                 <a class="chip chip-link"
                    href="https://www.google.com/search?q={{ s|urlencode }}"
-                   target="_blank" rel="noopener noreferrer">
+                   target="_blank" rel="noopener noreferrer">{{ s }}</a>
-                  {{ s }}
-                </a>
               {% endif %}
             {% endwith %}
             {% endwith %}
@@ -129,9 +96,7 @@
             {% for sc in scripture_list %}
               <a class="chip chip-link"
                  href="https://wol.jw.org/en/wol/l/r1/lp-e?q={{ sc|urlencode }}"
-                 target="_blank" rel="noopener noreferrer">
+                 target="_blank" rel="noopener noreferrer">{{ sc }}</a>
-                {{ sc }}
-              </a>
             {% endfor %}
           {% else %}—{% endif %}
         </div>
@@ -162,44 +127,27 @@
 
 </div>
 
-<!-- Toast -->
-<div id="copy-toast"
-     style="position:fixed;bottom:20px;left:50%;transform:translateX(-50%);
-            background:#333;color:#fff;padding:10px 16px;border-radius:6px;
-            font-size:14px;display:none;z-index:9999;">
-  The Illustration was copied to the clipboard
-</div>
-
 <style>
   .subject-pills{
-    display:flex; flex-wrap:wrap; gap:10px; margin:0 0 10px;
+    display:flex;
+    flex-wrap:wrap;
+    gap:10px;
+    margin:0 0 10px;
   }
   .chip-subject{
-    font-weight:700; font-size:16px; padding:8px 14px; border-radius:999px;
+    font-weight:700;
-    background:#eef5fc; border:1px solid #d7e6f7; color:#0f172a; text-decoration:none;
+    font-size:16px;
-    text-transform: capitalize;
+    padding:8px 14px;
+    border-radius:999px;
+    background:#eef5fc;
+    border:1px solid #d7e6f7;
+    color:#0f172a;
+    text-decoration:none;
+    text-transform: capitalize; /* Capitalize each word */
+  }
+  .chip-subject:hover{
+    background:#e2effc;
+    border-color:#c9def5;
   }
-  .chip-subject:hover{ background:#e2effc; border-color:#c9def5; }
 </style>
-
-<script>
-  // Copy Illustration + two spaces + Application
-  (function () {
-    const btn = document.getElementById('share-btn');
-    if (!btn) return;
-    btn.addEventListener('click', function () {
-      const ill = (document.getElementById('illustration-text')?.innerText || '').trim();
-      const app = (document.getElementById('application-text')?.innerText || '').trim();
-      const text = ill + '  ' + app;
-      navigator.clipboard.writeText(text).then(() => {
-        const toast = document.getElementById('copy-toast');
-        if (!toast) return;
-        toast.style.display = 'block';
-        setTimeout(() => { toast.style.display = 'none'; }, 5000);
-      }).catch(err => {
-        alert('Failed to copy: ' + err);
-      });
-    });
-  })();
-</script>
 {% endblock %}