python/django-maraudes
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

templates refont, implemented 'get_panel' method

Browse Source
This commit is contained in:
Arthur Gerbaud
2016-08-11 02:08:37 +02:00
parent fa95890bee
commit 8bac5d8bd4
22 changed files with 614 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
website/templates/base.html
View File

@@ -10,11 +10,14 @@
{% block globalnav %}{% endblock %}
<div class="container">
<div class="row">
{% block panels %}<div class="col-md-12">{% endblock %}
{% if panels %}<div class="col-md-8">{% else %}<div class="col-md-12">{% endif %}
{% bootstrap_messages %}
<div class="page-header"><h1>{% block page_header %}Header{% endblock %}</h1></div>
{% block content %}{% endblock %}
</div>
{% if panels %}<div class="col-md-4" id="sidebar">
{% block panels %}{% endblock %}
</div>{% endif %}
</div>
</div>
</body>

6
website/templates/base_site.html
View File

@@ -11,9 +11,11 @@
</div>
{% endblock %}
{% block content %}{% include content_template %}{% endblock %}
{% block panels %}
{% if panels %}<div class="col-md-2">{{ panels }}</div><div class="col-md-10">
{% if panels %}<div class="panel-group">{% for panel in panels %}{% include panel %}{% endfor %}</div>
{% else %}{{ block.super }}{% endif %}
{% endblock %}
{% block content %}{% include content_template %}{% endblock %}

18
website/templates/navbar.html
View File

@@ -1,15 +1,6 @@
{% load bootstrap3 %}{% load staticfiles %}
<nav class="navbar navbar-default navbar-static-top">
<nav class="navbar navbar-inverse navbar-static-top" role="navigation" id="menu">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<img alt="Logo Alsa" src="{% static 'alsa_logo.png' %}" class="img-rounded">
</div>
<ul class="nav navbar-nav navbar-left">{% for app in apps %}
<li {% if app == active_app %} class="active" {%endif%}>
<a href="/{{app.label}}/">{{ app.name|title }}</a>
@@ -30,12 +21,5 @@
</ul>
</li>
</ul>
<!-- Search form -->
<form class="navbar-form navbar-right" role="search">
<div class="input-group">
<input type="text" class="form-control" placeholder="NotYetImplemented" />
<span class="input-group-btn"><button class="btn btn-default" type="button"><i class="glyphicon glyphicon-search"></i></button></span>
</div>
</form>
</div>
</nav>