From 0db1607f99d85e6aa7b9f8e51d4a94b8b00f6fd0 Mon Sep 17 00:00:00 2001
From: unknown <zack@wongbox.internal.wongworks.net>
Date: Fri, 3 Jan 2020 14:25:16 +0800
Subject: [PATCH] separate navbar
---
src/static/base_navbar.scss | 30 ++++++++++++++
src/templates/base.html | 78 ++++++++++---------------------------
2 files changed, 51 insertions(+), 57 deletions(-)
create mode 100644 src/static/base_navbar.scss
diff --git a/src/static/base_navbar.scss b/src/static/base_navbar.scss
new file mode 100644
index 0000000..07c9a24
--- /dev/null
+++ b/src/static/base_navbar.scss
@@ -0,0 +1,30 @@
+.navbar {
+ position: -webkit-sticky;
+ position: sticky;
+ top: 0;
+ z-index: 1071;
+}
+
+.nav .nav-item .nav-link {
+ color: rgba(0, 0, 0, 0.65);
+ font-weight: 400;
+}
+
+.navbar-dark .navbar-nav .nav-link {
+ color: #fefefe;
+}
+
+.navbar .active {
+ background-color: #343a40;
+}
+
+.dropdown-menu {
+ padding-top: 0;
+ padding-bottom: 0;
+ margin: 1px 0.125rem 0 0;
+}
+
+.dropdown-item:hover {
+ background-color: #3e454c;
+ color: #ffffff;
+}
diff --git a/src/templates/base.html b/src/templates/base.html
index 5538521..fe375b9 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -35,63 +35,7 @@
<body {% block bodyattrs %}{% endblock %}>
<!-- Container -->
{% block navbar %}
- <nav class="navbar navbar-expand-lg grey-900 navbar-dark fixed-top flex-md-nowrap p-0 shadow">
-
- <a class="navbar-brand col-sm-3 col-md-1 mr-0" title="UCCPortal homepage">
- <div class="font-weight-bold text-light float-left font-italic" text-light>UCCPORTAL</div>
- <span class="nav-item float-left logo"></span>
- </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">
- {% with url_name=request.resolver_match.url_name %}
- <div class="navbar-nav mr-auto">
- {% if not request.user.is_authenticated or request.user.is_staff %}
- {% endif %}
-
- {% if request.member %}
- <a class="nav-item nav-link {{membership}}" href="{% url "memberdb:home" %}">Membership </a>
- <a class="nav-item nav-link disabled" >Account</a>
- {% endif %}
-
- {% if request.user.is_staff %}
- <a class="nav-item nav-link {% block adminactive %}{% endblock %}" href="{% url "admin:index" %}">
- Admin
- </a>
- <a class="nav-item nav-link {% if url_name == 'register' %}active{% endif %}" href="{% url "memberdb:register" %}">Add Member</a>
- {% endif %}
-
- </div>
-
- <div class="navbar-nav">
- {% if request.user.is_authenticated and request.member %}
-
- <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
- <i class="icon md-18 md-light" data-feather="user"></i>
- Welcome, {{ request.user.username }}
- <!--<div class="navbar-nav userinfo{ if request.user.is_authenticated %}{ if request.member %} groups{ endif %}">
- { if request.member %}
- { for g in request.member.groups %}<span class="group { g }}">{ g }}</span>{ endfor %}
- { endif %}
- </div>-->
- </a>
- <div class="dropdown-menu dropdown-menu-right text-dark" aria-labelledby="navbarDropdownMenuLink">
- <a class="dropdown-item disabled" > Dark theme: off</a>
- <div class="dropdown-divider m-0"></div>
- <a class="dropdown-item" href="{% url "memberdb:logout" %}">Logout</a>
- </div>
- </div>
- {%else%}
- <a class="btn btn-dark btn-sm my-1 border-light" href='{% url "memberdb:register" %}'>Signup</a>
- <a class="nav-item nav-link" href="{% url "memberdb:login" %}">Login</a>
- {%endif%}
- </div>
- {% endwith %}
- </div>
- </nav>
+ {%include 'base_navbar.html' %}
{% endblock %}
<!-- Alerts -->
@@ -137,7 +81,27 @@
{% if DEPLOYMENT_ENV != "PROD" and DEPLOYMENT_ENV != "MOCK" %}
+<div class="watermark">{{DEPLOYMENT_ENV}}</div>
<!-- must be inline as it uses django template tags -->
+<style>
+ .watermark {
+ position: fixed;
+ transform: translate(-50%, -50%);
+ opacity: 0.3;
+ {% if DEPLOYMENT_ENV == "STAGE" %}
+ color: RED;
+ {% else %}
+ color: GREEN;
+ {% endif %}
+ font-size: 15em;
+ top: 50%;
+ left: 50%;
+ pointer-events: none;
+ box-sizing: unset;
+ }
+</style>
+{%endif %}
+
</div>
<!-- END Container -->
--
GitLab