Changeset 17968d469c9f73e1db9c669ea9958d8bfe2a0094

Timestamp:

12/23/09 00:34:29 (2 years ago)

Author:

Flupke <luper.rouch@…>

Children:

980abcd884374656c6988c9b856917e35bf19d69

Parents:

1fc1a76f248140aa640ebd8c2aec18af407860a4

git-committer:

Flupke <luper.rouch@…> (12/23/09 00:34:29)

Message:

derez: added controls to select the current language

Location:

derez

Files:

• derez.egg-info/SOURCES.txt (modified) (1 diff)
• derez/apps/derezapp/context_processors.py (modified) (2 diffs)
• derez/apps/derezapp/settings.py (added)
• derez/apps/derezapp/templates/base.html (modified) (1 diff)
• derez/projects/dev/manage (modified) (1 diff)
• derez/projects/settings_base.py (modified) (2 diffs)
• files/flags.svg (added)
• files/images/eu-flag-hover.png (added)
• files/images/eu-flag.png (added)
• files/images/fr-flag-hover.png (added)
• files/images/fr-flag.png (added)
• static/css/derez.css (modified) (1 diff)
• static/images/sprites.png (modified) (previous)

derez/derez.egg-info/SOURCES.txt

@@ -7 +7 @@
 derez/apps/__init__.py
 derez/apps/derezapp/__init__.py
+derez/apps/derezapp/admin.py
 derez/apps/derezapp/context_processors.py
 derez/apps/derezapp/models.py

derez/derez/apps/derezapp/context_processors.py

@@ +1 @@
+from django.conf import settings
+from derezapp import settings
+
+
 def location(request):
+    # Compute location from the beginning of the URL
     location = None
     if request.path == "/" or request.path.startswith("/news"):
@@ -9 +14 @@
     elif request.path.startswith("/contact"):
         location = "contact"
-    return {"LOCATION": location}
+    # Compute french and english locations of the current page
+    fr_location = settings.FR_HOST + request.path
+    en_location = settings.EN_HOST + request.path
+    return {
+            "LOCATION": location,
+            "FR_LOCATION": fr_location,
+            "EN_LOCATION": en_location,
+        }

derez/derez/apps/derezapp/templates/base.html

@@ -17 +17 @@
             {% block content %}{% endblock %}
         </div>
+        <div id="langs">
+            <a id="fr-flag" href="{{ FR_LOCATION }}" {% ifequal LANGUAGE_CODE "fr-fr" %}class="selected"{% endifequal %}></a>
+            <a id="eu-flag" href="{{ EN_LOCATION }}" {% ifequal LANGUAGE_CODE "en-us" %}class="selected"{% endifequal %}></a>
+        </div>
     </body>
 </html>

derez/derez/projects/dev/manage

@@ -1 +1 @@
 #!/bin/sh
 
-./manage.py $@ --settings=derez.projects.dev.settings_fr
+django-admin.py $@ --settings=derez.projects.dev.settings_fr

derez/derez/projects/settings_base.py

@@ -50 +50 @@
     "django.core.context_processors.request",
     "django.core.context_processors.media",
+    "django.core.context_processors.i18n",
     "derezapp.context_processors.location",
 )
@@ -112 +113 @@
     }
 }
-

derez/static/css/derez.css

@@ -312 +312 @@
     background: transparent url(../images/sprites.png) 0px -485px no-repeat;
 }
+
+/**
+ * Flags
+ */
+
+#fr-flag {
+    position: fixed;
+    right: 60px;
+    bottom: 5px;
+    width: 50px;
+    height: 36px;
+    background: transparent url(../images/sprites.png) -143px -21px no-repeat;
+}
+
+#fr-flag:hover, #fr-flag.selected {
+    position: fixed;
+    right: 60px;
+    bottom: 5px;
+    width: 50px;
+    height: 36px;
+    background: transparent url(../images/sprites.png) -75px -21px no-repeat;
+}
+
+#eu-flag {
+    position: fixed;
+    right: 5px;
+    bottom: 5px;
+    width: 50px;
+    height: 36px;
+    background: transparent url(../images/sprites.png) -143px -79px no-repeat;
+}
+
+#eu-flag:hover, #eu-flag.selected {
+    position: fixed;
+    right: 5px;
+    bottom: 5px;
+    width: 50px;
+    height: 36px;
+    background: transparent url(../images/sprites.png) -75px -79px no-repeat;
+}
+