From 9441e2b0c6356fdf18feeef3ccbee34d34da44e3 Mon Sep 17 00:00:00 2001 From: yomguy Date: Thu, 20 Dec 2012 15:18:13 +0100 Subject: [PATCH] update testimonial style --- .../static/teleforma/css/teleforma_pdf.css | 54 ++++++++++++----- .../teleforma/seminar_testimonial.html | 59 ++++++++----------- teleforma/views/pro.py | 2 +- 3 files changed, 65 insertions(+), 50 deletions(-) diff --git a/teleforma/static/teleforma/css/teleforma_pdf.css b/teleforma/static/teleforma/css/teleforma_pdf.css index 27bb339a..c55892f7 100644 --- a/teleforma/static/teleforma/css/teleforma_pdf.css +++ b/teleforma/static/teleforma/css/teleforma_pdf.css @@ -1,16 +1,42 @@ -body {margin: 0; padding: 0;} -a {text-decoration: none; color: #969696;} -a img {border: none;} -html, input, select, textarea, h1, h2, h3, h4, h5, h6 { - font-size: 100%; + +#header{ + font-size: 4em; + color: white; + padding-top: 2em; + padding-left: 1em; + background-color: #3a69b1; } -body { - font: 0.8125em/1em Verdana, sans-serif; - line-height: 1.3em; - color: #333; - background: #FFF; - margin: 0em; - background:no-repeat url(/static/telemeta/images/bg_yt.png) 0 0; - background-color:#ebebeb; - background-repeat:repeat + +#content { + margin-top: 4em; } + +.table { + font-size: 1.5em; + margin: 1em 1em 1em 4em; + width: 100%; +} + + +#address{ + +} + +#signature{ + width: 10%; +} + + + +#footer{ + font-size: 1em; + color: white; + padding: 1em; + padding-left: 1em; + background-color: #3a69b1; + text-align: center; +} + +.bold { + font-weight: bold; +} \ No newline at end of file diff --git a/teleforma/templates/teleforma/seminar_testimonial.html b/teleforma/templates/teleforma/seminar_testimonial.html index 2c936df1..1cc14a31 100644 --- a/teleforma/templates/teleforma/seminar_testimonial.html +++ b/teleforma/templates/teleforma/seminar_testimonial.html @@ -20,58 +20,47 @@ {% block stylesheets %} - {% endblock %} {% block extra_stylesheets %}{% endblock %} - -{% block extra_javascript %}{% endblock %} -{% block infra_javascript %}{% endblock %} - {% block layout %}
-
+ - - - -

{% block title %}{% endblock %}

{% block title_buttons %}{% endblock %}
+
- {% block content %} - {{ seminar.title }} - {% endblock %} +
+ +
+ + + + + + + {% if seminar.keywords.all %}{% endif %} + + + + {% if seminar.description %} + + {% endif %} +
{% trans "Last name" %} : {{ user.last_name|upper }}
{% trans "First name" %} : {{ user.first_name|upper }}
{% trans "Address" %} : {{ user.auditor.all.0.address }} {{ user.auditor.all.0.postal_code }} {{ user.auditor.all.0.city }}
{% trans "Seminar" %} : {{ seminar.title }} {% if seminar.rank %} n°{{seminar.rank}}{% endif %}
{% trans "course" %} : {{ seminar.course }}
{% trans "keywords" %}{% for kw in seminar.keywords.all %}{{ kw }}, {% endfor %}
{% trans "level" %} : {{ seminar.level }}
{% trans "public concerned" %} : {{ seminar.concerned }}
{% trans "duration" %} : {{ seminar.duration }}
{% trans "description" %} :
{{ seminar.description|safe }}
+
{% block footer %} + Copyright © {% current_year %} {{ seminar.course.department }} + {% endblock %} diff --git a/teleforma/views/pro.py b/teleforma/views/pro.py index 392856a3..a2548d67 100644 --- a/teleforma/views/pro.py +++ b/teleforma/views/pro.py @@ -106,7 +106,7 @@ def get_seminars(user): seminars = professor.seminars.all() elif auditor: - auditor = user.pro_auditor.get() + auditor = user.auditor.get() s_seminars = auditor.seminars.all() elif user.is_staff or user.is_superuser: -- 2.39.5