summaryrefslogtreecommitdiffstats
path: root/templates/base.html
diff options
context:
space:
mode:
Diffstat (limited to 'templates/base.html')
-rw-r--r--templates/base.html195
1 files changed, 130 insertions, 65 deletions
diff --git a/templates/base.html b/templates/base.html
index 666ff7a..9dbef01 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -3,8 +3,14 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
<link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/main3.css" title="eyeCandy"/>
-<link rel="alternate stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/mainplain.css" title="plain"/>
+<!-- <link rel="alternate stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/mainplain.css" title="plain"/> -->
<link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/dropdownNavStyle.css" />
+
+<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
+<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
+
<title>{% block title %}Troggle{% endblock %}</title>
<!-- <script src="{{ settings.JSLIB_URL }}jquery/jquery.min.js" type="text/javascript"></script> -->
<script src="{{ settings.MEDIA_URL }}js/jquery.quicksearch.js" type="text/javascript"></script>
@@ -15,47 +21,108 @@
</head>
<body onLoad="contentHeight();">
+ <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
+ <a class="navbar-brand" href="#">CUCC Expo</a>
+ <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+ <span class="navbar-toggler-icon"></span>
+ </button>
+
+ <div class="collapse navbar-collapse" id="navbarSupportedContent">
+ <ul class="navbar-nav mr-auto">
+ <li class="nav-item">
+ <a class="nav-link" href="{{settings.EXPOWEB_URL}}">Home <span class="sr-only">(current)</span></a>
+ </li>
+ <li class="nav-item active">
+ <a class="nav-link" href="{% url "frontpage" %}">Troggle</a>
+ </li>
+ <li class="nav-item">
+ <a class="nav-link" href="{% url "survexcaveslist" %}">All Survex</a>
+ </li>
+ <li class="nav-item">
+ <a class="nav-link" href="{% url "surveyscansfolders" %}">Scans</a>
+ </li>
+ <li class="nav-item">
+ <a class="nav-link" href="{% url "tunneldata" %}">Tunneldata</a>
+ </li>
+ <li class="nav-item dropdown">
+ <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+ Caves
+ </a>
+ <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+ <a class="dropdown-item" href="{% url "survexcavessingle" 107 %}">107</a>
+ <a class="dropdown-item" href="{% url "survexcavessingle" 161 %}">161</a>
+ <a class="dropdown-item" href="{% url "survexcavessingle" 204 %}">204</a>
+ <a class="dropdown-item" href="{% url "survexcavessingle" 258 %}">258</a>
+ <a class="dropdown-item" href="{% url "survexcavessingle" 264 %}">264</a>
+ <div class="dropdown-divider"></div>
+ <a class="dropdown-item" href="{% url "caveindex" %}">All</a>
+ </div>
+ </li>
+ <li class="nav-item dropdown">
+ <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+ Expos
+ </a>
+ <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+ <a class="dropdown-item" href="{% url "expedition" 2018 %}">Expo2018</a>
+ <a class="dropdown-item" href="{% url "expedition" 2017 %}">Expo2017</a>
+ <a class="dropdown-item" href="{% url "expedition" 2016 %}">Expo2016</a>
+ <div class="dropdown-divider"></div>
+ <a class="dropdown-item" href="{% url "expeditions" %}">All</a>
+ </div>
+ </li>
+ <li class="nav-item">
+ <a class="nav-link" href="{% url "personindex" %}">Cavers</a>
+ </li>
+ </ul>
+ <ul class="navbar-nav my-2 my-lg-0">
+ <li class="nav-item">
+ <a class="nav-link" href="/admin/">Django admin</a>
+ </li>
+ {% block loginInfo %}
+ {% if user.username %}
+ <li class="nav-item">
+ <span class="navbar-text">
+ You are logged in as {{ user.username }}
+ </span>
+ </li>
+ <li class="nav-item">
+ <a class="nav-link" href="{% url "auth_logout" %}">Log out</a>
+ </li>
+ {% else %}
+ <li class="nav-item">
+ <a class="nav-link" href="{% url "registration_register" %}">Sign up</a>
+ </li>
+ <li class="nav-item">
+ <a class="nav-link" href="{% url "auth_login" %}">Log in</a>
+ </li>
+ {% endif %}
+ {% endblock%}
+ </ul>
+ <!-- <form class="form-inline my-2 my-lg-0">
+ <input class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search">
+ <button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
+ </form> -->
+ </div>
+ </nav>
+
<div id="header">
- <h1>CUCC Expeditions to Austria: 1976 - 2018</h1>
- <div id="editLinks"> {% block loginInfo %}
- <a href="{{settings.EXPOWEB_URL}}">Website home</a> |
- {% if user.username %}
- You are logged in as {{ user.username }}
- {% if user.person %}(<a href="{{ user.person.get_absolute_url }}">{{ user.person }}</a>)
- {% else %}<a href={% url "profiles_select_profile" %}>sort your profile</a>
- {% endif %}.
- | <a href="{% url "auth_logout" %}">Log out</a> {% else %} <a href="{% url "registration_register" %}">Sign up</a> | <a href="{% url "auth_login" %}">Log in</a> {% endif %}
- {% endblock%}
+ <div id="editLinks">
+
{% block editLink %}
{% endblock %}
</div>
</div>
-<div class="toolbarlinks">
- <a href="{% url "survexcaveslist" %}">All Survex</a> |
- <a href="{% url "surveyscansfolders" %}">Scans</a> |
- <a href="{% url "tunneldata" %}">Tunneldata</a> |
- <a href="{% url "survexcavessingle" 107 %}">107</a> |
- <a href="{% url "survexcavessingle" 161 %}">161</a> |
- <a href="{% url "survexcavessingle" 204 %}">204</a> |
- <a href="{% url "survexcavessingle" 258 %}">258</a> |
- <a href="{% url "survexcavessingle" 264 %}">264</a> |
- <a href="{% url "expedition" 2016 %}">Expo2016</a> |
- <a href="{% url "expedition" 2017 %}">Expo2017</a> |
- <a href="{% url "expedition" 2018 %}">Expo2018</a> |
-
- <a href="/admin/">Django admin</a>
-</div>
<div id="nav">
- {% block nav %}
+ {% block nav %}
<!-- Use id="nav" for the left side menu -->
{% endblock %}
</div>
-
-
+
+
<div id="content" >
{% block contentheader %}
@@ -64,8 +131,8 @@
<div id="related">
{% block related %}
<script language="javascript">
- $('#related').remove()
- /*This is a hack to stop a line appearing because of the empty div border*/
+ $('#related').remove()
+ /*This is a hack to stop a line appearing because of the empty div border*/
</script>
{% endblock %}
</div>
@@ -74,40 +141,38 @@
REPLACE : The content
{% endblock %}
- </div>
-
- <div class="footer">
- <ul class="dropdown" id="footerLinks">
+</div>
- <li><a href="#">External links</a>
- <ul class="sub_menu">
- <li><a id="cuccLink" href="http://www.srcf.ucam.org/caving/wiki/Main_Page">CUCC website</a></li>
- <li><a id="expoWebsiteLink" href="http://expo.survex.com">Expedition website</a></li>
- </ul>
- </li>
- <li><a href="{% url "frontpage" %}">Troggle front page</a></li>
- <li><a id="cavesLink" href="{% url "caveindex" %}">caves</a></li>
- <li><a id="caversLink" href="{% url "personindex" %}">cavers</a></li>
- <li><a href="#">expeditions</a>
- <ul class="sub_menu">
- <li><a id="expeditionsLink" href="{{ expedition.objects.latest.get_absolute_url }}">newest</a></li>
- <li><a id="expeditionsLink" href="{% url "expeditions" %}">list all</a></li>
- </ul>
- </li>
- <li><a id="surveyBinderLink" href="{% url "survey" %}">survey binder</a></li>
- <li><a href="#">diversions</a>
- <ul class="sub_menu">
- <li><a href="{% url "stats" %}">statistics</a></li>
- </ul>
- </li>
- <li><a href="#">admin</a>
- <ul class="sub_menu">
- <li><a id="cuccLink" href="{% url "controlpanel" %}">Import / export data</a></li>
- <li><a id="expoWebsiteLink" href="{{ settings.URL_ROOT }}admin">Troggle administration pages</a></li>
- </ul>
- <li class="toggleMenu"><a href="#">hide menu</a></li>
-
- </ul>
- </div>
+<div class="footer">
+ <ul class="dropdown" id="footerLinks">
+ <li><a href="#">External links</a>
+ <ul class="sub_menu">
+ <li><a id="cuccLink" href="http://www.srcf.ucam.org/caving/wiki/Main_Page">CUCC website</a></li>
+ <li><a id="expoWebsiteLink" href="http://expo.survex.com">Expedition website</a></li>
+ </ul>
+ </li>
+ <li><a href="{% url "frontpage" %}">Troggle front page</a></li>
+ <li><a id="cavesLink" href="{% url "caveindex" %}">caves</a></li>
+ <li><a id="caversLink" href="{% url "personindex" %}">cavers</a></li>
+ <li><a href="#">expeditions</a>
+ <ul class="sub_menu">
+ <li><a id="expeditionsLink" href="{{ expedition.objects.latest.get_absolute_url }}">newest</a></li>
+ <li><a id="expeditionsLink" href="{% url "expeditions" %}">list all</a></li>
+ </ul>
+ </li>
+ <li><a id="surveyBinderLink" href="{% url "survey" %}">survey binder</a></li>
+ <li><a href="#">diversions</a>
+ <ul class="sub_menu">
+ <li><a href="{% url "stats" %}">statistics</a></li>
+ </ul>
+ </li>
+ <li><a href="#">admin</a>
+ <ul class="sub_menu">
+ <li><a id="cuccLink" href="{% url "controlpanel" %}">Import / export data</a></li>
+ <li><a id="expoWebsiteLink" href="{{ settings.URL_ROOT }}admin">Troggle administration pages</a></li>
+ </ul>
+ <li class="toggleMenu"><a href="#">hide menu</a></li>
+ </ul>
+</div>
</body>
</html>