update page titles

4 years ago · 6c130eaca0
parent 94fc5b2d72
commit 6c130eaca0
20 changed files with 52 additions and 45 deletions
--- a/static/css/style.css
+++ b/static/css/style.css
@ -217,6 +217,9 @@ header .site-menu a{
    padding: 0.5em 1em 0.5em 1em;
    margin: 0;
 }
+.left-menu ul:first-child {
+    padding-top: 0;
+}
 .left-menu li {
    padding: 0.3em 0;
 }
@ -276,17 +279,19 @@ header .site-menu a{
 .flex-page-content {
    overflow: auto;
    flex-grow: 2;
-    margin: 2em 1em 2em 1em;
+    margin: 0 1em 2em 1em;
 }
-.flex-page-content .content-box {
+.flex-page .content-box {
    margin: 0;
+}
+.flex-page-content .content-box:not(:first-child) {
    margin-top: 1em;
 }

 .content-box {
    margin: 1em;
    border: 1px solid #bbb;
-    padding: 2em 2em;
+    padding: 1em 2em;
    background: #fff;
    overflow: auto;
    flex-grow: 2;
@ -295,7 +300,6 @@ header .site-menu a{
 -moz-box-shadow: 1px 1px 2px 1px rgba(0,0,0,0.21);
 box-shadow: 1px 1px 2px 1px rgba(0,0,0,0.21);
 }
-
 .flex-page-content h2, .content-box h2 {
    margin-top: 0;
    font-size: 1.5em;
@ -673,7 +677,7 @@ a.home-signup-button {
    width: 100%;
 }

-.account-status table tr {
+.account-status table tr:not(:first-child) {
    border-top: 1px solid #ddd;
 }
 .account-status table td {
--- a/templates/account_layout.html
+++ b/templates/account_layout.html
@ -4,11 +4,14 @@
 {% load static %}

 {% block content %}
-<div class="pure-g">
+<div class="pure-g content">
+    <div class="pure-u-1">
+        <h2>{% block pagetitle %}{{ title|default:"Account" }}{% endblock %}</h2>
+    </div>
+
 <div class="pure-u-1 pure-u-xl-2-3 flex-page">
    <div class="left-menu">
        <div class="submenu">
-            <p class="menu-title"></p>
            <ul>
                <li><a href="/account/">
                    <i class="fa fa-dashboard fa-fw" aria-hidden="true"></i>&nbsp;
--- a/templates/base_help.html
+++ b/templates/base_help.html
@ -3,10 +3,12 @@
 {% load static %}

 {% block content %}
+<div class="content">
+    <h2>{% block pagetitle %}{{ title|default:"Support" }}{% endblock %}</h2>
+
 <div class="flex-page">
    <div class="left-menu">
        <div class="submenu">
-            <p class="menu-title"></p>
            <ul>
                <li class="pure-menu-item">
                    <a href="{% url 'page' 'help' %}">
@ -74,10 +76,8 @@
        </div>
    </div>
    <div class="content-box">
-        {% if title %}
-            <h2>{{ title }}</h2>
-        {% endif %}
        {% block helpdesk_body %}{% endblock %}
    </div>
 </div>
+</div>
 {% endblock %}
--- a/templates/kb/kb_category.html
+++ b/templates/kb/kb_category.html
@ -1,7 +1,8 @@
 {% extends "base_help.html" %}{% load i18n %}{% load i18n humanize %}

+{% block pagetitle %}{% trans 'Knowledge Base' %}: {{ category.name }}{% endblock %}
 {% block helpdesk_body %}
-<h2>{% trans 'Knowledge Base' %}: {{ category.name }}</h2>
+<h2></h2>

 <div class="block padded-block">
    <h3>{{ category.name }}</h3>
--- a/templates/kb/kb_index.html
+++ b/templates/kb/kb_index.html
@ -1,8 +1,7 @@
 {% extends "base_help.html" %}{% load i18n %}

+{% block pagetitle %}{% trans "Knowledge Base" %}{% endblock %}
 {% block helpdesk_body %}
-    <h2>{% trans "Knowledge Base" %}</h2>
-
    <div class="block padded-block">
        <p>{% trans "Please check to see if any of these answers address your problem prior to opening a support ticket." %}</p>

--- a/templates/kb/kb_item.html
+++ b/templates/kb/kb_item.html
@ -1,11 +1,10 @@
 {% extends "base_help.html" %}{% load i18n humanize %}

+{% block pagetitle %}{{ item.question }}{% endblock %}
 {% block helpdesk_body %}

-<h2>{{ item.question }}</h2>
 {{ item.answer|safe }}

-
 {% if request.user.is_authenticated %}
    <hr />
    <div class="block block-note kb-question-meta">
--- a/templates/lambdainst/account.html
+++ b/templates/lambdainst/account.html
@ -2,6 +2,7 @@
 {% load i18n %}
 {% load static %}

+{% block pagetitle %}Account{% endblock %}
 {% block headers %}
 {% endblock %}

@ -14,9 +15,11 @@
    {% endif %}

    <div class="content-box account-status">
-        <h3>{% trans 'Account' %} : {{user.username}}</h3>
-
        <table>
+            <tr>
+                <td>{% trans "Username" %}</td>
+                <td>{{user.username}}</td>
+            </tr>
            <tr>
                <td>{% trans "Status" %}</td>
                <td class="account-status__status">
--- a/templates/lambdainst/config.html
+++ b/templates/lambdainst/config.html
@ -2,9 +2,9 @@
 {% load i18n %}
 {% load static %}

+{% block pagetitle %}{% trans 'OpenVPN Configuration' %}{% endblock %}
 {% block account_content %}
 <div>
-    <h2>{% trans 'Config' %}</h2>
    <form action="/account/config_dl" method="get" class="pure-form pure-form-aligned">
        <fieldset>
            <div class="pure-control-group">
--- a/templates/lambdainst/settings.html
+++ b/templates/lambdainst/settings.html
@ -2,10 +2,9 @@
 {% load i18n %}
 {% load static %}

+{% block pagetitle %}{% trans 'Account Settings' %}{% endblock %}
 {% block account_content_outer %}
 <div class="flex-page-content account-settings">
-    <h2>{% trans 'Settings' %}</h2>
-
    <div class="content-box">
        <h3>{% trans 'Change e-mail address' %}</h3>

--- a/templates/lambdainst/wireguard.html
+++ b/templates/lambdainst/wireguard.html
@ -2,10 +2,8 @@
 {% load static %}
 {% load i18n %}

-{% block title %}WireGuard{% endblock %}
+{% block pagetitle %}{% trans 'WireGuard' %}{% endblock %}
 {% block account_content %}
-    <h2>WireGuard</h2>
-
    <p>
        {% blocktrans trimmed %}
        This page lets you manage <a href="https://www.wireguard.com/">WireGuard</a> clients.
--- a/templates/lambdainst/wireguard_new.html
+++ b/templates/lambdainst/wireguard_new.html
@ -2,10 +2,8 @@
 {% load static %}
 {% load i18n %}

-{% block title %}WireGuard - {% trans "New Device" %}{% endblock %}
+{% block pagetitle %}{% trans 'WireGuard' %} - {% trans "New Device" %}{% endblock %}
 {% block account_content %}
-    <h2>WireGuard - {% trans "New Device" %}</h2>
-
    <form method="post" class="pure-form pure-form-aligned">
        {% csrf_token %}
        <input type="hidden" name="action" value="add_key" />
--- a/templates/payments/cancel_subscr.html
+++ b/templates/payments/cancel_subscr.html
@ -2,11 +2,10 @@
 {% load i18n %}
 {% load static %}

+{% block pagetitle %}{% trans 'Cancel Subscription' %}{% endblock %}
 {% block account_content %}

 <div class="payments-cancel-page">
-    <h2>{% trans 'Cancel Subscription' %}</h2>
-
    {% if subscription %}
        <form action="/payments/cancel_subscr/{{subscription.id}}" method="post" class="pure-form centered-form" id="cancel-form">
            {% csrf_token %}
--- a/templates/payments/form.html
+++ b/templates/payments/form.html
@ -2,10 +2,9 @@
 {% load i18n %}
 {% load static %}

+{% block pagetitle %}{% trans 'Payment' %}{% endblock %}
 {% block account_content %}
 <section id="account">
-    <h2>{% trans 'Payment' %}</h2>
-
    {{ html | safe }}
 </section>

--- a/templates/payments/list.html
+++ b/templates/payments/list.html
@ -2,9 +2,8 @@
 {% load i18n %}
 {% load static %}

+{% block pagetitle %}{% trans 'Payments' %}{% endblock %}
 {% block account_content %}
-<h2>{% trans 'Payments' %}</h2>
-
 <table class="admin-list">
    <thead>
        <tr>
--- a/templates/payments/view.html
+++ b/templates/payments/view.html
@ -8,12 +8,12 @@
    {% endif %}
 {% endblock %}

+{% block pagetitle %}
+    {% trans 'Payment' %} #{{payment.id}}:
+        {{ payment.get_status_display }}
+{% endblock %}
 {% block account_content %}
 <section id="account">
-    <h2>{% trans 'Payment' %} #{{payment.id}}:
-        {{ payment.get_status_display }}
-    </h2>
-
    {% if payment.status_message %}
        <p><b>{{payment.status_message}}</b></p>
    {% endif %}
--- a/templates/tickets/index.html
+++ b/templates/tickets/index.html
@ -2,8 +2,8 @@
 {% load i18n %}
 {% load static %}

+{% block pagetitle %}{% trans 'Your Tickets' %}{% endblock %}
 {% block tickets_content %}
-<h2>{% trans 'Tickets' %}</h2>

 <p>{% trans 'Before creating a ticket, please check if you question is convered in' %}
    <a href="/page/faq">{% trans 'the FAQ' %}</a>.
--- a/templates/tickets/layout.html
+++ b/templates/tickets/layout.html
@ -3,6 +3,9 @@
 {% load static %}

 {% block content %}
+<div class="content">
+    <h2>{% block pagetitle %}{{ title|default:"Support" }}{% endblock %}</h2>
+
 <div class="flex-page">
    <div class="left-menu">
        <div class="submenu">
@ -54,5 +57,6 @@
        {% block tickets_content %}{% endblock %}
    </div>
 </div>
+</div>
 {% endblock %}

--- a/templates/tickets/list.html
+++ b/templates/tickets/list.html
@ -2,8 +2,8 @@
 {% load i18n %}
 {% load static %}

+{% block pagetitle %}{% trans 'Tickets' %}{% endblock %}
 {% block tickets_content %}
-<h2>{% trans 'Tickets' %}</h2>

 {% if tickets %}
    <table class="admin-list">
--- a/templates/tickets/new.html
+++ b/templates/tickets/new.html
@ -2,10 +2,9 @@
 {% load i18n %}
 {% load static %}

+{% block pagetitle %}{% trans 'New Ticket' %}{% endblock %}
 {% block tickets_content %}
 <div class="formpage">
-    <h2>{% trans 'New Ticket' %}</h2>
-
    <form class="pure-form pure-form-stacked" action="" method="post">
        {% csrf_token %}
        {{ form }}
--- a/templates/tickets/view.html
+++ b/templates/tickets/view.html
@ -2,12 +2,15 @@
 {% load i18n %}
 {% load static %}

-{% block tickets_content %}
-<div class="formpage">
-    <h2>{% trans 'Ticket:' %} {{ ticket.subject }}
+{% block pagetitle %}
+    {% trans 'Ticket:' %} {{ ticket.subject }}
    {% if not ticket.is_open %}
        <b>[{% trans 'closed' %}]</b>
    {% endif %}
+{% endblock %}
+{% block tickets_content %}
+<div class="formpage">
+    <h2>
    </h2>

    <div class="ticket-messages">