move user links to the main page content

panikdb/static/css/style.css

@@ -41,26 +41,9 @@ a:hover {
 	color: #D76500;
 }
 
-div#user-links {
-	display: inline;
-	padding: 5px;
-	background: rgba(100, 100, 100, 0.8);
-	border-top-right-radius: 6px;
-	border-bottom-left-radius: 6px;
-}
-
-div#user-links a {
-	color: white;
-	text-decoration: none;
-}
-
-div#user-links a:hover {
-	text-shadow: 1px 1px 1px black;
-}
-
 div#wrap {
 	background: white;
-	margin: 3em auto;
+	margin: 1em auto 1em auto;
 	margin-bottom: 0;
 	padding: 15px;
 	border-radius: 6px;
@@ -131,7 +114,7 @@ div#wrap {
 
 div#content {
 	margin: 1em 1ex;
-	margin-top: 100px;
+	margin-top: 20px;
 	padding: 7px;
 	position: relative;
 }
@@ -467,6 +450,28 @@ span.add-on {
 	width: 30em;
 }
 
+#user-links {
+        color: black;
+        margin-top: 100px;
+}
+
+#user-links a {
+        background: #ccc;
+        text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+        border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+        border: 1px solid #bbb;
+        box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+        padding: 4px 12px;
+        border-radius: 4px;
+        color: black;
+        text-decoration: none;
+}
+
+#user-links span.right {
+        position: absolute;
+        right: 15px;
+}
+
 
 [class^="icon-"]:after, [class*=" icon-"]:after,
 [class^="icon-"]:before, [class*=" icon-"]:before {
@@ -493,6 +498,7 @@ a [class^="icon-"], a [class*=" icon-"] {
 .icon-circle-arrow-right:before   { content: "\f0a9"; }
 .icon-music:before                { content: "\f001"; }
 .icon-th:before                   { content: "\f00a"; }
-.icon-eye-open:before             { content: "\f06e"; }
+.icon-eye-open:before             { content: "\f06e "; }
+.icon-bar-chart:before            { content: "\f080 "; }
 
 .icon-circle-arrow-down:after     { content: "  \f0ab"; }

panikdb/templates/base.html

@@ -37,13 +37,20 @@
       <h1><a href="{% url 'home' %}">Panik DB</a></h1>
     </div>
     <div id="splash">
-      <div id="user-links">
-        {% block user-links %}
-        <a href="{% url 'auth_password_change' %}">Changement de mot de passe</a>
-        |
-        <a href="{% url 'logout' %}">Déconnexion</a>
-        {% endblock %}
-      </div>
+    </div>
+    <div id="user-links">
+    {% block user-links %}
+            <a href="{% url 'home' %}" class="icon-home-space">Accueil</a>
+            <a target="blank" href="http://stats.radiopanik.org/index.php?module=Login&action=logme&login=panikdb&password=d48fb8e3a453d965901339e6b020538f" class="icon-bar-chart">Statistiques</a>
+            {% block online-page %}
+            <!--<a href="#" class="icon-eye-open">Page en ligne</a>-->
+            {% endblock %}
+
+            <span class="right">
+            <a href="{% url 'auth_password_change' %}">Changement de mot de passe</a>
+            <a href="{% url 'logout' %}">Déconnexion</a>
+            </span>
+    {% endblock %}
     </div>
     {% endif %}
     <div id="content">

panikdb/templates/registration/password_reset_form.html

 {% extends "base.html" %}
 {% load i18n %}
 
+{% block user-links %}{% endblock %}
+
 {% block content %}
 
 <h2>{% trans "Password reset" %}</h2>