From cc0b9a8d9e12172624c061875bf5a3f2287c954e Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Tue, 18 Mar 2014 18:18:25 +0100 Subject: [PATCH 1/4] remove dead app login_plugin --- MANIFEST.in | 3 -- portail_citoyen/apps/login_plugin/__init__.py | 0 .../apps/login_plugin/cms_plugins.py | 22 ----------- .../locale/fr/LC_MESSAGES/django.po | 37 ------------------- portail_citoyen/apps/login_plugin/models.py | 6 --- .../templates/login_plugin/plugin.html | 27 -------------- portail_citoyen/apps/login_plugin/tests.py | 16 -------- portail_citoyen/apps/login_plugin/views.py | 1 - portail_citoyen/fixtures/demo.json | 10 ----- portail_citoyen/settings.py | 1 - tools/export_data.sh | 2 +- 11 files changed, 1 insertion(+), 124 deletions(-) delete mode 100644 portail_citoyen/apps/login_plugin/__init__.py delete mode 100644 portail_citoyen/apps/login_plugin/cms_plugins.py delete mode 100644 portail_citoyen/apps/login_plugin/locale/fr/LC_MESSAGES/django.po delete mode 100644 portail_citoyen/apps/login_plugin/models.py delete mode 100644 portail_citoyen/apps/login_plugin/templates/login_plugin/plugin.html delete mode 100644 portail_citoyen/apps/login_plugin/tests.py delete mode 100644 portail_citoyen/apps/login_plugin/views.py diff --git a/MANIFEST.in b/MANIFEST.in index 6f05fa9..9a21b7b 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,3 @@ -recursive-include portail_citoyen/apps/login_plugin/templates *.html -recursive-include portail_citoyen/apps/login_plugin/static *.css *.gif *.png *.js -recursive-include portail_citoyen/apps/login_plugin/locale *.po *.mo recursive-include portail_citoyen/apps/data_source_plugin/templates *.html recursive-include portail_citoyen/apps/data_source_plugin/static *.css *.gif *.png *.js recursive-include portail_citoyen/apps/data_source_plugin/locale *.po *.mo diff --git a/portail_citoyen/apps/login_plugin/__init__.py b/portail_citoyen/apps/login_plugin/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/portail_citoyen/apps/login_plugin/cms_plugins.py b/portail_citoyen/apps/login_plugin/cms_plugins.py deleted file mode 100644 index ee01717..0000000 --- a/portail_citoyen/apps/login_plugin/cms_plugins.py +++ /dev/null @@ -1,22 +0,0 @@ -from django.utils.translation import ugettext_lazy as _ -from django.contrib.auth.forms import AuthenticationForm -from django.core.urlresolvers import reverse - -from cms.plugin_base import CMSPluginBase -from cms.plugin_pool import plugin_pool -from models import LoginPlugin as LoginPluginModel - -class LoginPlugin(CMSPluginBase): - model = LoginPluginModel - name = _('Login Plugin') - render_template = "login_plugin/plugin.html" - text_enabled = False - - def render(self, context, instance, placeholdre): - context.update({ - 'form': AuthenticationForm(), - 'action': reverse('login'), - }) - return context - -plugin_pool.register_plugin(LoginPlugin) diff --git a/portail_citoyen/apps/login_plugin/locale/fr/LC_MESSAGES/django.po b/portail_citoyen/apps/login_plugin/locale/fr/LC_MESSAGES/django.po deleted file mode 100644 index d383988..0000000 --- a/portail_citoyen/apps/login_plugin/locale/fr/LC_MESSAGES/django.po +++ /dev/null @@ -1,37 +0,0 @@ -# Translation of portail-citoyen strings -# Copyright (C) 2013 Entr'ouvert -# This file is distributed under the same license as the portail-citoyen package. -# Benjamin Dauvergne , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: portail_citoyen 0.1.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-19 15:11+0100\n" -"PO-Revision-Date: 2013-03-19 15:15+0100\n" -"Last-Translator: Benjamin Dauvergne \n" -"Language: fr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#: cms_plugins.py:11 -msgid "Login Plugin" -msgstr "Bloc de connexion" - -#: templates/login_plugin/plugin.html:27 -#, python-format -msgid "" -"\n" -"

Bonjour %(name)s !

\n" -" " -msgstr "" - -#: templates/login_plugin/plugin.html:31 -msgid "Logout" -msgstr "Déconnexion" - -#: templates/login_plugin/plugin.html:33 -msgid "Mon profil" -msgstr "" diff --git a/portail_citoyen/apps/login_plugin/models.py b/portail_citoyen/apps/login_plugin/models.py deleted file mode 100644 index 9a82f16..0000000 --- a/portail_citoyen/apps/login_plugin/models.py +++ /dev/null @@ -1,6 +0,0 @@ -from cms.models import CMSPlugin - -class LoginPlugin(CMSPlugin): - - def __unicode__(self): - return 'Login' diff --git a/portail_citoyen/apps/login_plugin/templates/login_plugin/plugin.html b/portail_citoyen/apps/login_plugin/templates/login_plugin/plugin.html deleted file mode 100644 index cb3ee8c..0000000 --- a/portail_citoyen/apps/login_plugin/templates/login_plugin/plugin.html +++ /dev/null @@ -1,27 +0,0 @@ -{% load url from future %} -{% load i18n %} -
-{% if not request.user.is_authenticated %} -
- {% csrf_token %} - - {{ form.as_p }} - - - {% if next %} - - {% endif %} -
-

Mot de passe perdu ?

- {% url 'registration_register' as registration_url %} - {% if registration_url %} -

Pas encore de compte ?

- {% endif %} -{% else %} - {% blocktrans with name=request.user %} -

Bonjour {{ name }} !

- {% endblocktrans %} - {% url 'auth_logout' as logout_url %} - {% if logout_url %}

{% trans "Logout" %}

{% endif %} -{% endif %} -
diff --git a/portail_citoyen/apps/login_plugin/tests.py b/portail_citoyen/apps/login_plugin/tests.py deleted file mode 100644 index 501deb7..0000000 --- a/portail_citoyen/apps/login_plugin/tests.py +++ /dev/null @@ -1,16 +0,0 @@ -""" -This file demonstrates writing tests using the unittest module. These will pass -when you run "manage.py test". - -Replace this with more appropriate tests for your application. -""" - -from django.test import TestCase - - -class SimpleTest(TestCase): - def test_basic_addition(self): - """ - Tests that 1 + 1 always equals 2. - """ - self.assertEqual(1 + 1, 2) diff --git a/portail_citoyen/apps/login_plugin/views.py b/portail_citoyen/apps/login_plugin/views.py deleted file mode 100644 index 60f00ef..0000000 --- a/portail_citoyen/apps/login_plugin/views.py +++ /dev/null @@ -1 +0,0 @@ -# Create your views here. diff --git a/portail_citoyen/fixtures/demo.json b/portail_citoyen/fixtures/demo.json index c63b044..0b570bf 100644 --- a/portail_citoyen/fixtures/demo.json +++ b/portail_citoyen/fixtures/demo.json @@ -5135,16 +5135,6 @@ "movie_url": "https://www.youtube.com/watch?v=4ria7AhD7ro" } }, -{ - "pk": 606, - "model": "login_plugin.loginplugin", - "fields": {} -}, -{ - "pk": 1289, - "model": "login_plugin.loginplugin", - "fields": {} -}, { "pk": 2, "model": "data_source_plugin.datasource", diff --git a/portail_citoyen/settings.py b/portail_citoyen/settings.py index e752b63..a8bff99 100644 --- a/portail_citoyen/settings.py +++ b/portail_citoyen/settings.py @@ -140,7 +140,6 @@ INSTALLED_APPS = ( 'cms.plugins.teaser', 'cms.plugins.video', 'cmsplugin_text_wrapper', - 'login_plugin', 'feed_plugin', 'data_source_plugin', 'a2_service_list_plugin', diff --git a/tools/export_data.sh b/tools/export_data.sh index 88d28df..248dc28 100755 --- a/tools/export_data.sh +++ b/tools/export_data.sh @@ -1,5 +1,5 @@ #!/bin/sh portail-citoyen-manage dumpdata --indent=2 sites cms cms.cmsplugin cmsplugin_text_wrapper \ - file googlemap link picture snippet teaser video login_plugin data_source_plugin \ + file googlemap link picture snippet teaser video data_source_plugin \ a2_service_list_plugin feed_plugin idp attribute_aggregator > demo.json From e156eaac9046e1e3e76e1ddf045f49e244a34e31 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Tue, 18 Mar 2014 18:19:52 +0100 Subject: [PATCH 2/4] update french translation --- .../locale/fr/LC_MESSAGES/django.po | 362 ++---------------- 1 file changed, 36 insertions(+), 326 deletions(-) diff --git a/portail_citoyen/locale/fr/LC_MESSAGES/django.po b/portail_citoyen/locale/fr/LC_MESSAGES/django.po index d5d643c..48da98e 100644 --- a/portail_citoyen/locale/fr/LC_MESSAGES/django.po +++ b/portail_citoyen/locale/fr/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: portail_citoyen 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-22 14:32+0100\n" -"PO-Revision-Date: 2013-09-06 14:17+0200\n" +"POT-Creation-Date: 2014-03-18 18:05+0100\n" +"PO-Revision-Date: 2014-03-18 18:08+0100\n" "Last-Translator: Benjamin Dauvergne \n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -28,7 +28,7 @@ msgstr "" msgid "Important dates" msgstr "Dates importantes" -#: admin.py:138 apps/data_source_plugin/models.py:40 +#: admin.py:138 msgid "URL" msgstr "" @@ -42,35 +42,35 @@ msgstr "" #: admin.py:178 #, python-format msgid "Unable to create the SAML 2.0 provider: %s" -msgstr "" +msgstr "Échec lors de la création du fournisseur de service: %s" #: cms_plugins.py:53 msgid "account form plugin" -msgstr "" +msgstr "Plugin d'édition du profil" -#: cms_plugins.py:73 +#: cms_plugins.py:75 msgid "account management plugin" -msgstr "" +msgstr "Plugin de gestion du compte citoyen" #: dashboard.py:12 msgid "Users and roles" -msgstr "" +msgstr "Utilisateurs et rôles" #: dashboard.py:17 msgid "Services" -msgstr "" +msgstr "Services" #: dashboard.py:30 msgid "Contents" -msgstr "" +msgstr "Contenus" #: dashboard.py:39 msgid "Announces" -msgstr "" +msgstr "Annonces" #: dashboard.py:46 dashboard.py:81 msgid "Recent Actions" -msgstr "" +msgstr "Actions récentes" #: dashboard.py:50 msgid "Support" @@ -78,7 +78,7 @@ msgstr "" #: dashboard.py:53 msgid "Project site" -msgstr "" +msgstr "Site du projet" #: dashboard.py:58 msgid "Report a bug" @@ -88,56 +88,56 @@ msgstr "Reporter un bug" msgid "Dashboard" msgstr "Tableau de bord" -#: models.py:15 +#: models.py:12 msgctxt "person title" msgid "title" msgstr "civilité" -#: models.py:16 +#: models.py:13 msgid "Mrs" msgstr "Madame" -#: models.py:17 +#: models.py:14 msgid "Mr" msgstr "Monsieur" -#: models.py:19 +#: models.py:16 msgid "first name" msgstr "prénom" -#: models.py:20 +#: models.py:17 msgid "last name" msgstr "nom" -#: models.py:21 +#: models.py:18 msgid "e-mail address" msgstr "e-mail" -#: models.py:22 +#: models.py:19 msgid "city" msgstr "ville" -#: models.py:23 +#: models.py:20 msgid "address" msgstr "adresse" -#: models.py:24 +#: models.py:21 msgid "postal code" msgstr "code postal" -#: models.py:27 +#: models.py:24 msgid "Postal code must be five numbers" msgstr "Le code postal doit comporter 5 chiffres" -#: models.py:28 +#: models.py:25 msgid "Invalid postal code" msgstr "Code postal invalide" -#: models.py:31 +#: models.py:28 msgid "phone" msgstr "Téléphone fixe" -#: models.py:33 models.py:36 +#: models.py:30 models.py:33 msgid "" "Phone number must start with 01, 02, 03, 04, 05, 08 or 07 and be ten digits " "long without spaces" @@ -145,15 +145,15 @@ msgstr "" "Les numéros de téléphone fixe doivent commencer par 01, 02, 03, 04, 05, 08 " "ou 07 et contenir 10 chiffres sans espaces" -#: models.py:37 models.py:44 +#: models.py:34 models.py:41 msgid "Invalid mobile phone number" msgstr "" -#: models.py:38 +#: models.py:35 msgid "mobile" msgstr "Téléphone mobile" -#: models.py:40 models.py:43 +#: models.py:37 models.py:40 msgid "" "Mobile phone number must start with 06 or 07 and be ten digits long without " "spaces" @@ -161,311 +161,17 @@ msgstr "" "Les numéros de téléphone mobile doivent commencer par un 06 ou 07 et " "contenir 10 chiffres sans espaces" -#: models.py:62 +#: models.py:59 msgid "role" msgstr "rôle" -#: models.py:63 +#: models.py:60 msgid "roles" msgstr "rôles" #: settings.py:45 msgid "French" -msgstr "" - -#: apps/a2_service_list_plugin/cms_plugins.py:11 -msgid "Authentic2 Service List Plugin" -msgstr "" - -#: apps/auquotidien_plugin/cms_plugins.py:27 -#: apps/auquotidien_plugin/models.py:43 -msgid "au-quotidien active forms plugin" -msgstr "" - -#: apps/auquotidien_plugin/models.py:18 -msgid "liberty service provider for the au-quotidien service" -msgstr "" - -#: apps/auquotidien_plugin/models.py:20 -msgid "origin" -msgstr "" - -#: apps/auquotidien_plugin/models.py:21 -msgid "hashing algorithm" -msgstr "" - -#: apps/auquotidien_plugin/models.py:23 -msgid "signature key" -msgstr "" - -#: apps/auquotidien_plugin/models.py:30 apps/auquotidien_plugin/models.py:37 -msgid "au-quotidien API endpoint" -msgstr "" - -#: apps/auquotidien_plugin/models.py:31 -msgid "au-quotidien API endpoints" -msgstr "" - -#: apps/auquotidien_plugin/models.py:38 -msgid "maximum forms" -msgstr "" - -#: apps/auquotidien_plugin/models.py:39 -msgid "refresh timeout" -msgstr "" - -#: apps/auquotidien_plugin/models.py:40 apps/data_source_plugin/models.py:101 -msgid "Number of seconds between two web service calls" -msgstr "" - -#: apps/auquotidien_plugin/models.py:44 -msgid "au-quotidien active forms plugins" -msgstr "" - -#: apps/data_source_plugin/cms_plugins.py:134 -msgid "Raw Inline Template Plugin" -msgstr "" - -#: apps/data_source_plugin/cms_plugins.py:143 -msgid "Data Source Plugin" -msgstr "" - -#: apps/data_source_plugin/models.py:25 -msgid "JSON" -msgstr "" - -#: apps/data_source_plugin/models.py:26 -msgid "RSS" -msgstr "" - -#: apps/data_source_plugin/models.py:27 -msgid "HTML" -msgstr "" - -#: apps/data_source_plugin/models.py:28 -msgid "XML" -msgstr "" - -#: apps/data_source_plugin/models.py:37 -#: apps/passerelle_register_plugin/templates/passerelle_register_plugin/plugin.html:14 -msgid "Name" -msgstr "" - -#: apps/data_source_plugin/models.py:38 -msgid "MIME Type" -msgstr "" - -#: apps/data_source_plugin/models.py:42 -msgid "Hashing algorithm" -msgstr "" - -#: apps/data_source_plugin/models.py:44 -msgid "Signature key" -msgstr "" - -#: apps/data_source_plugin/models.py:46 -msgid "verify certificate" -msgstr "" - -#: apps/data_source_plugin/models.py:51 -msgid "You must choose a hashing algorithm if you set a signature key" -msgstr "" - -#: apps/data_source_plugin/models.py:55 -#, python-brace-format -msgid "Data source {name}, url: {url} mime-type: {mime_type}" -msgstr "" - -#: apps/data_source_plugin/models.py:59 -msgid "Data source" -msgstr "" - -#: apps/data_source_plugin/models.py:60 -msgid "Data sources" -msgstr "" - -#: apps/data_source_plugin/models.py:76 -msgid "Overloaded template" -msgstr "" - -#: apps/data_source_plugin/models.py:91 apps/data_source_plugin/models.py:95 -msgid "Raw inline template plugin" -msgstr "" - -#: apps/data_source_plugin/models.py:92 -msgid "Raw inline template plugins" -msgstr "" - -#: apps/data_source_plugin/models.py:99 -msgid "Maximum entries" -msgstr "" - -#: apps/data_source_plugin/models.py:100 -msgid "Refresh timeout" -msgstr "" - -#: apps/data_source_plugin/models.py:108 -#, python-format -msgid "DataSource with %d sources" -msgstr "" - -#: apps/federation_plugin/cms_plugins.py:13 -msgid "federation management plugin" -msgstr "" - -#: apps/federation_plugin/models.py:19 -#, fuzzy -msgid "provider restrictions" -msgstr "Enregistrement réussi" - -#: apps/federation_plugin/models.py:20 -msgid "" -"provides provider slug separated by commas, appended or prepended spaces " -"will be removed" -msgstr "" - -#: apps/federation_plugin/models.py:34 -#, python-format -msgid "no provider with slug %r" -msgstr "" - -#: apps/federation_plugin/templates/federation_plugin/federation_panel.html:13 -msgid "Delete" -msgstr "" - -#: apps/federation_plugin/templates/federation_plugin/plugin.html:6 -#, python-format -msgid "" -"\n" -" You have currently %(count)s federation.\n" -" " -msgid_plural "" -"\n" -" You have currently %(count)s federations.\n" -" " -msgstr[0] "" -msgstr[1] "" - -#: apps/federation_plugin/templates/federation_plugin/plugin.html:14 -msgid "You have no federation currently." -msgstr "" - -#: apps/feed_plugin/cms_plugins.py:23 -msgid "select user feeds" -msgstr "" - -#: apps/feed_plugin/cms_plugins.py:47 -msgid "show user feeds" -msgstr "" - -#: apps/feed_plugin/forms.py:9 -msgid "Your feeds" -msgstr "" - -#: apps/feed_plugin/models.py:12 -msgid "user feed subscription" -msgstr "" - -#: apps/feed_plugin/models.py:13 -msgid "user feed subscriptions" -msgstr "" - -#: apps/feed_plugin/models.py:23 -#, fuzzy -msgid "name" -msgstr "nom" - -#: apps/feed_plugin/models.py:26 -msgid "Color" -msgstr "" - -#: apps/feed_plugin/models.py:27 -msgid "as an hexadecimal number" -msgstr "" - -#: apps/feed_plugin/models.py:30 -msgid "CSS classes" -msgstr "" - -#: apps/feed_plugin/models.py:34 -msgid "feed" -msgstr "" - -#: apps/feed_plugin/models.py:35 -msgid "feeds" -msgstr "" - -#: apps/feed_plugin/templates/feed_plugin/select_user_feed.html:14 -#: apps/passerelle_register_plugin/templates/passerelle_register_plugin/plugin.html:37 -#: templates/profiles/email_change.html:13 -msgid "Validate" -msgstr "" - -#: apps/login_plugin/cms_plugins.py:11 -msgid "Login Plugin" -msgstr "" - -#: apps/login_plugin/templates/login_plugin/plugin.html:21 -#, python-format -msgid "" -"\n" -"

Bonjour %(name)s !

\n" -" " -msgstr "" - -#: apps/login_plugin/templates/login_plugin/plugin.html:25 -msgid "Logout" -msgstr "" - -#: apps/msp/models.py:11 -msgid "user" -msgstr "" - -#: apps/msp/models.py:12 -msgid "access grant code" -msgstr "" - -#: apps/msp/models.py:13 -msgid "access token" -msgstr "" - -#: apps/msp/views.py:145 -msgid "request denied by user" -msgstr "" - -#: apps/msp/views.py:180 -msgid "no local account is linked to your MSP account" -msgstr "" - -#: apps/msp/views.py:200 -msgid "msp link already exists" -msgstr "" - -#: apps/msp/views.py:204 apps/msp/views.py:422 -msgid "msp link created" -msgstr "" - -#: apps/msp/views.py:425 -msgid "to create a link with msp, please authenticate" -msgstr "" - -#: apps/passerelle_register_plugin/cms_plugins.py:13 -msgid "passerelle register plugin" -msgstr "" - -#: apps/passerelle_register_plugin/models.py:20 -msgid "passerelle url" -msgstr "" - -#: apps/passerelle_register_plugin/models.py:22 -#, fuzzy -msgid "ressources restrictions" -msgstr "Enregistrement réussi" - -#: apps/passerelle_register_plugin/models.py:23 -#, fuzzy -msgid "transports restrictions" -msgstr "Enregistrement réussi" +msgstr "Français" #: templates/auth/login_form.html:6 #: templates/registration/password_reset_complete.html:12 @@ -530,6 +236,10 @@ msgstr "Changement de courriel" msgid "Your current email is %(email)s" msgstr "Votre courriel actuel est %(email)s" +#: templates/profiles/email_change.html:13 +msgid "Validate" +msgstr "Valider" + #: templates/registration/activation_complete.html:6 msgid "Your account is now activated" msgstr "Votre compte est maintenant activé" From cfdc293d33a611d8f0d970bf23d349d29eb74feb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Tue, 18 Mar 2014 20:31:20 +0100 Subject: [PATCH 3/4] add some basic responsiveness to default theme --- .../static/portail_citoyen/css/style.css | 65 ++++++++++++++++--- portail_citoyen/templates/base.html | 19 ++++++ 2 files changed, 75 insertions(+), 9 deletions(-) diff --git a/portail_citoyen/static/portail_citoyen/css/style.css b/portail_citoyen/static/portail_citoyen/css/style.css index 340459a..ee3b1b5 100644 --- a/portail_citoyen/static/portail_citoyen/css/style.css +++ b/portail_citoyen/static/portail_citoyen/css/style.css @@ -39,6 +39,8 @@ a { body { overflow-x: hidden; background: white; + max-width: 1000px; + margin: 0 auto; } div#page { @@ -49,18 +51,14 @@ div#header { background-color: #ffffff; width: 100%; margin: 0 0 0 0; - position: absolute; + position: relative; top: 0px; - margin-left: -500px; z-index: 0; } div#top { - height: 456px; - width: 1500px; margin: 0 auto 0 auto; - margin-left: 50%; } div#top h1 { @@ -85,8 +83,8 @@ div#top a img { div#main-content-wrapper { position: relative; z-index: 100; - width: 1000px; - margin: 200px auto 0px auto; + max-width: 1000px; + margin: 0px auto 0px auto; } div#main-content { @@ -98,7 +96,7 @@ div#footer { clear: both; background: white; padding: 0px; - width: 1000px; + width: 90%; margin: 10px auto 0 auto; position: relative; } @@ -367,7 +365,7 @@ div.login-actions { .region-header { - width: 1000px; + width: 100%; position: absolute; top: 0px; } @@ -992,3 +990,52 @@ p.fullname { display: inline; margin-right: 1.5em; } + +@media screen and (max-width: 760px) { + body.narrow-page div.right { + clear: none; + width: 100%; + } + #left, #right { + clear: none; + width: 100%; + } +} + +@media screen and (max-width: 490px) { + #single-title { + cursor: pointer; + } + #nav { + width: 100%; + } + #nav ul { + column-count: 2; + -webkit-column-count: 2; + } + #nav ul li { + margin-top: 0; + } + #real-content { + padding: 0; + } + #toplinks { + top: 0; + left: 0; + width: 98%; + } + +} + +@media screen and (max-width: 400px) { + div#top h1 { + padding-left: 1ex; + margin-left: 0; + } + div#welcome { + display: none; + } + h2#welcome-title { + margin: 0; + } +} diff --git a/portail_citoyen/templates/base.html b/portail_citoyen/templates/base.html index 07f0280..3a419a7 100644 --- a/portail_citoyen/templates/base.html +++ b/portail_citoyen/templates/base.html @@ -76,5 +76,24 @@ jQuery('#messages').delay(3000*(1+{{ messages|length }})).fadeOut('slow'); {% endif %} + From 843bf986dbb24058a86d5bf8761682e60a66d133 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Thu, 20 Mar 2014 10:02:01 +0100 Subject: [PATCH 4/4] fixtures/demo.json: rename "Mes e-services" to "Accueil" --- portail_citoyen/fixtures/demo.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/portail_citoyen/fixtures/demo.json b/portail_citoyen/fixtures/demo.json index 0b570bf..6b617ef 100644 --- a/portail_citoyen/fixtures/demo.json +++ b/portail_citoyen/fixtures/demo.json @@ -4412,7 +4412,7 @@ "model": "cms.title", "fields": { "menu_title": "", - "redirect": "/mes-e-services", + "redirect": "/accueil", "meta_keywords": "", "page_title": "", "language": "fr", @@ -4435,14 +4435,14 @@ "meta_keywords": "", "page_title": "", "language": "fr", - "title": "Mes e-services", + "title": "Accueil", "has_url_overwrite": false, "application_urls": "", "creation_date": "2013-04-17T14:38:21.239Z", "page": 4, - "path": "mes-e-services", + "path": "accueil", "meta_description": "", - "slug": "mes-e-services" + "slug": "accueil" } }, { @@ -4469,7 +4469,7 @@ "model": "cms.title", "fields": { "menu_title": "", - "redirect": "/mes-e-services", + "redirect": "/accueil", "meta_keywords": "", "page_title": "", "language": "fr", @@ -4492,14 +4492,14 @@ "meta_keywords": "", "page_title": "", "language": "fr", - "title": "Mes e-services", + "title": "Accueil", "has_url_overwrite": false, "application_urls": "", "creation_date": "2013-04-17T14:38:21.239Z", "page": 7, - "path": "mes-e-services", + "path": "accueil", "meta_description": "", - "slug": "mes-e-services" + "slug": "accueil" } }, {