Skip to content
This repository was archived by the owner on Dec 11, 2018. It is now read-only.

Commit 71a5fdc

Browse files
bd808bd808
committed
Lots of nav cleanup
1 parent eb7942a commit 71a5fdc

File tree

25 files changed

+137
-65
lines changed

25 files changed

+137
-65
lines changed

‎data/i18n/en.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
"footer-contact": "contact",
4444

4545
"login": "Log in",
46-
"username": "Username:",
47-
"password": "Password:",
46+
"username": "Username",
47+
"password": "Password",
4848
"login-success": "Login successful.",
4949
"login-failed": "Login failed.",
5050
"login-error": "Username and password required.",

‎data/templates/404.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{% extends "base.html" %}
2+
{% block title %}{{ '404-header'|message }} - {{ parent() }}{% endblock title %}
23
{% block content %}
34
{% spaceless %}
45
<div class="row">

‎data/templates/admin/base.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
{% extends "base_auth.html" %}
1+
{% extends "base.html" %}
2+
{% block title %}{% block subtitle %}{% endblock subtitle %} - {{ parent() }}{% endblock title %}

‎data/templates/admin/user.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
{% set u = flash.form_defaults %}
66
{% endif %}
77

8+
{% block subtitle %}{{ 'nav-users'|message }}{% endblock %}
89
{% block content %}
910
{% spaceless %}
1011
<ol class="breadcrumb">

‎data/templates/admin/users.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{% extends "admin/base.html" %}
22

3+
{% block subtitle %}{{ 'nav-users'|message }}{% endblock %}
34
{% block content %}
45
{% spaceless %}
56
<ol class="breadcrumb">

‎data/templates/base.html‎

Lines changed: 14 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -30,42 +30,21 @@
3030
<div class="navbar-collapse collapse">
3131
<ul class="nav navbar-nav">
3232
{% block navbar %}
33-
<li class="dropdown">
34-
<a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ 'nav-proposals'|message }} <b class="caret"></b></a>
35-
<ul class="dropdown-menu">
36-
<li><a href="{{ urlFor( 'proposals_queue' ) }}">{{ 'nav-proposals-queue'|message }}</a></li>
37-
<li><a href="{{ urlFor( 'proposals_search' ) }}">{{ 'nav-proposals-search'|message }}</a></li>
38-
{% if isadmin|default(false) %}
39-
<li><a href="{{ urlFor( 'proposals_edit', { 'id': 'new' } ) }}">{{ 'nav-proposals-add'|message }}</a></li>
40-
{% endif %}
41-
</ul>
42-
</li>
43-
44-
<li class="dropdown">
45-
<a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ 'nav-reports'|message }} <b class="caret"></b></a>
46-
<ul class="dropdown-menu">
47-
<li><a href="{{ urlFor( 'reports_aggregated' ) }}">{{ 'nav-reports-aggregated'|message }}</a></li>
48-
</ul>
49-
</li>
50-
51-
{% if isadmin|default(false) %}
52-
<li class="dropdown">
53-
<a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ 'nav-admin'|message }} <b class="caret"></b></a>
54-
<ul class="dropdown-menu">
55-
<li><a href="{{ urlFor( 'admin_users' ) }}">{{ 'nav-users'|message }}</a></li>
56-
<li><a href="{{ urlFor( 'admin_user', { 'id':'new' } ) }}">{{ 'admin-users-add'|message }}</a></li>
57-
</ul>
58-
</li>
59-
{% endif %}
60-
6133
{% if user|default(false) %}
62-
<li class="dropdown">
63-
<a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ 'nav-account'|message }} <b class="caret"></b></a>
64-
<ul class="dropdown-menu">
65-
<li><a href="{{ urlFor( 'user_changepassword' ) }}">{{ 'change-password'|message }}</a></li>
66-
<li><a href="{{ urlFor( 'logout' ) }}">{{ 'logout'|message }}</a></li>
67-
</ul>
68-
</li>
34+
{% include 'nav_user.html' %}
35+
{% else %}
36+
<form class="navbar-form navbar-right" action="{{ urlFor( 'login_post' ) }}" method="post" role="form">
37+
<input type="hidden" name="{{ csrf_param }}" value="{{ csrf_token }}" />
38+
<div class="form-group">
39+
<label for="username" class="sr-only control-label">{{ 'username'|message }}</label>
40+
<input type="text" class="form-control" id="username" name="username" required="required" placeholder="{{ 'username'|message }}"/>
41+
</div>
42+
<div class="form-group">
43+
<label for="password" class="sr-only control-label">{{ 'password'|message }}</label>
44+
<input type="password" class="form-control" id="password" name="password" required="required" placeholder="{{ 'password'|message }}"/>
45+
</div>
46+
<input type="submit" class="btn btn-default" value="{{ 'login'|message }}" />
47+
</form>
6948
{% endif %}
7049
{% endblock navbar %}
7150
</ul>

‎data/templates/base_auth.html‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎data/templates/credits.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{% extends "base.html" %}
22

3+
{% block title %}{{ 'credits'|message }} - {{ parent() }}{% endblock title %}
34
{% block nav_li_credits %}class="active"{% endblock %}
45

56
{% block content %}

‎data/templates/csrf.html‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
{% extends "base.html" %}
2+
3+
{% block title %}{{ 'csrf-heading'|message }} - {{ parent() }}{% endblock title %}
4+
25
{% block content %}
36
{% spaceless %}
47
<div class="row">

‎data/templates/error.html‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
{% extends "base.html" %}
2+
3+
{% block title %}{{ 'error-heading'|message }} - {{ parent() }}{% endblock title %}
4+
25
{% block content %}
36
{% spaceless %}
47
<div class="row">

0 commit comments

Comments
 (0)