Denis Merigoux лет назад: 9
Родитель
Сommit
2454d2e3da

+ 5 - 5
counter/templates/counterTemplate.html

1
 {% extends 'baseTemplate.html' %} {% block title %}{{counter.trigramme}}{% endblock %} {% block content %}
1
 {% extends 'baseTemplate.html' %} {% block title %}{{counter.trigramme}}{% endblock %} {% block content %}
2
 <div class="text-center">
2
 <div class="text-center">
3
   <h1>
3
   <h1>
4
-      {{counter.trigramme}} <small>{{ counter.name }}</small>
4
+      <a class="counter-link" href="{% url 'home' %}">{{counter.trigramme}} <small>{{ counter.name }}</small></a>
5
   </h1>
5
   </h1>
6
 </div>
6
 </div>
7
 <div class="container-fluid">
7
 <div class="container-fluid">
45
       </div>
45
       </div>
46
     </div>
46
     </div>
47
     <div class="col-md-9">
47
     <div class="col-md-9">
48
-      <div class="panel panel-primary">
48
+      <div class="panel panel-info">
49
         <div class="panel-heading">
49
         <div class="panel-heading">
50
           <h2 class="panel-title">Timeline du seum</h2>
50
           <h2 class="panel-title">Timeline du seum</h2>
51
         </div>
51
         </div>
65
     <div class="col-sm-12">
65
     <div class="col-sm-12">
66
       <div class="panel panel-default">
66
       <div class="panel panel-default">
67
         <div class="panel-heading">
67
         <div class="panel-heading">
68
-          <h2 class="panel-title">Historique du seum <small class="pull-right">Temps moyen entre deux seums : {{seumFrequency}}</small></h2>
68
+          <h2 class="panel-title">Historique du seum <small class="badge pull-right">{{seumFrequency}}/seum</small></h2>
69
         </div>
69
         </div>
70
-        <div class="panel-body">
70
+        <div class="panel-body" style="max-height:350px;overflow:auto;">
71
           <table class="table table-striped">
71
           <table class="table table-striped">
72
             <thead>
72
             <thead>
73
               <tr>
73
               <tr>
79
             <tbody>
79
             <tbody>
80
               {% for reset in resets %}
80
               {% for reset in resets %}
81
               <tr>
81
               <tr>
82
-                <td>{{ reset.date }}</td>
82
+                <td><b>{{ reset.date }}</b></td>
83
                 <td>{{ reset.reason }}</td>
83
                 <td>{{ reset.reason }}</td>
84
                 <td>
84
                 <td>
85
                 {% if not reset.selfSeum %}
85
                 {% if not reset.selfSeum %}

+ 7 - 7
counter/templates/homeTemplate.html

1
 {% extends 'baseTemplate.html' %} {% block title %}Compteurs{% endblock %} {% block content %}
1
 {% extends 'baseTemplate.html' %} {% block title %}Compteurs{% endblock %} {% block content %}
2
 <div class="text-center">
2
 <div class="text-center">
3
-	<h1>SeumBook™</h1>
3
+	<h1><a class="counter-link" href="{% url 'home' %}">SeumBook™</a></h1>
4
 </div>
4
 </div>
5
 <div class="container-fluid">
5
 <div class="container-fluid">
6
 	<div class="row" id="my-counter">
6
 	<div class="row" id="my-counter">
7
 		<div class="col-sm-12">
7
 		<div class="col-sm-12">
8
-			<div class="panel panel-warning">
8
+			<div class="panel panel-primary">
9
 				<div class="panel-heading">
9
 				<div class="panel-heading">
10
 					<a class="counter-link" href="{% url 'counter' id_counter=myCounter.id %}">
10
 					<a class="counter-link" href="{% url 'counter' id_counter=myCounter.id %}">
11
 						<h2 class="panel-title">{{ myCounter.trigramme }} <small>{{ myCounter.name }}</small>
11
 						<h2 class="panel-title">{{ myCounter.trigramme }} <small>{{ myCounter.name }}</small>
49
 	</div>
49
 	</div>
50
 	<div class="row">
50
 	<div class="row">
51
 		{% for counter in counters %} {% if chooseCounter or not counter.id == myCounter.id %}
51
 		{% for counter in counters %} {% if chooseCounter or not counter.id == myCounter.id %}
52
-		<div class="col-md-4 col-sm-6 col-lg-3">
52
+		<div class="col-md-3 col-sm-4 col-lg-2">
53
 			<div class="panel panel-{{counter.CSSclass}}" style="opacity:{{counter.opacity}}">
53
 			<div class="panel panel-{{counter.CSSclass}}" style="opacity:{{counter.opacity}}">
54
 				<div class="panel-heading">
54
 				<div class="panel-heading">
55
 					<a class="counter-link" href="{% url 'counter' id_counter=counter.id %}">
55
 					<a class="counter-link" href="{% url 'counter' id_counter=counter.id %}">
79
 	</div>
79
 	</div>
80
 	<div class="row">
80
 	<div class="row">
81
 		<div class="col-sm-12">
81
 		<div class="col-sm-12">
82
-			<div class="panel panel-default">
82
+			<div class="panel panel-info">
83
 				<div class="panel-heading">
83
 				<div class="panel-heading">
84
 					<h2 class="panel-title">Timeline des 24 heures du seum</h2>
84
 					<h2 class="panel-title">Timeline des 24 heures du seum</h2>
85
 				</div>
85
 				</div>
95
 	</div>
95
 	</div>
96
 	<div class="row">
96
 	<div class="row">
97
 		<div class="col-sm-12">
97
 		<div class="col-sm-12">
98
-			<div class="panel panel-default">
98
+			<div class="panel panel-info">
99
 				<div class="panel-heading">
99
 				<div class="panel-heading">
100
 					<h2 class="panel-title">Graphe des jours sans seum</h2>
100
 					<h2 class="panel-title">Graphe des jours sans seum</h2>
101
 				</div>
101
 				</div>
111
 	</div>
111
 	</div>
112
 	<div class="row">
112
 	<div class="row">
113
 		<div class="col-sm-12">
113
 		<div class="col-sm-12">
114
-			<div class="panel panel-default">
114
+			<div class="panel panel-info">
115
 				<div class="panel-heading">
115
 				<div class="panel-heading">
116
 					<h2 class="panel-title">Meilleurs seumeurs</h2>
116
 					<h2 class="panel-title">Meilleurs seumeurs</h2>
117
 				</div>
117
 				</div>
127
 	</div>
127
 	</div>
128
 	<div class="row">
128
 	<div class="row">
129
 		<div class="col-sm-12">
129
 		<div class="col-sm-12">
130
-			<div class="panel panel-default">
130
+			<div class="panel panel-info">
131
 				<div class="panel-heading">
131
 				<div class="panel-heading">
132
 					<h2 class="panel-title">Activité seumesque</h2>
132
 					<h2 class="panel-title">Activité seumesque</h2>
133
 				</div>
133
 				</div>

+ 1 - 1
counter/templates/login.html

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

+ 1 - 1
counter/templates/passwordChange.html

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

+ 1 - 1
counter/templates/passwordChangeDone.html

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

+ 1 - 1
counter/templates/passwordReset.html

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

+ 1 - 1
counter/templates/passwordResetComplete.html

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

+ 1 - 1
counter/templates/passwordResetConfirm.html

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

+ 2 - 2
counter/templates/passwordResetDone.html

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

+ 1 - 5
counter/templates/seumEmail.txt

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

+ 3 - 3
counter/views.py

92
                     maxJSS = (counter.lastReset.delta.total_seconds() /
92
                     maxJSS = (counter.lastReset.delta.total_seconds() /
93
                               (24 * 3600))
93
                               (24 * 3600))
94
             # Defining CSS attributes for the counter
94
             # Defining CSS attributes for the counter
95
-            counter.CSSclass = "primary"
96
-            counter.opacity = 0.3 + 0.7 * \
95
+            counter.CSSclass = "default"
96
+            counter.opacity = 0.4 + 0.6 * \
97
                 math.exp(-(counter.lastReset.delta.total_seconds()) /
97
                 math.exp(-(counter.lastReset.delta.total_seconds()) /
98
                          (7 * 24 * 3600))
98
                          (7 * 24 * 3600))
99
             # Computing the total number of resets for this counter
99
             # Computing the total number of resets for this counter
316
             reset.selfSeum = False
316
             reset.selfSeum = False
317
         reset.date = format_datetime(
317
         reset.date = format_datetime(
318
             reset.timestamp, locale='fr',
318
             reset.timestamp, locale='fr',
319
-            format="EEEE dd MMMM Y 'à' HH:mm").capitalize()
319
+            format="dd/MM/Y HH:mm")
320
     # Timeline graph
320
     # Timeline graph
321
     # Data pre-processing
321
     # Data pre-processing
322
     resets_graph = resets
322
     resets_graph = resets