Commit 290376e4 authored by Jérôme Ortais's avatar Jérôme Ortais

gerstion de conflit

parents 698e30c3 c61e7ce1
......@@ -9,4 +9,3 @@ pages:
- public/
only:
- master
......@@ -8,7 +8,7 @@ PELICANOPTS=
BASEDIR=$(pwd)
INPUTDIR=$BASEDIR/content
OUTPUTDIR=$BASEDIR/output
OUTPUTDIR=$BASEDIR/public
CONFFILE=$BASEDIR/pelicanconf.py
###
......
This diff is collapsed.
......@@ -16,6 +16,7 @@
{% block content %}
<div id="deux_cols">
<div id="col_droite">
<div class="margin-check">
{% if article.category == "telecharger" %}
<h3>Historique des versions</h3>
<ul class="docs">
......@@ -45,6 +46,7 @@
</p>
</form>
{% else %}
<h3>Documentation</h3>
{% for cat_name, article_list in categories if cat_name!="telecharger" and cat_name != "finances"%}
<ul>
{% for group in article_list|groupby('category') %}
......@@ -70,7 +72,7 @@
{% endif %}
{% endif %}
</div>
</div>
<div id="col_gauche">
<div class="article">
<h5> Par
......@@ -95,7 +97,7 @@
</div>
</div>
<div class="clear">&nbsp;</div>
</div>
<div class="clear">&nbsp;</div>
{% endblock %}
......@@ -4,6 +4,7 @@
<title>{% block title %}{% endblock %}</title>
{% block head %}
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="icon" href="{{ SITEURL }}/theme/images/favicon.ico"/>
{% if FEED_ALL_ATOM %}
......@@ -52,9 +53,12 @@
<h1><a href="{{ SITEURL }}" id="logo">Pyromaths</a></h1>
</div>
<div id="nav_menu">
<div class="topnav" id="nav_menu">
<a href="javascript:void(0);" class="icon" onclick="myFunction();">
<!--<i class="fa fa-bars"></i>-->
</a>
<ul>
<li><a href="{{ SITEURL }}">Accueil</a></li>
<li><a href="{{ SITEURL }}" class="active">Accueil</a></li>
<li><a href="https://enligne.pyromaths.org/">Utiliser en ligne</a></li>
{% for cat_name, article_list in categories if cat_name=="telecharger" %}
{% for article in article_list %}
......@@ -67,9 +71,19 @@
{% endfor %}
<li><a href="{{ SITEURL }}/installer-pyromaths.html">Documentation</a></li>
<li><a href="http://pyromaths.readthedocs.io/fr/develop/">Développeurs</a></li>
<li><a href="https://forum.pyromaths.org">Forum</a></li>
<li id="adroite"><a href="https://forum.pyromaths.org">Forum</a></li>
</ul>
</div>
<script>
function myFunction() {
var x = document.getElementById("nav_menu");
if (x.className === "topnav") {
x.className += " responsive";
} else {
x.className = "topnav";
}
}
</script>
{% endblock header %}
</div>
......@@ -77,14 +91,12 @@
</div><!--page-->
<div id="footer">
<div id="left">&nbsp;</div>
<div id="right">
<a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" id="feeds">Flux Atom</a>
</div>
<div id="copyright">
<p>&copy; 2010 Pyromaths<br/>
Thème inspiré d'un travail de <a href="https://www.divio.ch/">Divio
GmbH</a></p>
Thème inspiré d'un travail de <a href="https://www.divio.ch/">Divio GmbH</a></p>
</div>
</div>
</div> <!--total-->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment