--- a/src/spel/__init__.py Wed Mar 26 13:12:07 2014 +0100
+++ b/src/spel/__init__.py Wed Mar 26 13:55:12 2014 +0100
@@ -1,4 +1,4 @@
-VERSION = (0, 0, 2, "final", 0)
+VERSION = (0, 0, 3, "final", 0)
VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION[:2])))
--- a/src/spel/static/spel/css/spel.css Wed Mar 26 13:12:07 2014 +0100
+++ b/src/spel/static/spel/css/spel.css Wed Mar 26 13:55:12 2014 +0100
@@ -1,3 +1,9 @@
+.navbar{
+ border-radius: 0;
+}
+#logo {
+ padding-top: 0;
+}
.spel-content{
min-height: 500px;
}
Binary file src/spel/static/spel/img/spel_logo_small.png has changed
--- a/src/spel/templates/spel_base.html Wed Mar 26 13:12:07 2014 +0100
+++ b/src/spel/templates/spel_base.html Wed Mar 26 13:55:12 2014 +0100
@@ -12,17 +12,27 @@
</head>
<body>
{% block container %}
+ <div class="navbar navbar-inverse" role="navigation">
+ <div class="container">
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand" id="logo" href="{% url 'spel_home' %}"><img src="{% static 'spel/img/spel_logo_small.png' %}"></a>
+ </div>
+ <div class="collapse navbar-collapse">
+ <ul class="nav navbar-nav">
+ {% url 'spel_spectacle' as url %}
+ <li{% if request.path == url %} class="active"{% endif %}><a href="{{ url }}">Spectacle</a></li>
+ <li><a href="#">Opéra</a></li>
+ </ul>
+ </div>
+ </div>
+ </div>
<div class="container">
- <header class="navbar navbar-inverse" role="banner">
- <nav class="collapse navbar-collapse bs-navbar-collapse" role="navigation">
- <ul class="nav navbar-nav">
- <li><a href="{% url 'spel_home' %}">Spectacle en Ligne(s)</a></li>
- </ul>
- <ul class="nav navbar-nav navbar-right">
- <li><a href="#" >Se connecter</a></li>
- </ul>
- </nav>
- </header>
<div class="spel-content">
{% block spel_content %}
{% endblock %}
