From e6a927b069ba2ad1629e120f8fefb336d2688ca5 Mon Sep 17 00:00:00 2001
From: vermaas <vermaas@astron.nl>
Date: Mon, 6 Feb 2023 17:02:51 +0100
Subject: [PATCH] small styling issue
---
atdb/atdb/settings/dev.py | 2 +-
.../templates/astronauth/base.html | 25 +++++
.../templates/astronauth/navbar.html | 91 +++++++++++--------
.../templates/taskdatabase/base.html | 53 +----------
4 files changed, 83 insertions(+), 88 deletions(-)
create mode 100644 atdb/taskdatabase/templates/astronauth/base.html
diff --git a/atdb/atdb/settings/dev.py b/atdb/atdb/settings/dev.py
index 8d068e9f..9bf71edb 100644
--- a/atdb/atdb/settings/dev.py
+++ b/atdb/atdb/settings/dev.py
@@ -32,4 +32,4 @@ SOCIALACCOUNT_PROVIDERS = {
}
}
-LOGIN_REDIRECT_URL = "http://localhost:8000/"
+LOGIN_REDIRECT_URL = "http://localhost:8000/atdb"
diff --git a/atdb/taskdatabase/templates/astronauth/base.html b/atdb/taskdatabase/templates/astronauth/base.html
new file mode 100644
index 00000000..c87a64cc
--- /dev/null
+++ b/atdb/taskdatabase/templates/astronauth/base.html
@@ -0,0 +1,25 @@
+{% load static %}
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+ <meta charset="utf-8">
+
+ <title>{% block head_title %}{% endblock %} - ASTRONauth</title>
+
+ <link rel="stylesheet" type="text/css" href="{% static 'taskdatabase/style.css' %}"/>
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css">
+ <link href='https://fonts.googleapis.com/css?family=Raleway' rel='stylesheet' type='text/css'>
+ <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.2/css/all.css" integrity="sha384-/rXc/GQVaYpyDdyxK+ecHPVYJSN9bmVFBvjA/9eOB+pb3F2w2N6fc5qB9Ew5yIns" crossorigin="anonymous">
+
+ <link rel="stylesheet" href="{% static 'astronauth/css/dias.css' %}">
+ <link rel="stylesheet" href="{% static 'astronauth/css/custom.css' %}">
+
+</head>
+
+<body>
+ {% include "astronauth/navbar.html" %}
+ {% block content %}{% endblock %}
+</body>
+
+</html>
diff --git a/atdb/taskdatabase/templates/astronauth/navbar.html b/atdb/taskdatabase/templates/astronauth/navbar.html
index 2e4a6bda..4acbe6f4 100644
--- a/atdb/taskdatabase/templates/astronauth/navbar.html
+++ b/atdb/taskdatabase/templates/astronauth/navbar.html
@@ -1,39 +1,58 @@
{% load static %}
{% load account %}
-<nav class="h-navbar custom--navbar">
- <ol class="h-navbar-list">
- <li class="h-navbar-list__item">
- <a href="{% url 'index' %}">
- <img class="h-navbar-logo" src="{% static 'astronauth/images/astronauth.svg' %}"
- alt="ASTRONauth" />
- </a>
- </li>
-
- <li class="h-navbar-list__item">Custom Header</li>
-
- {% if user.is_authenticated and user.is_staff %}
- <li class="h-navbar-list__item">
- <a class="button text--primary" href="{% url 'admin:index' %}">
- Admin Page
- </a>
- </li>
- {% endif %}
- </ol>
-
- <ul class="h-navbar-list margin-right">
- {% if "/login/" in request.path or "/logout/" in request.path %}
- {# don't render antyhing #}
- {% elif user.is_authenticated %}
- <li class="h-navbar-list__item">
- Logged in as:<p class="text text--semi-bold margin-left"> {{ user.get_username }}</p>
- </li>
- <li class="h-navbar-list__item">
- <a class="button button--secondary margin-right" href="{% url 'account_logout' %}">Logout</a>
- </li>
- {% else %}
- <li class="h-navbar-list__item">
- <a class="button button--secondary margin-right" href="{% url 'account_login' %}">Sign in</a>
- </li>
- {% endif %}
- </ul>
+
+ <nav class="navbar navbar-expand-lg navbar-light bg-light">
+ <div class="container-fluid">
+
+ <ul class="nav navbar-nav">
+ <!-- Header -->
+ <li><a class="navbar-brand" href="{% url 'index' %}">
+ <img src="{% static 'taskdatabase/new_ldv_logo.png' %}" height="30" alt="">
+ ATDB</a>
+ </li>
+
+ <li><a class="nav-link" href="{% url 'index' %}">Tasks</a></li>
+ {% comment %}
+ <li><a class="nav-link" href="{% url 'postprocessing-tasks' %}">PostProcessing</a></li>
+ {% endcomment %}
+
+ {% if user.is_authenticated %}
+ <li><a class="nav-link" href="{% url 'task-details'%}">Task Details</a></li>
+ {% endif %}
+
+ <li><a class="nav-link" href="{% url 'dashboard' 'active_nores_nofilter' %}">Dashboard</a></li>
+
+ <li><a class="nav-link" href="{% url 'query' %}">Filter</a></li>
+
+ <li><a class="nav-link" href="{% url 'quality' %}">Quality</a></li>
+ <li><a class="nav-link" href="{% url 'validation' %}">Validation</a></li>
+ <li><a class="nav-link" href="{% url 'failures' %}">Failures</a></li>
+ <li><a class="nav-link" href="{% url 'archived' %}">Archived</a></li>
+ <li><a class="nav-link" href="{% url 'monitoring' %}">Monitoring</a></li>
+ <li><a class="nav-link" href="{% url 'diagram' %}">Diagram</a></li>
+
+ {% if user.is_superuser %}
+ <li><a class="nav-link" href="{% url 'config' %}">Configuration</a></li>
+ <li><a class="nav-link" href="{% url 'admin:index' %}" target="_blank">Admin</a></li>
+ {% endif %}
+
+ </ul>
+
+ <ul class="nav navbar-nav">
+ {% if "/login/" in request.path or "/logout/" in request.path %}
+ {# don't render antyhing #}
+ {% elif user.is_authenticated %}
+
+ <li class="h-navbar-list__item">
+ <a class="button button--secondary margin-right" href="{% url 'account_logout' %}">Sign Out {{ user.get_username }}</a>
+ </li>
+ {% else %}
+ <li class="h-navbar-list__item">
+ <a class="button button--secondary margin-right" href="{% url 'account_login' %}">Sign In</a>
+ </li>
+ {% endif %}
+ </ul>
+ </div>
+
+ </nav>
\ No newline at end of file
diff --git a/atdb/taskdatabase/templates/taskdatabase/base.html b/atdb/taskdatabase/templates/taskdatabase/base.html
index 4e81c7b5..92f5949b 100644
--- a/atdb/taskdatabase/templates/taskdatabase/base.html
+++ b/atdb/taskdatabase/templates/taskdatabase/base.html
@@ -27,62 +27,13 @@
<link rel="stylesheet" type="text/css" href="{% static 'taskdatabase/style.css' %}"/>
<link rel="icon" href="{% static 'favicon.ico' %}">
- <link rel="stylesheet" href="{% static 'astronauth/css/dias.css' %}">
- {% block extra_js %}{% endblock %}
+ {% block extra_js %}{% endblock %}
</head>
<body onload="readFromLocalStorage('search_box')">
- {% include "astronauth/navbar.html" %}
- <nav class="navbar navbar-expand-lg navbar-light bg-light">
- <div class="container-fluid">
-
-
- <ul class="nav navbar-nav">
- <!-- Header -->
- <li><a class="navbar-brand" href="{% url 'index' %}">
- <img src="{% static 'taskdatabase/new_ldv_logo.png' %}" height="30" alt="">
- ATDB</a>
- </li>
-
- <li><a class="nav-link" href="{% url 'index' %}">Tasks</a></li>
-{% comment %}
- <li><a class="nav-link" href="{% url 'postprocessing-tasks' %}">PostProcessing</a></li>
-{% endcomment %}
-
- {% if user.is_authenticated %}
- <li><a class="nav-link" href="{% url 'task-details'%}">Task Details</a></li>
- {% endif %}
-
- <li><a class="nav-link" href="{% url 'dashboard' 'active_nores_nofilter' %}">Dashboard</a></li>
-
- <li><a class="nav-link" href="{% url 'query' %}">Filter</a></li>
-
- <li><a class="nav-link" href="{% url 'quality' %}">Quality</a></li>
- <li><a class="nav-link" href="{% url 'validation' %}">Validation</a></li>
- <li><a class="nav-link" href="{% url 'failures' %}">Failures</a></li>
- <li><a class="nav-link" href="{% url 'archived' %}">Archived</a></li>
-
- <li><a class="nav-link" href="{% url 'monitoring' %}">Monitoring</a></li>
-
- <li><a class="nav-link" href="{% url 'diagram' %}">Diagram</a></li>
-
- {% if user.is_superuser %}
- <li><a class="nav-link" href="{% url 'config' %}">Configuration</a></li>
- <li><a class="nav-link" href="{% url 'admin:index' %}" target="_blank">Admin</a></li>
- {% endif %}
-
- </ul>
-
- {% if user.is_authenticated %}
- <a class="nav-link" href="{% url 'logout' %}" target="_blank">Logout {{ user.get_username }}</a>
- {% endif %}
- {% if not user.is_authenticated %}
- <a class="nav-link" href="{% url 'login' %}" target="_blank">Login</a>
- {% endif %}
- </div>
- </nav>
+ {% include "astronauth/navbar.html" %}
{% for message in messages %}
<div class="container-fluid p-0">
--
GitLab