Changed seum reason input

counter/templates/baseTemplate.html

@@ -10,7 +10,7 @@
 	<link rel="shortcut icon" type="image/png" href="{{STATIC_URL}}/favicon.ico"/>
 	<title>SeumBook™ – {% block title %}{% endblock %}</title>
 
-	{# Load the tag library #} {% load bootstrap3 %} {# Load CSS and JavaScript #} {% bootstrap_css %} {% bootstrap_javascript %} {# Display django.contrib.messages as Bootstrap alerts #} {% bootstrap_messages %}
+	{# Load the tag library #} {% load bootstrap3 %} {# Load CSS and JavaScript #} {% bootstrap_css %} {# Display django.contrib.messages as Bootstrap alerts #} {% bootstrap_messages %}
 
 	<style>
 		body {
@@ -35,8 +35,8 @@
 		}
 
 		.counter-link, .counter-link:hover {
-  	color: inherit; /* blue colors for links too */
-  	text-decoration: inherit; /* no underline */
+  			color: inherit; /* blue colors for links too */
+  			text-decoration: inherit; /* no underline */
 		}
 	</style>
 
@@ -45,6 +45,13 @@
 		google.load("visualization", "1", {
 			packages: ["corechart"]
 		});
+
+		function revealSeumForm(counterID) {
+			document.getElementById('counter'+counterID).style.display='inline';
+			document.getElementById('button'+counterID).style.display='none';
+			document.getElementById('reason'+counterID).focus();
+			document.getElementById('container'+counterID).style.height='200px';
+		}
 	</script>
 </head>
 <section id="content">

counter/templates/counterTemplate.html

@@ -20,13 +20,13 @@
 
           <p>{{ counter.lastReset.reason }}</p>
           <div class="text-center">
-            <button id="button{{counter.id}}" class="btn btn-default btn-danger" type="button" onclick="getElementById('counter{{counter.id}}').style.display='inline';getElementById('button{{counter.id}}').style.display='none';getElementById('container{{counter.id}}').style.height='225px';">Remettre à zéro</button>
+            <button id="button{{counter.id}}" class="btn btn-default btn-danger" type="button" onclick="revealSeumForm({{counter.id}})">Remettre à zéro</button>
           </div>
           <form style="display:none" id="counter{{counter.id}}" action="{% url 'reset-counter' %}" method="post">
             {% csrf_token %}
             <div class="form-group">
               <label for="reason">Motif du seum :</label>
-              <textarea class="form-control" name="reason"></textarea>
+              <input id="reason{{counter.id}}" type="text" class="form-control" name="reason"></input>
             </div>
             <input type="hidden" name="counter" value="{{counter.id}}"></input>
             <input type="hidden" name="redirect" value="{% url 'counter' id_counter=counter.id %}"></input>

counter/templates/homeTemplate.html

@@ -51,13 +51,13 @@
 
 					<p>{{ myCounter.lastReset.reason }}</p>
 					<div class="text-center" id="button{{myCounter.id}}">
-						<button class="btn btn-default btn-danger" type="button" onclick="getElementById('counter{{myCounter.id}}').style.display='inline';getElementById('button{{myCounter.id}}').style.display='none';getElementById('container{{myCounter.id}}').style.height='225px';">Remettre à zéro</button>
+						<button class="btn btn-default btn-danger" type="button" onclick="revealSeumForm({{myCounter.id}})">Remettre à zéro</button>
 					</div>
 					<form style="display:none" id="counter{{myCounter.id}}" action="{% url 'reset-counter' %}" method="post">
 						{% csrf_token %}
 						<div class="form-group">
 							<label for="reason">Motif du seum :</label>
-							<textarea class="form-control" name="reason"></textarea>
+							<input id="reason{{myCounter.id}}" type="text" class="form-control" name="reason"></input>
 						</div>
 						<input type="hidden" name="counter" value="{{myCounter.id}}"></input>
 						<input type="hidden" name="redirect" value="{% url 'home' %}"></input>

counter/urls.py

@@ -4,10 +4,10 @@ from counter.rss import SeumFeed
 from . import views
 
 urlpatterns = [
-    url(r'^$', views.home,name="home"),
-    url(r'^reset-counter',views.resetCounter,name="reset-counter"),
+    url(r'^$', views.home, name="home"),
+    url(r'^reset-counter', views.resetCounter, name="reset-counter"),
     url(r'^counter/(?P<id_counter>\d+)$', views.counter, name="counter"),
-    url(r'^set-my-counter',views.setMyCounter,name="set-my-counter"),
-    url(r'^reset-my-counter',views.resetMyCounter,name="reset-my-counter"),
-    url(r'^rss',SeumFeed())
+    url(r'^set-my-counter', views.setMyCounter, name="set-my-counter"),
+    url(r'^reset-my-counter', views.resetMyCounter, name="reset-my-counter"),
+    url(r'^rss', SeumFeed())
 ]

counter/views.py

@@ -4,7 +4,6 @@ from babel.dates import format_timedelta, format_datetime
 from datetime import datetime, timedelta
 from django import forms
 from django.http import HttpResponseRedirect
-from django.core import serializers
 from django.core.mail import EmailMessage
 from graphos.renderers import gchart
 from graphos.sources.simple import SimpleDataSource
@@ -14,6 +13,7 @@ import math
 import copy
 from django.utils import timezone
 
+
 def home(request):
     # JSS above this limit will not be displayed on the col graph
     JSS_limit = 7
@@ -51,6 +51,7 @@ def home(request):
         myCounter = None
         chooseCounter = True
 
+    # Building data for counters display
     counters = Counter.objects.all()
     for counter in counters:
         lastReset = Reset.objects.filter(
@@ -152,6 +153,7 @@ def home(request):
             'legend': 'none',
             'height': 90
         })
+
     # Graph of greatest seumers
     seumCounts = []
     for counter in counters:
@@ -171,6 +173,7 @@ def home(request):
             'vAxis': {'title': 'Nombre de seums'},
             'hAxis': {'title': 'Trigramme'},
         })
+
     # Graph of seum activity
     resets = Reset.objects.filter(
         timestamp__gte=timezone.now() - timedelta(days=365))