New look

counter/templates/counterTemplate.html

@@ -1,7 +1,7 @@
 {% extends 'baseTemplate.html' %} {% block title %}{{counter.trigramme}}{% endblock %} {% block content %}
 <div class="text-center">
   <h1>
-      {{counter.trigramme}} <small>{{ counter.name }}</small>
+      <a class="counter-link" href="{% url 'home' %}">{{counter.trigramme}} <small>{{ counter.name }}</small></a>
   </h1>
 </div>
 <div class="container-fluid">
@@ -45,7 +45,7 @@
       </div>
     </div>
     <div class="col-md-9">
-      <div class="panel panel-primary">
+      <div class="panel panel-info">
         <div class="panel-heading">
           <h2 class="panel-title">Timeline du seum</h2>
         </div>
@@ -65,9 +65,9 @@
     <div class="col-sm-12">
       <div class="panel panel-default">
         <div class="panel-heading">
-          <h2 class="panel-title">Historique du seum <small class="pull-right">Temps moyen entre deux seums : {{seumFrequency}}</small></h2>
+          <h2 class="panel-title">Historique du seum <small class="badge pull-right">{{seumFrequency}}/seum</small></h2>
         </div>
-        <div class="panel-body">
+        <div class="panel-body" style="max-height:350px;overflow:auto;">
           <table class="table table-striped">
             <thead>
               <tr>
@@ -79,7 +79,7 @@
             <tbody>
               {% for reset in resets %}
               <tr>
-                <td>{{ reset.date }}</td>
+                <td><b>{{ reset.date }}</b></td>
                 <td>{{ reset.reason }}</td>
                 <td>
                 {% if not reset.selfSeum %}

counter/templates/homeTemplate.html

@@ -1,11 +1,11 @@
 {% extends 'baseTemplate.html' %} {% block title %}Compteurs{% endblock %} {% block content %}
 <div class="text-center">
-	<h1>SeumBook™</h1>
+	<h1><a class="counter-link" href="{% url 'home' %}">SeumBook™</a></h1>
 </div>
 <div class="container-fluid">
 	<div class="row" id="my-counter">
 		<div class="col-sm-12">
-			<div class="panel panel-warning">
+			<div class="panel panel-primary">
 				<div class="panel-heading">
 					<a class="counter-link" href="{% url 'counter' id_counter=myCounter.id %}">
 						<h2 class="panel-title">{{ myCounter.trigramme }} <small>{{ myCounter.name }}</small>
@@ -49,7 +49,7 @@
 	</div>
 	<div class="row">
 		{% for counter in counters %} {% if chooseCounter or not counter.id == myCounter.id %}
-		<div class="col-md-4 col-sm-6 col-lg-3">
+		<div class="col-md-3 col-sm-4 col-lg-2">
 			<div class="panel panel-{{counter.CSSclass}}" style="opacity:{{counter.opacity}}">
 				<div class="panel-heading">
 					<a class="counter-link" href="{% url 'counter' id_counter=counter.id %}">
@@ -79,7 +79,7 @@
 	</div>
 	<div class="row">
 		<div class="col-sm-12">
-			<div class="panel panel-default">
+			<div class="panel panel-info">
 				<div class="panel-heading">
 					<h2 class="panel-title">Timeline des 24 heures du seum</h2>
 				</div>
@@ -95,7 +95,7 @@
 	</div>
 	<div class="row">
 		<div class="col-sm-12">
-			<div class="panel panel-default">
+			<div class="panel panel-info">
 				<div class="panel-heading">
 					<h2 class="panel-title">Graphe des jours sans seum</h2>
 				</div>
@@ -111,7 +111,7 @@
 	</div>
 	<div class="row">
 		<div class="col-sm-12">
-			<div class="panel panel-default">
+			<div class="panel panel-info">
 				<div class="panel-heading">
 					<h2 class="panel-title">Meilleurs seumeurs</h2>
 				</div>
@@ -127,7 +127,7 @@
 	</div>
 	<div class="row">
 		<div class="col-sm-12">
-			<div class="panel panel-default">
+			<div class="panel panel-info">
 				<div class="panel-heading">
 					<h2 class="panel-title">Activité seumesque</h2>
 				</div>

counter/templates/login.html

@@ -2,7 +2,7 @@
 <div class="container">
     <div class="row">
         <div class="text-center">
-            <h1>SeumBook™</h1>
+            <h1><a class="counter-link" href="{% url 'home' %}">SeumBook™</a></h1>
         </div>
     </div>
     <div class="row">

counter/templates/passwordChange.html

@@ -2,7 +2,7 @@
 <div class="container">
     <div class="row">
         <div class="text-center">
-            <h1>SeumBook™</h1>
+            <h1><a class="counter-link" href="{% url 'home' %}">SeumBook™</a></h1>
         </div>
     </div>
     <div class="row">

counter/templates/passwordChangeDone.html

@@ -2,7 +2,7 @@
 <div class="container">
     <div class="row">
         <div class="text-center">
-            <h1>SeumBook™</h1>
+            <h1><a class="counter-link" href="{% url 'home' %}">SeumBook™</a></h1>
         </div>
     </div>
     <div class="row">

counter/templates/passwordReset.html

@@ -2,7 +2,7 @@
 <div class="container">
     <div class="row">
         <div class="text-center">
-            <h1>SeumBook™</h1>
+            <h1><a class="counter-link" href="{% url 'home' %}">SeumBook™</a></h1>
         </div>
     </div>
     <div class="row">

counter/templates/passwordResetComplete.html

@@ -2,7 +2,7 @@
 <div class="container">
     <div class="row">
         <div class="text-center">
-            <h1>SeumBook™</h1>
+            <h1><a class="counter-link" href="{% url 'home' %}">SeumBook™</a></h1>
         </div>
     </div>
     <div class="row">

counter/templates/passwordResetConfirm.html

@@ -2,7 +2,7 @@
 <div class="container">
     <div class="row">
         <div class="text-center">
-            <h1>SeumBook™</h1>
+            <h1><a class="counter-link" href="{% url 'home' %}">SeumBook™</a></h1>
         </div>
     </div>
     <div class="row">

counter/templates/passwordResetDone.html

@@ -2,7 +2,7 @@
 <div class="container">
     <div class="row">
         <div class="text-center">
-            <h1>SeumBook™</h1>
+            <h1><a class="counter-link" href="{% url 'home' %}">SeumBook™</a></h1>
         </div>
     </div>
     <div class="row">
@@ -11,7 +11,7 @@
                 <h2 class="panel-title">Victoire !</h2>
             </div>
             <div class=" panel-body">
-                <p>Un mail t'as été envoyé, suis les instructions pour aller réinitialiser ton mot de passe.</p>
+                <p>Un mail t'a été envoyé, suis les instructions pour aller réinitialiser ton mot de passe.</p>
             </div>
         </div>
     </div>

counter/templates/seumEmail.txt

@@ -1,9 +1,5 @@
 {% autoescape off %}
-{% if selfSeum %}
-{{name}} a le seum : {{reason}}
-{% else %}
-{{who.trigramme}} ({{who.name}}) a foutu le seum à {{name}} : {{reason}}
-{% endif %}
+{% if selfSeum %}{{name}} a le seum : {{reason}}{% else %}{{who.trigramme}} ({{who.name}}) a foutu le seum à {{name}} : {{reason}}{% endif %}
 --
 SeumBook™ - http://seum.merigoux.ovh
 

counter/views.py

@@ -92,8 +92,8 @@ def home(request):
                     maxJSS = (counter.lastReset.delta.total_seconds() /
                               (24 * 3600))
             # Defining CSS attributes for the counter
-            counter.CSSclass = "primary"
-            counter.opacity = 0.3 + 0.7 * \
+            counter.CSSclass = "default"
+            counter.opacity = 0.4 + 0.6 * \
                 math.exp(-(counter.lastReset.delta.total_seconds()) /
                          (7 * 24 * 3600))
             # Computing the total number of resets for this counter
@@ -316,7 +316,7 @@ def counter(request, id_counter):
             reset.selfSeum = False
         reset.date = format_datetime(
             reset.timestamp, locale='fr',
-            format="EEEE dd MMMM Y 'à' HH:mm").capitalize()
+            format="dd/MM/Y HH:mm")
     # Timeline graph
     # Data pre-processing
     resets_graph = resets