fix progressbar ui

diff --git a/teleforma/static/teleforma/css/teleforma.css b/teleforma/static/teleforma/css/teleforma.css
index 581e2663ac9f9ac7ad22b427d4930c4f30199660..39bcbce915fac90c22e6aa889df3d250c3a155d6 100644 (file)
--- a/teleforma/static/teleforma/css/teleforma.css
+++ b/teleforma/static/teleforma/css/teleforma.css
@@ -1361,9 +1361,9 @@ input,textarea{
 }
 
 #module-set .module div {
-        -moz-border-radius: 8px 8px 8px 8px;
+        -moz-border-radius: 8px 0px 8px 8px;
         -webkit-border-radius: 8px 0px 8px 8px;
-        border-radius: 8px 8px 8px 8px;
+        border-radius: 8px 0px 8px 8px;
        }
 
 #module-set .module a:hover {
@@ -1406,9 +1406,6 @@ input,textarea{
         -moz-border-radius: 8px 0px 8px 8px;
         -webkit-border-radius: 8px 0px 8px 8px;
         border-radius: 8px 0px 8px 8px;
-       }
-
-#module-set-left .module ul {
         margin: 0em 0em 0em 0.3em;
         font-size: 0.9125em;
         background-color: #FFF;
@@ -1687,7 +1684,7 @@ input,textarea{
 .info {
     color: white;
     padding: 0.3em;
-    background-color: #3c9200; 
+    background-color: green; 
     -moz-border-radius: 8px 0px 8px 8px;
     -webkit-border-radius: 8px 0px 8px 8px;
     border-radius: 8px 0px 8px 8px;
@@ -1742,6 +1739,13 @@ form .exceed{
     -moz-border-radius: 8px 0px 8px 8px;
     -webkit-border-radius: 8px 0px 8px 8px;
     border-radius: 8px 0px 8px 8px;
+        margin: 0em 0em 0em 0.3em;
+        font-size: 0.9125em;
+        background-color: #FFF;
+        color: #000 ;
+        font-weight: normal;
+        max-height: 450px;
+        overflow-y: auto;
     
 }
 
@@ -1774,3 +1778,7 @@ form .exceed{
     background-color: #bb0000;
     }
 
+.ui-progressbar.beginning .ui-progressbar-value { background: red; }
+.ui-progressbar.middle .ui-progressbar-value { background: yellow; }
+.ui-progressbar.end .ui-progressbar-value { background: green; }
+

diff --git a/teleforma/templates/teleforma/answer_form.html b/teleforma/templates/teleforma/answer_form.html
index f6b8f7142fa8f7f62d58ca1ccf2c8415ae0fc580..07b2cf4ea3cd0e8d5ba5f6dcc0253fed77e284c5 100644 (file)
--- a/teleforma/templates/teleforma/answer_form.html
+++ b/teleforma/templates/teleforma/answer_form.html
@@ -66,7 +66,8 @@ $(document).ready(function(){
 
 {% block progress %}
 <div class="module">
-  <h3><img src="{{STATIC_URL}}teleforma/images/status.png" alt="status" style="vertical-align:middle" /> {% trans "Progress" %}</h3>
+  <h3><img src="{{STATIC_URL}}teleforma/images/status.png" alt="status" style="vertical-align:middle" /> {% trans "Progression" %}</h3>
+ <div>
  <div class="progress">
   <ul>
     <li>{% trans "General" %} : {{ total_progress }}%
@@ -83,5 +84,6 @@ $(document).ready(function(){
 
  </div>
 </div>
+</div>
 {% endblock progress %}
 

diff --git a/teleforma/templates/teleforma/inc/question_list.html b/teleforma/templates/teleforma/inc/question_list.html
index f6118e9c39bec87a9bdfdc23121e6700995c1e5e..d1fea1efdcebfc01859cec9d556d485ff4edaa95 100644 (file)
--- a/teleforma/templates/teleforma/inc/question_list.html
+++ b/teleforma/templates/teleforma/inc/question_list.html
@@ -11,7 +11,8 @@
     <tbody>
         {% for question in questions.all %}
             <tr>
-            <td {% if forloop.first %}class="border-top"{% endif %} width="60%"><a href="{% url teleforma-question-answer question.id %}">{{ question.title }} n°{{ question.rank }}</a></td>
+            <td {% if forloop.first %}class="border-top"{% endif %} width="45%"><a href="{% url teleforma-question-answer question.id %}">{{ question.title }} n°{{ question.rank }}</a></td>
+            <td {% if forloop.first %}class="border-top"{% endif %} width="50%">{% if question|submitted:user %}{%  trans "submitted on" %}{% else %}{% trans "saved on" %}{% endif %} {{ question|submitted:user }}</td>
             <td {% if forloop.first %}class="border-top"{% endif %} width="5%" align="center">{% if question|submitted:user %}<img src="{{ STATIC_URL }}telemeta/images/ok.png" style="vertical-align:middle" alt="" title="{% trans "Submitted" %}" />{% endif %}</td>
             </tr>
         {% endfor %}

diff --git a/teleforma/templates/teleforma/seminar_detail.html b/teleforma/templates/teleforma/seminar_detail.html
index 7a561d00419da16488c1c88d9db945dae7458141..ffcb227161c328d4cf484e833e68292f3519205a 100644 (file)
--- a/teleforma/templates/teleforma/seminar_detail.html
+++ b/teleforma/templates/teleforma/seminar_detail.html
@@ -131,7 +131,7 @@ $(function() {
 
 {% block progress %}
 <div class="module">
-  <h3><img src="{{STATIC_URL}}teleforma/images/status.png" alt="status" style="vertical-align:middle" /> {% trans "Progress" %}</h3>
+  <h3><img src="{{STATIC_URL}}teleforma/images/status.png" alt="status" style="vertical-align:middle" /> {% trans "Progression" %}</h3>
  <div class="progress">
   <ul>
     <li>{% trans "General" %} : {{ total_progress }}%

diff --git a/teleforma/templates/teleforma/seminars.html b/teleforma/templates/teleforma/seminars.html
index 511a7769ab45056298725333489a55302db3e13f..cf7ce4ec0d261686d80193efa045b7ae71ca0f44 100644 (file)
--- a/teleforma/templates/teleforma/seminars.html
+++ b/teleforma/templates/teleforma/seminars.html
@@ -105,7 +105,7 @@ $(function() {
 
 {% block progress %}
 <div class="module">
-  <h3><img src="{{STATIC_URL}}teleforma/images/status.png" alt="status" style="vertical-align:middle" /> {% trans "Progress" %}</h3>
+  <h3><img src="{{STATIC_URL}}teleforma/images/status.png" alt="status" style="vertical-align:middle" /> {% trans "Progression" %}</h3>
  <div class="progress">
   <ul>
     <li>{% trans "General" %} : {{ total_progress }}

diff --git a/teleforma/templatetags/teleforma_tags.py b/teleforma/templatetags/teleforma_tags.py
index ef9f56692eef2dfb434ef1ced8a6053ec69185f6..a27b1296e93cf83e5c7e8af9a2195e1a0be926db 100644 (file)
--- a/teleforma/templatetags/teleforma_tags.py
+++ b/teleforma/templatetags/teleforma_tags.py
@@ -224,3 +224,11 @@ def submitted(question, user):
     else:
         return False
 
+@register.filter
+def submitted(question, user):
+    answers = Answer.objects.filter(question=question, user=user)
+    if answers:
+        return answers[0].date_submitted
+    else:
+        return ''
+

diff --git a/teleforma/urls.py b/teleforma/urls.py
index a8be4bf509a0541037ef445cfccff54c678ddd7b..82894f1ee5ec8600ec5dae3d39b1129a82cdd2bc 100644 (file)
--- a/teleforma/urls.py
+++ b/teleforma/urls.py
@@ -138,4 +138,5 @@ urlpatterns = patterns('',
     url(r'^', include('jqchat.urls')),
 
     url(r'^tinymce/', include('tinymce.urls')),
+
 )