Skip to content
Snippets Groups Projects
Commit e6a927b0 authored by Nico Vermaas's avatar Nico Vermaas
Browse files

small styling issue

parent ec92b5a1
No related branches found
No related tags found
1 merge request!276Astronauth integration
Pipeline #43697 failed
Stage: build
Stage: deploy_to_test
Stage: deploy_to_production
Show whitespace changes
Inline Side-by-side
atdb/atdb/settings/dev.py
+ 1
− 1
View file @ e6a927b0
...@@ -32,4 +32,4 @@ SOCIALACCOUNT_PROVIDERS = { ...@@ -32,4 +32,4 @@ SOCIALACCOUNT_PROVIDERS = {
} }
} }
LOGIN_REDIRECT_URL = "http://localhost:8000/" LOGIN_REDIRECT_URL = "http://localhost:8000/atdb"
atdb/taskdatabase/templates/astronauth/base.html 0 → 100644
+ 25
− 0
View file @ e6a927b0
{% 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>
atdb/taskdatabase/templates/astronauth/navbar.html
+ 55
− 36
View file @ e6a927b0
{% load static %} {% load static %}
{% load account %} {% 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> <nav class="navbar navbar-expand-lg navbar-light bg-light">
<div class="container-fluid">
{% if user.is_authenticated and user.is_staff %} <ul class="nav navbar-nav">
<li class="h-navbar-list__item"> <!-- Header -->
<a class="button text--primary" href="{% url 'admin:index' %}"> <li><a class="navbar-brand" href="{% url 'index' %}">
Admin Page <img src="{% static 'taskdatabase/new_ldv_logo.png' %}" height="30" alt="">
</a> &nbsp;ATDB</a>
</li> </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 %} {% endif %}
</ol>
<ul class="h-navbar-list margin-right"> </ul>
<ul class="nav navbar-nav">
{% if "/login/" in request.path or "/logout/" in request.path %} {% if "/login/" in request.path or "/logout/" in request.path %}
{# don't render antyhing #} {# don't render antyhing #}
{% elif user.is_authenticated %} {% elif user.is_authenticated %}
<li class="h-navbar-list__item"> <li class="h-navbar-list__item">
Logged in as:<p class="text text--semi-bold margin-left"> {{ user.get_username }}</p> <a class="button button--secondary margin-right" href="{% url 'account_logout' %}">Sign Out {{ user.get_username }}</a>
</li>
<li class="h-navbar-list__item">
<a class="button button--secondary margin-right" href="{% url 'account_logout' %}">Logout</a>
</li> </li>
{% else %} {% else %}
<li class="h-navbar-list__item"> <li class="h-navbar-list__item">
<a class="button button--secondary margin-right" href="{% url 'account_login' %}">Sign in</a> <a class="button button--secondary margin-right" href="{% url 'account_login' %}">Sign In</a>
</li> </li>
{% endif %} {% endif %}
</ul> </ul>
</div>
</nav>
\ No newline at end of file
atdb/taskdatabase/templates/taskdatabase/base.html
+ 2
− 51
View file @ e6a927b0
...@@ -27,62 +27,13 @@ ...@@ -27,62 +27,13 @@
<link rel="stylesheet" type="text/css" href="{% static 'taskdatabase/style.css' %}"/> <link rel="stylesheet" type="text/css" href="{% static 'taskdatabase/style.css' %}"/>
<link rel="icon" href="{% static 'favicon.ico' %}"> <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> </head>
<body onload="readFromLocalStorage('search_box')"> <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="">
&nbsp;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> {% include "astronauth/navbar.html" %}
<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>
{% for message in messages %} {% for message in messages %}
<div class="container-fluid p-0"> <div class="container-fluid p-0">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment