Commit e363ad3e authored by David Seaward's avatar David Seaward

updates

* switch all layouts
* update dependencies (add confusable_homoglyphs)
* add homoglyph files to gitignore
parent 9d701796
......@@ -4,6 +4,8 @@
docs/api/
*.pid
categories.json
confusables.json
### Basic template
......
......@@ -2,47 +2,71 @@
<!--
Copyright 2017 Purism SPC and contributors
https://plan.puri.st/app/account_web
SPDX-License-Identifier: CC-BY-SA-4.0
https://plan.puri.st/module/middleware
SPDX-License-Identifier: AGPL-3.0
-->
<html lang="en">
<head>
<link rel="stylesheet" href="{% static 'PuristFlex.css' %}"/>
<link rel="stylesheet" href="{% static 'layout.css' %}"/>
<link rel="stylesheet" href="{% static 'theme.css' %}"/>
<title>{{ site_title }} - {{ site_byline }}</title>
<link rel="icon" sizes="960x960" href="{% static 'favicon.png' %}">
<meta name="application-name" content="{{ site_title }}">
<meta charset="UTF-8">
<link rel="icon" sizes="960x960" href="{% static 'favicon.png' %}"/>
<meta name="application-name" content="{{ site_title }}"/>
<meta charset="UTF-8"/>
</head>
<body style="text-align: center">
<body>
<p style="text-align: right">
{% if request.user.is_authenticated %}
{% trans "Logged in as" %} {{ username }}<br/>
<a href="{% url 'profile' %}">{% trans "Profile" %}</a> |
<header>
{% if request.user.is_superuser %}
<a href="{% url 'admin:index' %}">{% trans "Admin" %}</a> |
{% endif %}
<div id="title_box">
<a href="{% url 'home' %}"><img class="logo" src="{% static 'logo.png' %}" alt="{{ site_title }}"/></a>
<div id="title_text">
<h1>{{ site_title }}</h1>
<p>{{ site_byline }}</p>
</div>
</div>
<a href="{% url 'auth_logout' %}">{% trans "Log out" %}</a>
{% else %}
{% trans "You are not logged in." %}<br/>
<a href="{% url 'auth_login' %}">{% trans "Log in" %}</a> {% trans "or" %}
<a href="{% url 'registration_register' %}">{% trans "register." %}</a>
{% endif %}
</p>
<div id="log_state">
{% if request.user.is_authenticated %}
{% trans "Logged in as" %} {{ username }}<br/>
<a href="{% url 'profile' %}">{% trans "Profile" %}</a> |
<h1><img style="max-height: 50vh; max-width: 50vw" src="{% static 'logo.png' %}" alt="{{ site_title }}"/></h1>
{% if request.user.is_superuser %}
<a href="{% url 'admin:index' %}">{% trans "Admin" %}</a> |
{% endif %}
<p>{{ site_byline }}</p>
<a href="{% url 'auth_logout' %}">{% trans "Log out" %}</a>
{% else %}
{% trans "You are not logged in." %}<br/>
<a href="{% url 'auth_login' %}">{% trans "Log in" %}</a> {% trans "or" %}
<a href="{% url 'registration_register' %}">{% trans "register." %}</a>
{% endif %}
</div>
<p style="font-size: small">
Services provided by <a href="https://puri.sm">Purism SPC</a><br/>
Middleware copyright 2017 Purism SPC and contributors. Shared under AGPL-3.0+
(<a href="https://plan.puri.st">project</a>, <a href="{% url 'download-zip' %}">source</a>)
</p>
</header>
<hr/>
<main>
<article>
</article>
</main>
<footer>
<div id="footer_block">
<p>
<em>Purist services</em> provided by <a href="https://puri.sm">Purism SPC</a><br/>
<em>Services middleware</em> copyright 2017 Purism SPC and contributors; shared under AGPL-3.0+
(<a href="https://plan.puri.st">project</a>, <a href="{% url 'download-zip' %}">source</a>, <a href="">javascript</a>)
</p>
</div>
</footer>
</body>
</html>
......@@ -2,27 +2,24 @@
{% load i18n %} {% load static %}
<!--
Page content, copyright 2017 Purism SPC and contributors
https://plan.puri.st/app/account_web
SPDX-License-Identifier: CC-BY-SA-4.0
Original registration template, copyright 2015 Anders Hofstee and contributors
https://github.com/RatanShreshtha/django-registration-templates
SPDX-License-Identifier: MIT
Copyright 2017 Purism SPC and contributors
https://plan.puri.st/module/middleware
SPDX-License-Identifier: AGPL-3.0
-->
<html lang="en">
<head>
<link rel="stylesheet" href="{% static 'PuristFlex.css' %}"/>
<link rel="stylesheet" href="{% static 'layout.css' %}"/>
<link rel="stylesheet" href="{% static 'theme.css' %}"/>
<title>{% block title %}Base{% endblock %}</title>
<link rel="icon" sizes="960x960" href="{% static 'favicon.png' %}">
<meta name="application-name" content="Purist">
<meta charset="UTF-8">
<link rel="icon" sizes="960x960" href="{% static 'favicon.png' %}"/>
<meta name="application-name" content="Purist"/>
<meta charset="UTF-8"/>
</head>
<body>
<header style="justify-content: space-between;">
<header>
<div id="title_box">
<a href="{% url 'home' %}"><img class="logo" src="{% static 'logo.png' %}" alt="Purist"/></a>
<div id="title_text">
......@@ -47,11 +44,27 @@ SPDX-License-Identifier: MIT
</header>
<div id="main">
<hr/>
<main>
<article>
{% block content %}{% endblock %}
</article>
</div>
</main>
<footer>
<div id="footer_block">
<p>
<em>Purist services</em> provided by <a href="https://puri.sm">Purism SPC</a><br/>
<em>Services middleware</em> copyright 2017 Purism SPC and contributors; shared under AGPL-3.0+
(<a href="https://plan.puri.st">project</a>, <a href="{% url 'download-zip' %}">source</a>, <a href="">javascript</a>)
</p>
</div>
</footer>
</body>
</html>
......@@ -5,23 +5,19 @@
{% block byline %}{% trans 'Please fill in your credentials' %}{% endblock %}
{% block content %}
<br/>
<!-- Main Content -->
<main class="container">
<section class="row">
<section class="col-lg-4 col-lg-offset-4 col-md-4 col-md-offset-5">
<form method="post" action=".">
{% csrf_token %} {{ form|crispy}}
<section class="row">
<section class="form">
<form method="post" action=".">
{% csrf_token %} {{ form|crispy}}
<div class="submit-group">
<input type="submit" value="{% trans 'Log in' %}"/>
<input type="hidden" name="next" value="{{ next }}"/>
</form>
</section>
</div>
</form>
</section>
</main>
</section>
<p class="text-center">{% trans "No account yet?" %}
<a href="{% url 'registration_register' %}">{% trans "Register!" %}</a>
</p>
{% endblock %}
......@@ -5,17 +5,18 @@
{% block byline %}{% trans 'Please fill in your registration details' %}{% endblock %}
{% block content %}
<br/>
<!-- Main Content -->
<main class="container">
<section class="row">
<section class="col-lg-4 col-lg-offset-4 col-md-4 col-md-offset-5">
<form method="post" action=".">
{% csrf_token %} {{ form|crispy}}
<input type="submit" value="{% trans 'Submit' %}"/>
</form>
<section class="row">
<section class="form">
<form method="post" action=".">
{% csrf_token %} {{ form|crispy}}
<div class="submit-group">
<input type="submit" value="{% trans 'Submit' %}"/>
</div>
</form>
</section>
</section>
</main>
</section>
{% endblock %}
......@@ -2,29 +2,32 @@
<!--
Copyright 2017 Purism SPC and contributors
https://plan.puri.st/app/account_web
SPDX-License-Identifier: CC-BY-SA-4.0
https://plan.puri.st/module/middleware
SPDX-License-Identifier: AGPL-3.0
-->
<html lang="en">
<head>
<link rel="stylesheet" href="{% static 'PuristFlex.css' %}"/>
<link rel="stylesheet" href="{% static 'layout.css' %}"/>
<link rel="stylesheet" href="{% static 'theme.css' %}"/>
<title>{% trans "User profile" %}</title>
<link rel="icon" sizes="960x960" href="{% static 'favicon.png' %}">
<meta name="application-name" content="{{ site_title }}">
<meta charset="UTF-8">
<link rel="icon" sizes="960x960" href="{% static 'favicon.png' %}"/>
<meta name="application-name" content="{{ site_title }}"/>
<meta charset="UTF-8"/>
</head>
<body>
<header style="justify-content: space-between;">
<header>
<div id="title_box">
<a href="{% url 'home' %}"><img class="logo" src="{% static 'logo.png' %}" alt="Purist"/></a>
<a href="{% url 'home' %}"><img class="logo" src="{% static 'logo.png' %}" alt="{{ site_title }}"/></a>
<div id="title_text">
<h1>{% trans "User profile" %}</h1>
<p>{% trans "Service credit and profile management" %}</p>
</div>
</div>
<div id="log_state">
{% if request.user.is_authenticated %}
{% trans "Logged in as" %} {{ username }}<br/>
......@@ -44,7 +47,9 @@ SPDX-License-Identifier: CC-BY-SA-4.0
</header>
<div id="main">
<hr/>
<main>
<article>
<h2>{% trans "Services" %}</h2>
......@@ -96,7 +101,19 @@ SPDX-License-Identifier: CC-BY-SA-4.0
</ul>
</article>
</div>
</main>
<footer>
<div id="footer_block">
<p>
<em>Purist services</em> provided by <a href="https://puri.sm">Purism SPC</a><br/>
<em>Services middleware</em> copyright 2017 Purism SPC and contributors; shared under AGPL-3.0+
(<a href="https://plan.puri.st">project</a>, <a href="{% url 'download-zip' %}">source</a>, <a href="">javascript</a>)
</p>
</div>
</footer>
</body>
</html>
-r dependencies.txt
celery==4.1.0
confusable_homoglyphs==2.0.2
dj-database-url==0.4.2
Django==1.11.5
django-agpl==4.0.0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment