Skip to content
Snippets Groups Projects
Commit f4bf384f authored by Fabrice Salvaire's avatar Fabrice Salvaire
Browse files

Page cleanup

parent 6305db79
No related branches found
No related tags found
No related merge requests found
Showing
with 71 additions and 136 deletions
......@@ -3,9 +3,15 @@
{% block title %} - À propos{% endblock %}
{% block breadcrumb %}
{% endblock %}
{#
{% block breadcrumb_li %}
<li class="active">À propos</li>
<li class="breadcrumb-item active" aria-current="page">{{ _('À propos') }}</li>
{% endblock %}
#}
{% block content %}
To be completed ...
{% endblock %}
......@@ -3,29 +3,40 @@
{% block title %} - {{ _('Rest API') }}{% endblock %}
{% block breadcrumb %}
{% endblock %}
{#
{% block breadcrumb_li %}
<li class="breadcrumb-item active">{{ _('Rest API') }}</li>
{% endblock %}
#}
{% block content %}
<ul class="nav justify-content-center">
<li class="nav-item">
<a class="nav-link" href="/api">
<h2>Table of Contents</h2>
<ul>
<li>
<a href="/api">
{{ _('Rest API') }}
</a>
</li>
<li class="nav-item">
<a class="nav-link" href={{ url('schema-swagger-ui') }}>
<li>
<a href={{ url('schema-swagger-ui') }}>
{{ _('Swagger Doc') }}
</a>
</li>
<li class="nav-item">
<a class="nav-link" href={{ url('schema-redoc') }}>
<li>
<a href={{ url('schema-redoc') }}>
{{ _('Redoc') }}
</a>
</li>
<li class="nav-item">
<a class="nav-link" href={{ url('old-swagger') }}>
<li>
<a href={{ url('graphql') }}>
{{ _('GraphiQL') }}
</a>
</li>
<li>
<a href={{ url('old-swagger') }}>
{{ _('Old Swagger Doc') }}
</a>
</li>
......
{# -*- mode: jinja2 -*- #}
{% extends "include/base.html" %}
{% block breadcrumb %}
{% endblock %}
{#
{% block breadcrumb_li %}
<li class="breadcrumb-item active">{{ _('Test Pages') }}</li>
{% endblock %}
#}
{% block content %}
<h2>Table of Contents</h2>
<ul>
<li><a href="{{ url('wall.route.index-static') }}">{{ _('Routes') }}</a></li>
<li><a href="{{ url('devel.test.rest-ajax') }}">{{ _('REST AJAX') }}</a></li>
<li><a href="{{ url('devel.test.select2') }}">{{ _('Select2') }}</a></li>
<li><a href="{{ url('devel.test.django_select2') }}">{{ _('Django Select2') }}</a></li>
<li><a href="{{ url('devel.test.slider') }}">{{ _('Slider') }}</a></li>
<li><a href="{{ url('devel.test.route-angularjs') }}">{{ _('Route AngularJS') }}</a></li>
<li><a href="{{ url('devel.test.route-reactjs') }}">{{ _('Route ReactJS') }}</a></li>
<li><a href="{{ url('devel.test.translation') }}">{{ _('Translation') }}</a></li>
<li><a href="{{ url('devel.test.context') }}">{{ _('Context') }}</a></li>
</ul>
......
......@@ -196,7 +196,8 @@
<div class="left-sidebar-footer">
<p>
{% icon 'fa-copyright' %}
<a href="https://github.com/FabriceSalvaire/climbing-asso-portal">Climbing Asso Portal 2018</a>
<a href="{{ url('about') }}">Climbing Asso Portal 2018</a>
{# <a href="https://github.com/FabriceSalvaire/climbing-asso-portal">Climbing Asso Portal 2018</a> #}
</p>
<p><a href="{{ url('mentions-legales') }}">Mentions légales</a></p>
</div>
......
{# -*- mode: jinja2 -*- #}
<!DOCTYPE html>
{# <html lang="en"> #}
<html lang="fr" {% block ng_app %}{% endblock %} class="fontawesome-i2svg-pending">
<html lang="fr" class="fontawesome-i2svg-pending">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
......
......@@ -6,13 +6,6 @@
{% block content %}
<header role="banner">
{# Small device #}
{#
<div class="jumbotron hidden-sm-up" style="padding: 1rem 1rem">
</div>
#}
{# Large device #}
{# hidden-xs-down #}
<div class="jumbotron" style="padding: 1rem 1rem">
<h1 class="display-3">
<img src="{{ static('image/favicon.png') }}">
......@@ -21,47 +14,8 @@
</div>
</header>
{% if user.is_authenticated %}
{# Large device #}
{# class="hidden-xs-down" #}
{% else %}
{% if not user.is_authenticated %}
<a class="btn btn-primary btn-lg m-b-1" href="{{ url('account_login') }}" role="button">
{% icon 'fa-sign-in-alt' %} Connexion</a></li>
{% endif %}
{# <a class="btn btn-primary btn-lg m-b-1" href="{{ url('about') }}" role="button"> #}
{# À propos</a> #}
{% if user.is_staff %}
<p>
<a class="btn btn-primary btn-lg m-b-1" href="{{ url('wall') }}" role="button">
{{ _('Wall') }}</a>
</p>
{% endif %}
{% if user.is_staff %}
<p>
<a class="btn btn-primary btn-lg m-b-1" href="{{ url('member.index') }}" role="button">
{{ _('Members') }}</a>
<a class="btn btn-primary btn-lg m-b-1" href="{{ url('member.statistics') }}" role="button">
{{ _('Member Statistics') }}</a>
<a class="btn btn-primary btn-lg m-b-1" href="{{ url('member.map') }}" role="button">
{{ _('Member Map') }}</a>
</p>
{% endif %}
{% if user.is_staff %}
<p>
<a class="btn btn-primary btn-lg m-b-1" href={{ url('api-summary') }} role="button">
{{ _('Rest API') }}
</a>
</p>
{% endif %}
<p>
<a class="btn btn-primary btn-lg m-b-1" href="/test" role="button">
{{ _('Tests') }}
</a>
</p>
{% endblock %}
......@@ -4,9 +4,14 @@
{% block title %} - {{ _('Members') }}{% endblock %}
{% block breadcrumb %}
{% endblock %}
{#
{% block breadcrumb_li %}
<li class="breadcrumb-item active">{{ _('Members') }}</li>
{% endblock %}
#}
{% block content %}
<h2>{{_('Members')}}</h2>
......
{# -*- mode: jinja2 -*- #}
{% extends "include/base.html" %}
{% from "include/widgets.html" import new_button_group, search_by %}
{% block head %}
<link rel="stylesheet" href={{ static('css-ext/ol.css') }}>
......@@ -10,12 +9,17 @@
{% block title %} - {{ _('Member Map') }}{% endblock %}
{% block breadcrumb %}
{% endblock %}
{#
{% block breadcrumb_li %}
<li class="breadcrumb-item active">{{ _('Member Map') }}</li>
{% endblock %}
#}
{% block content %}
<h2>{{_('Member Map')}}</h2>
{# <h2>{{_('Member Map')}}</h2> #}
<div id="map" class="map"></div>
{% endblock %}
......
{# -*- mode: jinja2 -*- #}
{% extends "include/base.html" %}
{% from "include/widgets.html" import new_button_group, search_by %}
{% block title %} - {{ _('Member Statistics') }}{% endblock %}
{% block breadcrumb %}
{% endblock %}
{#
{% block breadcrumb_li %}
<li class="breadcrumb-item active">{{ _('Member Statistics') }}</li>
{% endblock %}
#}
{% block content %}
<h2>{{_('Member Statistics')}}</h2>
......@@ -20,12 +24,10 @@
<img class="w-100 p-0" src={{ url('member.age_histogram_error_svg') }}></img>
</div>
</div>
<div class="row">
<a class="mx-auto btn btn-primary" href={{ url('member.age_histogram_csv') }}>{% icon 'fas.fa-download' %} {{ _('Age Histogram as CSV') }}</a>
</div>
</div>
{# <img class="mx-auto d-block" src={{ url('member.age_histogram_svg') }}></img> #}
{# <img class="mx-auto d-block" src={{ url('member.age_histogram_error_svg') }}></img> #}
<p>
<a class="btn btn-primary" href={{ url('member.age_histogram_csv') }}>{% icon 'fas.fa-download' %} {{ _('Age Histogram as CSV') }}</a>
</p>
{% endblock %}
......@@ -3,9 +3,14 @@
{% block title %} - {{ _('Mentions légales') }}{% endblock %}
{% block breadcrumb %}
{% endblock %}
{#
{% block breadcrumb_li %}
<li class="breadcrumb-item active" aria-current="page">{{ _('Mentions légales') }}</li>
{% endblock %}
#}
{% block content %}
<h2>Droit d'auteur / Propriété intellectuelle</h2>
......@@ -19,7 +24,7 @@
<a target="_blank" href="http://www.fabrice-salvaire.fr" itemprop="author" itemscope itemtype="http://schema.org/People">
<span itemprop="name">Fabrice Salvaire</span> {% icon 'fa-home' %}</a>.
<br>
Le <a target="_blank" href="https://github.com/bleaudb/bleau-database">code source</a> est sous licence
Le <a target="_blank" href="https://github.com/FabriceSalvaire/climbing-asso-portal">code source</a> est sous licence
<a target="_blank" href="http://www.gnu.org/licenses/agpl.html">GNU Affero General Public License V3</a>.
</p>
......
{# -*- mode: jinja2 -*- #}
{% extends "include/base.html" %}
{% from "include/widgets.html" import new_button_group, search_by_name %}
{% block ng_app %}ng-app="route_index"{% endblock %}
{% block head %}
{% endblock %}
{% block script %}
<script type="text/javascript" src={{ static('js-ext/angular.min.js') }}></script>
<script type="text/javascript" src={{ static('js-ext/angular-resource.min.js') }}></script>
<script type="text/javascript" src={{ static('js-ext/angular-cookies.min.js') }}></script>
<script type="text/javascript" src={{ static('js/route_page.js') }}></script>
{% endblock %}
{% block title %} - {{ _('Routes') }}{% endblock %}
{% block breadcrumb_li %}
<li class="breadcrumb-item active">{{ _('Routes') }}</li>
{% endblock %}
{% block content %}
<h2>{{ _('Routes') }} </h2>
<img src={{ static('image/alice-milliat-wall.png') }}></img>
<table class="table" ng-controller="route_controller">
<thead>
<tr>
<th scope="col">{{ _('Line Number') }}</th>
<th scope="col">{{ _('Grade') }}</th>
<th scope="col">{{ _('Colour') }}</th>
<th scope="col">{{ _('Name') }}</th>
<th scope="col">{{ _('Comment') }}</th>
<th scope="col">{{ _('Opener') }}</th>
<th scope="col">{{ _('Opening date') }}</th>
</tr>
</thead>
<tbody ng-repeat="route in routes">
<tr>
{# url('route.details', route.pk) #}
{% raw %}
<th scope="row"><a href="">{{ route.line_number }}</a></th>
<td>{{ route.grade }}</td>
<td>{{ route.colour }}</td>
<td>{{ route.name }}</td>
<td>{{ route.comment }}</td>
<td>{{ route.opener }}</td>
<td>{{ route.opening_date }}</td>
{% endraw %}
</tr>
</tbody>
</table>
{% endblock %}
......@@ -11,9 +11,9 @@
{% endblock %}
{% block breadcrumb_li %}
<li class="breadcrumb-item"><a href="{{ url('route.index') }}">{{ _('Routes') }}</a></li>
<li class="breadcrumb-item"><a href="{{ url('wall.route.index') }}">{{ _('Routes') }}</a></li>
{% if update %}
<li class="breadcrumb-item"><a href="{{ url('route.details', route.pk) }}">{{ route.name }}</a></li>
<li class="breadcrumb-item"><a href="{{ url('wall.route.details', route.pk) }}">{{ route.name }}</a></li>
<li class="breadcrumb-item active">{{ _('Update') }}</li>
{% else %}
<li class="breadcrumb-item active">{{ _('New route') }}</li>
......
......@@ -5,18 +5,18 @@
{% block title %} - {{ route.name }}{% endblock %}
{% block breadcrumb_li %}
<li class="breadcrumb-item"><a href="{{ url('route.index') }}">{{ _('Routes') }}</a></li>
<li class="breadcrumb-item"><a href="{{ url('wall.route.index') }}">{{ _('Routes') }}</a></li>
<li class="breadcrumb-item active">{{ route.name }}</li>
{% endblock %}
{% block content %}
<h1> {{ route.name }}
{{ update_delete_button_group(href=url('route.update', route.pk)) }}
{{ update_delete_button_group(href=url('wall.route.update', route.pk)) }}
</h1>
{{ delete_modal(title=_("Delete route"),
body= _("Are you sure you want to delete this route?"),
href=url('route.delete', route.pk),
href=url('wall.route.delete', route.pk),
) }}
<dl>
......
{# -*- mode: jinja2 -*- #}
{% extends "include/base.html" %}
{% from "include/widgets.html" import new_button_group, search_by_name %}
{% from "include/widgets.html" import new_button_group, search_by %}
{% block title %} - {{ _('Routes') }}{% endblock %}
......@@ -10,10 +10,10 @@
{% block content %}
<h2>{{ _('Routes') }}
{{ new_button_group(title=_('New route'), href=url('route.create')) }}
{{ new_button_group(title=_('New route'), href=url('wall.route.create')) }}
</h2>
{{ search_by_name(form) }}
{# {{ search_by(form) }} #}
<br>
{# {% if routes %} #}
......@@ -32,7 +32,7 @@
<tbody>
{% for route in routes %}
<tr>
<th scope="row"><a href="{{ url('route.details', route.pk) }}">{{ route.line_number }}</a></th>
<th scope="row"><a href="{{ url('wall.route.details', route.pk) }}">{{ route.line_number }}</a></th>
<td>{{ route.grade }}</td>
<td>{{ route.get_colour_display() }}</td>
<td>{{ route.name }}</td>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment