pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create a general base layout for public pages

Browse Source 
Make a separate template for login route
This commit is contained in:
Andrew Croce 2018-09-24 16:10:08 -04:00
parent 5868630e1f
commit 55b35f56b8
3 changed files with 76 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
atst/routes/__init__.py
View File

@ -12,7 +12,9 @@ bp = Blueprint("atst", __name__)
@bp.route("/")
def root():
return render_template("root.html")
return render_template("login.html")
@bp.route("/help")
def helpdocs():
return render_template("help/index.html")

67
templates/base_public.html Normal file
View File

@ -0,0 +1,67 @@
{% from "components/icon.html" import Icon %}
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{% block title %}JEDI Cloud{% endblock %}</title>
{% assets "css" %}
<link rel="stylesheet" href="{{ ASSET_URL }}" type="text/css">
{% endassets %}
<link rel="icon" type="image/x-icon" href="/static/img/favicon.ico">
</head>
<body>
<div id='app-root'>
<header class="topbar topbar--public">
<nav class="topbar__navigation">
<a href="{{ url_for('atst.home') }}" class="topbar__link topbar__link--home">
{{ Icon('shield', classes='topbar__link-icon') }}
<span class="topbar__link-label">JEDI Cloud</span>
</a>
{% if g.current_user %}
<a href="/" class="topbar__link">
<span class="topbar__link-label">{{ g.current_user.first_name + " " + g.current_user.last_name }}</span>
{{ Icon('avatar', classes='topbar__link-icon') }}
</a>
<a href="{{ url_for('atst.logout') }}" class="topbar__link" title='Log out of JEDI Cloud'>
{{ Icon('logout', classes='topbar__link-icon') }}
</a>
{% else %}
<a href="{{ url_for('atst.home') }}" class="topbar__link" title='Log in'>
<span class="topbar__link-label">Log in</span>
{{ Icon('avatar', classes='topbar__link-icon') }}
</a>
{% endif %}
</nav>
</header>
{% block content %}{% endblock %}
<footer class='app-footer'>
<div class='app-footer__info'>
<h5 class='app-footer__info__title'>Joint Enterprise Defense Infrastructure</h5>
<a href='/help' class='icon-link app-footer__info__link' target='_blank' rel='noopener noreferrer'>
{{ Icon('help') }}
<span>JEDI Help</span>
</a>
</div>
<dl class='app-footer__browser-support'>
<dt>JEDI Cloud supported on these web browsers</dt>
<dd>Chrome</dd><dd>Firefox</dd><dd>Safari</dd><dd>Edge</dd><dd>IE11 on Windows 10</dd><dd>IE10 on Windows 7</dd>
</footer>
</div>
</body>
</html>

32
templates/root.html → templates/login.html
View File

@ -1,20 +1,10 @@
{% from "components/alert.html" import Alert %}
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{% block title %}JEDI Cloud{% endblock %}</title>
{% assets "css" %}
<link rel="stylesheet" href="{{ ASSET_URL }}" type="text/css">
{% endassets %}
<link rel="icon" type="image/x-icon" href="/static/img/favicon.ico">
</head>
<body>
{% extends "base_public.html" %}
<div id='app-root'>
{% block title %}Sign in | JEDI Cloud{% endblock %}
{% block content %}
<div class='global-layout login-layout'>
<div class='global-panel-container login-container'>
@ -38,7 +28,7 @@
{
'label': 'Learn More',
'icon': 'help',
'href': '/'
'href': '/help'
}
]
) }}
@ -47,16 +37,6 @@
</div>
</div>
<footer class='app-footer'>
<h5>Joint Enterprise Defense Infrastructure</h5>
<dl class='browser-support'>
<dt>JEDI Cloud supported on these web browsers</dt>
<dd>Chrome</dd><dd>Firefox</dd><dd>Safari</dd><dd>Edge</dd><dd>IE11 on Windows 10</dd><dd>IE10 on Windows 7</dd>
</footer>
</div>
</body>
</html>
{% endblock %}