fix style and focus, go to django 1.4

diff --git a/setup.py b/setup.py
index d6afafb4a946b14dcf65a8d2ab6c7065f34b6f76..d95ddbea77c339f3d8183f148248ba37127cb350 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -16,13 +16,14 @@ setup(
   author_email = "yomguy@parisson.com",
   version = teleforma.__version__,
   install_requires = [
-        'django>=1.3.1',
+        'django>=1.4',
         'telemeta',
         'south',
         'django-pagination',
         'django-postman',
         'django-extensions',
         'django-notes',
+        'django-timezones',
   ],
   platforms=['OS Independent'],
   license='CeCILL v2',

diff --git a/teleforma/htdocs/css/teleforma.css b/teleforma/htdocs/css/teleforma.css
index c9de882e8877faa2caf2d4a78960bba20efca421..06ea41a125fe85b8d187af68318e13fb93ddfc0e 100644 (file)
--- a/teleforma/htdocs/css/teleforma.css
+++ b/teleforma/htdocs/css/teleforma.css
@@ -470,7 +470,7 @@ form.login .submit {
 #menu .orange { border-bottom-color:  #e65911; }
 #menu .darkgreen { border-bottom-color:  #006a12; }
 #menu .black { border-bottom-color:  #000000; }
-#menu .red { border-bottom-color:  #cc0000; }
+#menu .red { border-bottom-color:  #bb0000; }
 #menu .violet { border-bottom-color:  #A00020; }
 #menu .origin { border-bottom-color: transparent; }
 
@@ -1159,7 +1159,7 @@ a.image-link {
     }
 
 #action_red {
-    background-color:  #db1020;
+    background-color:  #bb1020;
     color: #FFF;
     padding:0.8em 0.8em 0.8em 0.8em;
     }

diff --git a/teleforma/templates/postman/email_user.txt b/teleforma/templates/postman/email_user.txt
index 46bb1cae366a8165bcdc162cdfd239d4a1c49c11..48d626aaaab3c9a8d21998f5289aa4362cde2c06 100644 (file)
--- a/teleforma/templates/postman/email_user.txt
+++ b/teleforma/templates/postman/email_user.txt
@@ -11,10 +11,10 @@
 {% else %}{% blocktrans with object.obfuscated_sender as sender %}You have received a copy of a response from the user '{{ sender }}'.{% endblocktrans %}
 {% endif %}
 {% else %}{% blocktrans with object.obfuscated_sender as sender %}You have received a message from the user '{{ sender }}'.{% endblocktrans %}
-{% endif %}{% endif %}
-{% trans "You can read and respond to this message from your e-learning desk following this link:" %}
+{% endif %}{% endif %}{% trans "You can read and respond to this message from your e-learning desk following this link:" %}
 http://{{ site.name }}/messages/inbox/
 {# 'acceptance' #}
+
 {% trans "Thank you again for your interest in our services." %}
 {% trans "The site administrator" %} {% trans "of" %} {% organization %}
 

diff --git a/teleforma/templates/teleforma/course_detail.html b/teleforma/templates/teleforma/course_detail.html
index 71ebb48c6c8abd162c1d405363f58ab73faf22bc..cc483cc535958738827c916cfeb2a90fe6a3b508 100644 (file)
--- a/teleforma/templates/teleforma/course_detail.html
+++ b/teleforma/templates/teleforma/course_detail.html
@@ -68,7 +68,7 @@ $(document).ready(function(){
 <input type="text" id="msg" />
 <input type="submit" value="{% trans "Send" %}" />
 </form>
-<!--<script type="text/javascript">document.getElementById("msg").focus();</script>-->
+<script type="text/javascript">document.getElementById("msg").focus();</script>
 </div>
 </div>
 </div>

diff --git a/teleforma/templates/teleforma/course_media.html b/teleforma/templates/teleforma/course_media.html
index f527b82356b0cace817f42331e940bfd02551d14..201fe60640420fcfa74a896c4310f56eb2b16ef7 100644 (file)
--- a/teleforma/templates/teleforma/course_media.html
+++ b/teleforma/templates/teleforma/course_media.html
@@ -71,7 +71,7 @@ $(document).ready(function(){
 <input type="text" id="msg" />
 <input type="submit" value="{% trans "Send" %}" />
 </form>
-<!--<script type="text/javascript">document.getElementById("msg").focus();</script>-->
+<script type="text/javascript">document.getElementById("msg").focus();</script>
 </div>
 </div>
 </div>

diff --git a/teleforma/templates/teleforma/courses.html b/teleforma/templates/teleforma/courses.html
index c805af477a27d18ab6a2b526b37bbc88e5b47df1..4fd10ced65046943d69ae0ed2b3599cebf60a1f8 100644 (file)
--- a/teleforma/templates/teleforma/courses.html
+++ b/teleforma/templates/teleforma/courses.html
@@ -101,7 +101,7 @@ $(document).ready(function(){
 <input type="text" id="msg" />
 <input type="submit" value="{% trans "Send" %}" />
 </form>
-<!--<script type="text/javascript">document.getElementById("msg").focus();</script>-->
+<script type="text/javascript">document.getElementById("msg").focus();</script>
 </div>
 </div>
 </div>

diff --git a/teleforma/templates/telemeta/inc/user_list.html b/teleforma/templates/telemeta/inc/user_list.html
index bbd020feffbb7623bec7c13c9c2e5023a63399a3..da7410766c52e78f34335d75d9da5bfad3f808cb 100644 (file)
--- a/teleforma/templates/telemeta/inc/user_list.html
+++ b/teleforma/templates/telemeta/inc/user_list.html
@@ -56,7 +56,7 @@
         <td></td>
 
     {% endif %}
-    <td><a href="{% url postman_write user.username %}" class="component_icon button" id="action_orange">{% trans "Message" %}</a></td>
+    <td><a href="{% url postman_write user.username %}" class="component_icon button" id="action_red">{% trans "Message" %}</a></td>
     </tr>
     {% endfor %}
     </tbody>

diff --git a/teleforma/templates/telemeta/profile_detail.html b/teleforma/templates/telemeta/profile_detail.html
index 9f3aa6e86f2331abdd01f4733f33f85bf1973e5b..90dba8a94c9395b87dbbe849636edabf53a9e17a 100644 (file)
--- a/teleforma/templates/telemeta/profile_detail.html
+++ b/teleforma/templates/telemeta/profile_detail.html
@@ -21,7 +21,7 @@
 
   {% if user.is_authenticated and user.username == usr.username or user.is_staff %}
    <div class="module_action">
-    <a href="{% url telemeta-profile-edit usr.username %}" class="component_icon button" id="action_blue">{% trans "Modify" %}</a>
+    <a href="{% url telemeta-profile-edit usr.username %}" class="component_icon button" id="action_blue">{% trans "Edit" %}</a>
    </div>
   {%  endif %}
 

diff --git a/teleforma/templates/telemeta/search_criteria.html b/teleforma/templates/telemeta/search_criteria.html
index dc1aa93baf75061cc8893d442e84c3bf3b6c1add..7177ad7fa5ac4bc1ebec3fb09301f4004408a8d6 100644 (file)
--- a/teleforma/templates/telemeta/search_criteria.html
+++ b/teleforma/templates/telemeta/search_criteria.html
@@ -64,6 +64,11 @@ $(document).ready(function () {
     {% endwith %}
     {% endblock %}
 
+<div class="module_action">
+    <a href="#" class="component_icon button" id="action_yellow"
+      onclick="document.getElementById('searchform').submit(); return false;">{% trans 'Search' %}</a>
+</div>
+
 </div>
 
 <div class="desk_course">
@@ -151,10 +156,5 @@ $(document).ready(function () {
 </div>
 </div>
 
-<div class="module_action">
-    <a href="#" class="component_icon button" id="action_yellow"
-      onclick="document.getElementById('searchform').submit(); return false;">{% trans 'Search' %}</a>
-</div>
-
 
 {% endblock %}

diff --git a/teleforma/templates/telemeta/users.html b/teleforma/templates/telemeta/users.html
index 965bb2f6df5ef758ba30e11c27acf5d8b13218cd..b02fffb976340bde41c32457d681b76fda87eba7 100644 (file)
--- a/teleforma/templates/telemeta/users.html
+++ b/teleforma/templates/telemeta/users.html
@@ -26,7 +26,7 @@
 
 {% if all_users %}
 <div class="module_action">
-<a href="{% url postman_write all_users|to_recipients %}" class="component_icon button" id="action_red">{% trans "New message" %}</a>
+<a href="{% url postman_write all_users|to_recipients %}" class="component_icon button" id="action_orange">{% trans "New message" %}</a>
 </div>
 {% endif %}