-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Github Issue #72: Enhance Missions Detail View - Update#2"
- Loading branch information
Showing
1 changed file
with
10 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -21,9 +21,10 @@ | |
<link rel="icon" type="image/png" href="{% static 'images/favicons/smdb_favicon_ship.ico' %}"> | ||
|
||
{% block css %} | ||
{# Latest compiled and minified Bootstrap CSS #} | ||
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" | ||
integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous"> | ||
{# Other Django packages depend on Bootstrap 4 #} | ||
<link href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet" | ||
integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous"> | ||
|
||
{# Add leaflet CSS #} | ||
<link rel="stylesheet" type="text/css" href="https://unpkg.com/[email protected]/dist/leaflet.css"> | ||
<link rel="stylesheet" href="https://unpkg.com/@geoman-io/leaflet-geoman-free@latest/dist/leaflet-geoman.css"> | ||
|
@@ -49,8 +50,8 @@ | |
integrity="sha384-7+zCNj/IqJ95wo16oMtfsKbZ9ccEh31eOz1HGyDuCQ6wgnyJNSYdrPa03rtR1zdB" | ||
crossorigin="anonymous"></script> | ||
|
||
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.min.js" | ||
integrity="sha384-QJHtvGhmr9XOIpI6YVutG+2QOK9T+ZnN4kzFN1RtK3zEFEIsxhlmWl5/YESvpZ13" | ||
<script defer src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" | ||
integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" | ||
crossorigin="anonymous"></script> | ||
|
||
{# Your stuff: Third-party javascript libraries go here #} | ||
|
@@ -71,7 +72,6 @@ | |
{# Left Menu Items #} | ||
<div class="navbar navbar-expand-md navbar-light navbar-fixed-top navbar-left" | ||
style="background-color: #e9e9e9; width: 100%" id="navbar" role="navigation"> | ||
|
||
<a class="navbar-brand" href="{% url 'home' %}" id="smdb_navbrand"> | ||
<img src="{% static 'images/SMDB_logo.jpg' %}" class="img" id="smdbLogo" | ||
aria-label="SeaFloor Mapping Database (SMDB)"> | ||
|
@@ -123,9 +123,9 @@ | |
</ul> | ||
{# Right Menu Items #} | ||
<ul class="navbar-nav nav-pills mx-auto justify-content-right flex-column flex-md-row pull-right" | ||
style="flex-flow: row nowrap" width="50%" id="menuLinksRight"> | ||
style="padding-left: 650px" width="50%" id="menuLinksRight"> | ||
{% if request.user.is_authenticated %} | ||
<li class="nav-item mx-auto pull-right" style="padding-right: 1px"> | ||
<li class="nav-item mx-auto pull-right" style="padding-right: 15px"> | ||
{# URL provided by smdbango-allauth/account/urls.py #} | ||
<a class="nav-link pull-right float-right" id="navAccount" | ||
href="{% url 'users:detail' request.user.username %}" data-bs-toggle="tooltip" data-bs-placement="top" | ||
|
@@ -166,7 +166,6 @@ | |
</li> | ||
|
||
</ul> | ||
|
||
</div> | ||
|
||
<div class="row" id="separator" style="color:darkgray"> | ||
|
@@ -191,8 +190,8 @@ | |
{# Script tags with only code, no src (defer by default) #} | ||
{% endblock inline_javascript %} | ||
<footer id="footer"> | ||
Page contents are for MBARI internal use only. | ||
</footer> | ||
<br><br><br>Page contents are for MBARI internal use only. | ||
</footer><br><br><br> | ||
</body> | ||
|
||
</html> |