Merge branch 'mmcinnestaylor:main' into main

Author: mmcinnestaylor

src/announcements/templates/announcements/announcement_detail.html

@@ -21,7 +21,7 @@ <h2 class="card-title mb-0">{{ object.title }}</h2>
             <small class="card-text text-muted">Updated on: {{ announcement.updated_on}}</small>
           {% endif %}
           <p class="card-text mt-2">{{ object.content | linebreaks }}</p>
-          <a href="{% url 'announcements' %}" class="btn btn-primary btn-sm">&larr; Back</a>
+          <input class="btn btn-primary btn-sm" type="button" value="&larr; Back" onClick="javascript:history.go(-1);">
         </div> 
       </div>
     </div>

src/templates/base.html

@@ -116,9 +116,9 @@ <h5 class="dropdown-header">DOMjudge</h5>
                 <a class="dropdown-item" href="https://domjudge.cs.fsu.edu"
                   target="_blank" rel="external noopener"><i class="fa-solid fa-server fa-fw"></i> Contest Server</a>
                 <a class="dropdown-item" href="{% static 'docs/domjudge_guide.pdf' %}"
-                  target="_blank"><i class="fa-solid fa-book fa-fw"></i> Contest Server Guide</a>
+                  target="_blank"><i class="fa-solid fa-file-pdf fa-fw"></i> Contest Server Guide</a>
                 <a class="dropdown-item" href="https://www.domjudge.org/docs/manual/7.3/team.html"
-                  target="_blank" rel="external noopener"><i class="fa-solid fa-file-pdf fa-fw"></i> DOMjudge's Team Manual</a>
+                  target="_blank" rel="external noopener"><i class="fa-solid fa-book fa-fw"></i> DOMjudge's Team Manual</a>
                 <div class="dropdown-divider"></div>
                 <h5 class="dropdown-header">Example Problems</h5>
                 <h6 class="dropdown-header">Upper Division</h6>
@@ -131,6 +131,7 @@ <h6 class="dropdown-header">Lower Division</h6>
                   target="_blank"><i class="fa-solid fa-file-pdf fa-fw"></i> Line Drawing Algorithms (2017)</a>
                 <a class="dropdown-item" href="{% static 'docs/l6_spc_2017.pdf' %}"
                   target="_blank"><i class="fa-solid fa-file-pdf fa-fw"></i> The Missing Z-95 Headhunter (2017)</a>
+                <div class="dropdown-divider"></div>
                 <h5 class="dropdown-header">Misc</h5>
                 <a class="dropdown-item" href="https://bit.ly/JoinProgClub"
                   target="_blank" rel="external noopener"><i class="fa-solid fa-people-group fa-fw"></i> Programming Club</a>