combo: get back to custom "two columns" template for now

This commit is contained in:
Frédéric Péters 2015-11-06 21:56:53 +01:00
parent 749c3d608d
commit 343a58275b
2 changed files with 12 additions and 177 deletions

View File

@ -1 +1,12 @@
{% extends "combo/page_template_sidebar.html" %}
{% extends "combo/page_template.html" %}
{% load combo %}
{% block content %}
<div id="left">
{% placeholder "left" %}
</div>
<div id="right">
{% placeholder "right" %}
</div>
<br style="clear"/>
{% endblock %}

View File

@ -1,176 +0,0 @@
<!DOCTYPE html>
{% load i18n staticfiles %}
<html>
<head>
<meta charset="UTF-8"><!---->
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<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="{{ site_base }}{% static "themes/django-montpellier/favicon.png" %}" />
{% block extra_top_head %}
{% endblock %}
<link rel="stylesheet" type="text/css" href="{{ site_base }}{% static "themes/django-montpellier/style.css" %}" >
{% block extra_css %}
{% endblock %}
<link href='https://fonts.googleapis.com/css?family=Lato:400,700,700italic,400italic|Carme|Arvo' rel='stylesheet' type='text/css'>
<script src="//d3nslu0hdya83q.cloudfront.net/dist/1.0/raven.min.js"></script>
<script>
Raven.config('{{ SENTRY_JS }}').install();
</script>
{% block extra_scripts %}
{% endblock %}
{{ PIWIK_JS|safe }}
</head>
<body {% block bodyargs %}{% endblock %}>
<div id="page">
<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="{{ site_base }}{% 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="{{ site_base }}{% static "themes/django-montpellier/logo.png" %}"
title="Montpellier Méditerranée Métropole" /></a>
{% endif %}
<div class="region-header">
{% block user-info %}
{% endblock %}
</div>
</div>
{% block messages %}
{% if messages %}
<div id="messages">
<ul class="messages">
{% for message in messages %}
<li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
{% endfor %}
</ul>
</div>
{% endif %}
{% endblock %}
</div> <!-- header -->
<div id="main-content-wrapper">
<div id="agglolinks">
{% if user.is_authenticated %}
<a class="agglo-mon-agglo" href="{{ site_agglo_montpellier_url }}/simplesamlphp/module.php/core/as_login.php?ReturnTo={{ site_agglo_montpellier_url }}&amp;AuthId=default-sp">Ma métropole</a>
<a class="agglo-connaitre" href="{{ site_agglo_montpellier_url }}/simplesamlphp/module.php/core/as_login.php?ReturnTo={{ site_agglo_montpellier_url }}/connaitre&amp;AuthId=default-sp">Connaître</a>
<a class="agglo-vivre" href="{{ site_agglo_montpellier_url }}/simplesamlphp/module.php/core/as_login.php?ReturnTo={{ site_agglo_montpellier_url }}/vivre&amp;AuthId=default-sp">Vivre</a>
<a class="agglo-entreprendre" href="{{ site_agglo_montpellier_url }}/simplesamlphp/module.php/core/as_login.php?ReturnTo={{ site_agglo_montpellier_url }}/entreprendre&amp;AuthId=default-sp">Entreprendre</a>
{% else %}
<a class="agglo-mon-agglo" href="{{ site_agglo_montpellier_url }}">Ma métropole</a>
<a class="agglo-connaitre" href="{{ site_agglo_montpellier_url }}/connaitre">Connaître</a>
<a class="agglo-vivre" href="{{ site_agglo_montpellier_url }}/vivre">Vivre</a>
<a class="agglo-entreprendre" href="{{ site_agglo_montpellier_url }}/entreprendre">Entreprendre</a>
{% 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="sibling">
<a href="{{ idp_url }}/accounts">Mon compte</a>
</li>
<li id="top-menu-mes-abonnements" class="sibling">
<a href="{{ portal_url }}/mes-abonnements/">Mes abonnements</a>
</li>
<li id="top-menu-aide" class="sibling">
<a href="{{ portal_url }}/aide/">Aide</a>
</li>
</ul>
{% endif %}
{% endblock %}
</div>
{% block content_header %}{% endblock %}
<div id="main-content">
<div id="content">
{% block content %}
{% endblock %}
</div> <!-- #content -->
</div> <!-- #main-content -->
</div> <!-- #main-content-wrapper -->
<div id="footer">
<p id="legal">
© Montpellier Méditerranée Métropole — Réalisation&nbsp;:
<a href="http://www.entrouvert.com">Entr'ouvert</a>
</p>
<ul id="footer-menu">
{% if user.is_authenticated %}
<li class="footer-menu-leaf">
<a class="footer-menu-leaf-link" href="{{ site_agglo_montpellier_url }}/simplesamlphp/module.php/core/as_login.php?ReturnTo=/vivre/transport&amp;AuthId=default-sp">Je me déplace</a>
</li>
<li class="footer-menu-leaf">
<a class="footer-menu-leaf-link" href="{{ site_agglo_montpellier_url }}/simplesamlphp/module.php/core/as_login.php?ReturnTo=/vivre/environnement&amp;AuthId=default-sp">Je préserve</a>
</li>
<li class="footer-menu-leaf">
<a class="footer-menu-leaf-link" href="{{ site_agglo_montpellier_url }}/simplesamlphp/module.php/core/as_login.php?ReturnTo=/entreprendre&amp;AuthId=default-sp">Je travaille</a>
</li>
<li class="footer-menu-leaf">
<a class="footer-menu-leaf-link" href="{{ site_agglo_montpellier_url }}/simplesamlphp/module.php/core/as_login.php?ReturnTo=/vivre/solidarité&amp;AuthId=default-sp">Je partage</a>
</li>
<li class="footer-menu-leaf">
<a class="footer-menu-leaf-link" href="{{ site_agglo_montpellier_url }}/simplesamlphp/module.php/core/as_login.php?ReturnTo=/vivre/culture&amp;AuthId=default-sp">Je me cultive</a>
</li>
<li class="footer-menu-leaf">
<a class="footer-menu-leaf-link" href="{{ site_agglo_montpellier_url }}/simplesamlphp/module.php/core/as_login.php?ReturnTo=/vivre/tourisme-traditions&amp;AuthId=default-sp">Je découvre</a>
</li>
<li class="footer-menu-leaf">
<a class="footer-menu-leaf-link" href="{{ site_agglo_montpellier_url }}/simplesamlphp/module.php/core/as_login.php?ReturnTo=/vivre/sport&amp;AuthId=default-sp">Je m'oxygène</a>
</li>
<li class="footer-menu-leaf">
<a class="footer-menu-leaf-link" href="{{ site_agglo_montpellier_url }}/simplesamlphp/module.php/core/as_login.php?ReturnTo=/connaître-compétences/logement&amp;AuthId=default-sp">Je me loge</a>
</li>
{% else %}
<li class="footer-menu-leaf">
<a class="footer-menu-leaf-link" href="{{ site_agglo_montpellier_url }}/vivre/transport">Je me déplace</a>
</li>
<li class="footer-menu-leaf">
<a class="footer-menu-leaf-link" href="{{ site_agglo_montpellier_url }}/vivre/environnement">Je préserve</a>
</li>
<li class="footer-menu-leaf">
<a class="footer-menu-leaf-link" href="{{ site_agglo_montpellier_url }}/entreprendre">Je travaille</a>
</li>
<li class="footer-menu-leaf">
<a class="footer-menu-leaf-link" href="{{ site_agglo_montpellier_url }}/vivre/solidarité">Je partage</a>
</li>
<li class="footer-menu-leaf">
<a class="footer-menu-leaf-link" href="{{ site_agglo_montpellier_url }}/vivre/culture">Je me cultive</a>
</li>
<li class="footer-menu-leaf">
<a class="footer-menu-leaf-link" href="{{ site_agglo_montpellier_url }}/vivre/tourisme-traditions">Je découvre</a>
</li>
<li class="footer-menu-leaf">
<a class="footer-menu-leaf-link" href="{{ site_agglo_montpellier_url }}/vivre/sport">Je m'oxygène</a>
</li>
<li class="footer-menu-leaf">
<a class="footer-menu-leaf-link" href="{{ site_agglo_montpellier_url }}/connaître-compétences/logement">Je me loge</a>
</li>
{% endif %}
</ul>
</div>
</div>
{% block js-endpage %}
{% endblock %}
</body>
</html>