From ded31412eb29eaec71d19e69034da971406ca906 Mon Sep 17 00:00:00 2001 From: yomguy Date: Tue, 10 Jul 2012 11:30:22 +0200 Subject: [PATCH] fix styles, add help page --- example/settings.py | 2 +- teleforma/pages/fr/help.rst | 28 +++++++++++++------ teleforma/static/teleforma/css/teleforma.css | 8 +++--- .../templates/teleforma/inc/chat_room.html | 2 +- teleforma/templates/telemeta/base.html | 6 ++-- teleforma/urls.py | 3 ++ teleforma/views.py | 16 +++++++++++ 7 files changed, 47 insertions(+), 18 deletions(-) diff --git a/example/settings.py b/example/settings.py index c6c41505..b604f974 100644 --- 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 d57c14fd..beb7ddf7 100644 --- 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 `_ - + ou bien contacter la hotline parisson par e-mail : - + support@parisson.com - + ou twitter : - + `http://twitter.com/telemeta `_ - + Pour plus d'informations sur le système Telemeta, voir `telemeta.org `_ - + Telemeta utilise la librairie audio TimeSide : `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 61d6c3f1..6dc5344d 100644 --- 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 ccf6c981..0d2165d6 100644 --- a/teleforma/templates/teleforma/inc/chat_room.html +++ b/teleforma/templates/teleforma/inc/chat_room.html @@ -9,7 +9,7 @@
{% csrf_token %}
- +
diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html index cca1f548..9099cdd1 100644 --- a/teleforma/templates/telemeta/base.html +++ b/teleforma/templates/telemeta/base.html @@ -94,7 +94,7 @@ alt="logo" />
  • {% trans "Admin" %}
    • {% else %} -
  • {% trans "Help" %}
    • +
  • {% trans "Help" %}
    • {% endif %}
  • {% trans "Profile" %}
    • {% if user.is_staff %}
  • {% trans "Lists" %}
    • -
  • {% trans "Help" %}
    • +
  • {% trans "Help" %}
    • {% endif %}
  • {% trans "Sign out" %}
    • @@ -151,7 +151,7 @@ alt="logo" /> Telemeta Powered

    - {% trans "Powered by" %}
    TeleForma {% teleforma_version %}
    + {% trans "Powered by" %}
    TeleForma {% teleforma_version %}

    diff --git a/teleforma/urls.py b/teleforma/urls.py index 05885299..66f06501 100644 --- 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.*)/$', CourseView.as_view(), name="teleforma-course-detail"), diff --git a/teleforma/views.py b/teleforma/views.py index 5e396f31..f4193bc1 100755 --- 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) + + -- 2.39.5