common template for combo and error pages

This commit is contained in:
Serghei Mihai 2015-05-13 19:14:53 +02:00
parent b68d481eaa
commit c3637724c8
4 changed files with 29 additions and 9 deletions

View File

@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "common.html" %}
{% block title %}Page inexistante{% endblock %}
{% block content %}
<div id="error-404">

View File

@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "common.html" %}
{% block title %}Erreur système{% endblock %}
{% block content %}
<div id="error-500">

View File

@ -1,8 +1,27 @@
{% extends "base.html" %}
{% load combo %}
{% extends "common.html" %}
{% load combo gadjo staticfiles %}
{% block title %}{{ page.title }}{% endblock %}
{% block extra_styles %}
<link rel="stylesheet" type="text/css" href="{{site_base}}{% static "combo.style.css" %}" >
{% endblock %}
{% block extra_scripts %}
<script src="{{site_base}}{% xstatic 'jquery' 'jquery.min.js' %}"></script>
<script src="{{site_base}}{% static 'js/combo.public.js' %}"></script>
{% skeleton_extra_placeholder 'extra-head' %}
{% endblock %}
{% block bodyargs %}
{% skeleton_extra_placeholder 'bodyargs' %}
{% endblock %}
{% block content_header %}
{% skeleton_extra_placeholder 'content_header' %}
{% endblock %}
{% block menu %}
{% show_menu %}
{% endblock %}

View File

@ -1,5 +1,5 @@
<!DOCTYPE html>
{% load i18n static %}
{% load i18n staticfiles %}
<html>
<head>
<meta charset="UTF-8"><!---->
@ -8,8 +8,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta http-equiv="content-language" content="fr" />
<title>Compte Citoyen :: Montpellier Méditerranée Métropole :: {% block title %}{% endblock %}</title>
<link rel="shortcut icon" href="{% static "themes/django-montpellier/favicon.png" %}" />
<link rel="stylesheet" type="text/css" href="{% static "themes/django-montpellier/style.css" %}" >
<link rel="shortcut icon" href="{{ site_base }}{% static "themes/django-montpellier/favicon.png" %}" />
<link rel="stylesheet" type="text/css" href="{{ site_base }}{% static "themes/django-montpellier/style.css" %}" >
{% block extra_styles %}
{% endblock %}
<link href='https://fonts.googleapis.com/css?family=Lato:400,700,700italic,400italic|Carme|Arvo' rel='stylesheet' type='text/css'>
@ -26,7 +26,7 @@
<div id="header">
<div id="top">
{% if user.is_authenticated %}
<a href="{{ site_agglo_montpellier_url }}/simplesamlphp/module.php/core/as_login.php?ReturnTo={{ site_agglo_montpellier_url }}&amp;AuthId=default-sp" accesskey="1"><img src="{{ STATIC_URL }}/themes/django-montpellier/logo.png"
<a href="{{ site_agglo_montpellier_url }}/simplesamlphp/module.php/core/as_login.php?ReturnTo={{ site_agglo_montpellier_url }}&amp;AuthId=default-sp" accesskey="1"><img src="{% static "themes/django-montpellier/logo.png" %}"
title="Montpellier Méditerranée Métropole" /></a>
{% else %}
<a href="{{ site_agglo_montpellier_url }}" accesskey="1"><img src="{% static "themes/django-montpellier/logo.png" %}"
@ -76,13 +76,14 @@
{% endif %}
</div>
<div id="menu">
{% block menu %}
{% if user.is_authenticated %}
<ul>
<li id="top-menu-accueil" class="sibling">
<a href="{{ portal_url }}">Accueil</a>
</li>
<li id="top-menu-mon-compte" class="selected">
<li id="top-menu-mon-compte" class="sibling">
<a href="{{ idp_url }}/accounts">Mon compte</a>
</li>
<li id="top-menu-mes-abonnements" class="sibling">