fix styles, add help page

diff --git a/example/settings.py b/example/settings.py
index c6c4150533a3c65bb851332d3b75e8b298cf8980..b604f974834527de59420871de5e7595010d1b69 100644 (file)
--- a/example/settings.py
+++ b/example/settings.py
@@ -177,7 +177,7 @@ LOGIN_URL = '/login/'
 LOGIN_REDIRECT_URL = reverse_lazy('teleforma-desk')
 SESSION_EXPIRE_AT_BROWSER_CLOSE = False
 
-EMAIL_HOST = 'smtp.free.fr'
+EMAIL_HOST = 'smtp.numericable.fr'
 DEFAULT_FROM_EMAIL = 'webmaster@parisson.com'
 SERVER_EMAIL = 'webmaster@parisson.com'
 EMAIL_SUBJECT_PREFIX = '[' + TELEMETA_ORGANIZATION.decode('utf8') + '] '

diff --git a/teleforma/pages/fr/help.rst b/teleforma/pages/fr/help.rst
index d57c14fd96cc96d3635e0be7cd706f9cbc863624..beb7ddf78e17efa4c4d1304e102207b9fc1b4562 100644 (file)
--- a/teleforma/pages/fr/help.rst
+++ b/teleforma/pages/fr/help.rst
@@ -1,22 +1,32 @@
-.. image:: images/help.png
-    :align: left
 
 ========================
 Pages d'aide de Telemeta
 ========================
 
+Démonstrations
+==============
+
+Navigateur
+==========
+
+FAQ
+====
+
+Support
+========
+
 Pour obtenir une aide technique, merci de vous inscrire à la mailing liste de Telemeta :
-    
+
     `http://lists.parisson.com/cgi-bin/mailman/listinfo/telemeta <http://lists.parisson.com/cgi-bin/mailman/listinfo/telemeta>`_
-    
+
 ou bien contacter la hotline parisson par e-mail :
-        
+
     support@parisson.com
-        
+
 ou twitter :
-            
+
     `http://twitter.com/telemeta <http://twitter.com/telemeta>`_
-            
+
 Pour plus d'informations sur le système Telemeta, voir `telemeta.org <http://telemeta.org>`_
-            
+
 Telemeta utilise la librairie audio TimeSide : `code.google.com/p/timeside/ <http://code.google.com/p/timeside/>`_
\ No newline at end of file

diff --git a/teleforma/static/teleforma/css/teleforma.css b/teleforma/static/teleforma/css/teleforma.css
index 61d6c3f1e69177ba86d3b927ce2c1cad456f7a14..6dc5344d5c9cd67e69a5b4062015f01d4d13d5bd 100644 (file)
--- a/teleforma/static/teleforma/css/teleforma.css
+++ b/teleforma/static/teleforma/css/teleforma.css
@@ -99,14 +99,14 @@ a img { border: none; }
 }
 
 #logo_wrapper {
-    width: 3%;
-    margin: 0 auto;
+    width: 2%;
+    margin: 0em auto;
     float: left;
 }
 
 #logo {
-    width: 3%;
-    margin:0px auto;
+    width: 2%;
+    margin:0em auto;
     padding-top: 0.6em;
     padding-bottom: 0.5em;
     }

diff --git a/teleforma/templates/teleforma/inc/chat_room.html b/teleforma/templates/teleforma/inc/chat_room.html
index ccf6c9815fc2ff8ef3cd42f93694285df94e6a44..0d2165d6e5a718193a7ef45aa84e38dfbc42da6e 100644 (file)
--- a/teleforma/templates/teleforma/inc/chat_room.html
+++ b/teleforma/templates/teleforma/inc/chat_room.html
@@ -9,7 +9,7 @@
         <form id="chatform">{% csrf_token %}
         <label for="msg"></label>
         <div class="msg">
-        <input type="text" id="msg" size="26" />
+        <input type="text" id="msg" size="16" />
         <input type="submit" value="{% trans "Send" %}" />
         </div>
         </form>

diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html
index cca1f54882f58941563975b67f0b4f3f0d3377f0..9099cdd1a9313011bac33207182ac01d0be93666 100644 (file)
--- a/teleforma/templates/telemeta/base.html
+++ b/teleforma/templates/telemeta/base.html
@@ -94,7 +94,7 @@ alt="logo" />
  </li>
  <li><a href="{% url telemeta-admin-general %}" class="blue">{% trans "Admin" %}</a></li>
   {% else %}
-   <li><a href="{% url telemeta-flatpage "help" %}" class="green">{% trans "Help" %}</a></li>
+   <li><a href="{% url teleforma-help %}" class="green">{% trans "Help" %}</a></li>
  {% endif %}
 
  <li style="a.active{background-image:{{ STATIC_URL }}telemeta/images/user_tr_bk.png; background-repeat: no-repeat;
@@ -107,7 +107,7 @@ alt="logo" />
     <li><a href="{% url telemeta-profile-detail user.username %}" class="yellow">{% trans "Profile" %}</a></li>
     {% if user.is_staff %}
     <li><a href="{% url telemeta-desk-lists %}">{% trans "Lists" %}</a></li>
-    <li><a href="{% url telemeta-flatpage "help" %}">{% trans "Help" %}</a></li>
+    <li><a href="{% url teleforma-help %}">{% trans "Help" %}</a></li>
     {% endif %}
     <li><a href="{% url telemeta-logout %}">{% trans "Sign out" %}</a></li>
     </ul>
@@ -151,7 +151,7 @@ alt="logo" />
     <a id="telemeta_powered" href="{% telemeta_url %}" target="_blank"><img src="{% url telemeta-images "logo_mini_2.png" %}"
    alt="Telemeta Powered"/></a>
     <p class="left">
-    {% trans "Powered by" %} <a href="{% telemeta_url %}" target="_blank"><br /><strong>TeleForma {% teleforma_version %}</strong></a><br />
+    {% trans "Powered by" %} <a href="http://parisson.com" target="_blank"><br /><strong>TeleForma {% teleforma_version %}</strong></a><br />
     </p>
    </td>
    <td>

diff --git a/teleforma/urls.py b/teleforma/urls.py
index 0588529990bf0a5811f9d1965831648025392c02..66f06501e52671f18b8df3ba7f58e51becfca2d8 100644 (file)
--- a/teleforma/urls.py
+++ b/teleforma/urls.py
@@ -55,6 +55,9 @@ urlpatterns = patterns('',
     # Telemeta
     url(r'^', include('telemeta.urls')),
 
+    # Help
+    url(r'^help/$', HelpView.as_view(), name="teleforma-help"),
+
     # Desk
     url(r'^desk/$', CoursesView.as_view(), name="teleforma-desk"),
     url(r'^desk/courses/(?P<pk>.*)/$', CourseView.as_view(), name="teleforma-course-detail"),

diff --git a/teleforma/views.py b/teleforma/views.py
index 5e396f31d4707c01c18d7170a5d18f6615d89d42..f4193bc1c6291d9c5e698eb8aeaa41bb4be3f763 100755 (executable)
--- a/teleforma/views.py
+++ b/teleforma/views.py
@@ -511,3 +511,19 @@ class UsersXLSExport(object):
         course = Course.objects.filter(id=id)
         self.users = User.objects.filter(student__training__courses__in=course)
         return self.export(request)
+
+
+class HelpView(TemplateView):
+
+    template_name='teleforma/help.html'
+
+    def get_context_data(self, **kwargs):
+        context = super(HelpView, self).get_context_data(**kwargs)
+        context['page_content'] = pages.get_page_content(self.request, 'help',
+                                                         ignore_slash_issue=True)
+        return context
+
+    def dispatch(self, *args, **kwargs):
+        return super(HelpView, self).dispatch(*args, **kwargs)
+
+