From: yomguy <yomguy@parisson.com>
Date: Mon, 17 Dec 2012 12:01:52 +0000 (+0100)
Subject: fix seminar infos, more colors on counter
X-Git-Tag: 0.9-probarreau~243
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=4a1ee300e8c4b8c018d1c4ee0aab56ac4aa2efed;p=teleforma.git

fix seminar infos, more colors on counter
---

diff --git a/teleforma/static/teleforma/css/teleforma.css b/teleforma/static/teleforma/css/teleforma.css
index eea911ef..03cb3fb5 100644
--- a/teleforma/static/teleforma/css/teleforma.css
+++ b/teleforma/static/teleforma/css/teleforma.css
@@ -1473,7 +1473,7 @@ input,textarea{
 
 
 .course_title {
-    color: #000;
+    color: #355ea2;
     -moz-border-radius: 8px 0px 8px 8px;
     -webkit-border-radius: 8px 0px 8px 8px;
     border-radius: 8px 0px 8px 8px;
@@ -1482,6 +1482,10 @@ input,textarea{
     font-size: 1.2em;
     }
 
+.course_title a {
+    color: #355ea2;
+}
+
 .course_description {
     background-color: #FFF;
     padding: 0em 1em 1em 1em;
@@ -1678,7 +1682,7 @@ input,textarea{
     }
 
 .messages {
-    padding: 0.5em;
+    padding: 0.5em 1em 1em 1em;
 }
 
 .info {
diff --git a/teleforma/static/teleforma/js/charCount.js b/teleforma/static/teleforma/js/charCount.js
index fd415dd2..010b4166 100644
--- a/teleforma/static/teleforma/js/charCount.js
+++ b/teleforma/static/teleforma/js/charCount.js
@@ -42,12 +42,14 @@
 				$(obj).next().addClass(options.cssDeceed);
 			}
 			
-			$(obj).next().html(options.counterText + count + ' / ' + options.necessary);
 			var percent = parseInt(count / options.necessary * 100);
 			if ( percent >= 100 ) {
 				percent = 100;
 			}
 			var color = '#' + rainbow.colourAt(percent);
+			$(obj).next().html(options.counterText + count + ' / ' + options.necessary);
+			$(obj).next().css({'color': color});
+			
 			$('#answer-progress').html(percent);
 			$('#progressbar-answer').progressbar({ value: percent });
 			$('#progressbar-answer div').css({"background": color});
diff --git a/teleforma/templates/teleforma/seminar_detail.html b/teleforma/templates/teleforma/seminar_detail.html
index aae96111..75b64b41 100644
--- a/teleforma/templates/teleforma/seminar_detail.html
+++ b/teleforma/templates/teleforma/seminar_detail.html
@@ -34,34 +34,43 @@ $(function() {
     <div class="course">
         
         <div class="course_title">
-         <a href="{% url teleforma-seminar-detail seminar.id %}" style="color: #000;">{{ seminar.title }}</a>
+         <a href="{% url teleforma-seminar-detail seminar.id %}">{{ seminar.title }}</a>
+
+          <div style="float: right; font-size: 0.9em;">
+          {% if seminar_progress == 100 %}
+          <a id="validated" href="#" class="component_icon button icon_ok">{% trans " validated" %}</a>
+          {% endif %}
+          </div>
+
         </div>
 
         {% block course_content %}
 
-        {% if messages %}
+        
         <div class="course_content">
-         <div class="course_subtitle">
+          <div class="course_subtitle">
              <h3><img src="{{ STATIC_URL }}telemeta/images/item_title.png" width="10px" alt="" /> {% trans "Informations" %}</h3>
-         </div>
+            </div>
+            <div style="padding-left: 1em;">
+              <dl class="listing" style="font-size: 1em;">
+              {% if seminar.keywords.all %}<dt>{% trans "keywords" %}</dt><dd>{% for kw in seminar.keywords.all %}{{ kw }}, {% endfor %}</dd>{% endif %}
+              <dt>{% trans "level" %}</dt><dd>{{ seminar.level }}</dd>
+              <dt>{% trans "public concerned" %}</dt><dd>{{ seminar.concerned }}</dd>
+              <dt>{% trans "duration" %}</dt><dd>{{ seminar.duration }}</dd>
+              {% if seminar.description %}
+              <dt>{% trans "description" %}</dt><dd><div class="description">{{ seminar.description|safe }}</div></dd>
+              {% endif %}
+            </dl>
+            </div>
+        {% if messages %}
          <div class="messages">
             {% for message in messages %}
             <div{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</div>
             {% endfor %}
          </div>
-        </div>
-        {% endif %}
-
-        <div class="course_content">
-          {% if seminar.description %}
-            <div class="course_subtitle">
-             <h3><img src="{{ STATIC_URL }}telemeta/images/item_title.png" width="10px" alt="" /> {% trans "Description" %}</h3>
-            </div>
-            <div class="course_description">
-              {{ seminar.description }}
-            </div>
-          {% endif %}
-        </div>
+         {% endif %}
+       </div>
+        
 
           {% with seminar.docs_1 as docs %}
            {% if docs.all.count > 1 %}
diff --git a/teleforma/templates/teleforma/seminars.html b/teleforma/templates/teleforma/seminars.html
index 9a62508e..dfdd64a6 100644
--- a/teleforma/templates/teleforma/seminars.html
+++ b/teleforma/templates/teleforma/seminars.html
@@ -81,13 +81,11 @@ $(function() {
       <div class="course">
 
         <div class="course_title">
-         <a href="{% url teleforma-seminar-detail seminar.id %}" style="color: #000;">{{ seminar.title }}</a>
+         <a href="{% url teleforma-seminar-detail seminar.id %}">{{ seminar.title }}</a>
         </div>
 
         <div class="course_content">
-          {% if seminar.description %}
             <div class="course_subtitle">
-             <h3><img src="{{ STATIC_URL }}telemeta/images/item_title.png" width="10px" alt="" /> {% trans "Informations" %}</h3>
             </div>
             <div style="padding-left: 1em;">
               <dl class="listing" style="font-size: 1em;">
@@ -95,13 +93,12 @@ $(function() {
               <dt>{% trans "level" %}</dt><dd>{{ seminar.level }}</dd>
               <dt>{% trans "public concerned" %}</dt><dd>{{ seminar.concerned }}</dd>
               <dt>{% trans "duration" %}</dt><dd>{{ seminar.duration }}</dd>
-              <dt>{% trans "description" %}</dt><dd><div class="description">{{ seminar.description }}</div></dd>
+              {% if seminar.description %}
+              <dt>{% trans "description" %}</dt><dd><div class="description">{{ seminar.description|safe }}</div></dd>
+              {% endif %}
             </dl>
             </div>
-            
-          {% endif %}
         </div>
-
       </div>
    {% endfor %}
 </div>