--- a/src/ldt/ldt/media/css/ldtform.css Mon Apr 18 16:03:36 2011 +0200
+++ b/src/ldt/ldt/media/css/ldtform.css Mon Apr 18 18:34:49 2011 +0200
@@ -53,6 +53,10 @@
text-align: right;
}
+#submitcontent-buttons-login {
+ text-align: left;
+}
+
#submitcontent-loader {
text-align: left;
}
@@ -67,7 +71,7 @@
}
-#submitcontent-buttons input[type="submit"], #submitcontent-buttons button {
+#submitcontent-buttons input[type="submit"], #submitcontent-buttons button, #submitcontent-buttons-login input[type="submit"], #submitcontent-buttons-login button {
background-color: #656565;
color: white;
width:auto;
--- a/src/ldt/ldt/media/css/registration.css Mon Apr 18 16:03:36 2011 +0200
+++ b/src/ldt/ldt/media/css/registration.css Mon Apr 18 18:34:49 2011 +0200
@@ -14,7 +14,8 @@
#login_links_list {
border-left: 1px solid black;
height: 90%;
- padding-top: 6px;
+ padding-top: 6px;
+ padding-left: 25px;
}
#login_links_list ul {
Binary file web/ldtplatform/locale/fr/LC_MESSAGES/django.mo has changed
--- a/web/ldtplatform/locale/fr/LC_MESSAGES/django.po Mon Apr 18 16:03:36 2011 +0200
+++ b/web/ldtplatform/locale/fr/LC_MESSAGES/django.po Mon Apr 18 18:34:49 2011 +0200
@@ -7,37 +7,41 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-19 19:51+0200\n"
+"POT-Creation-Date: 2011-04-18 17:30+0200\n"
"PO-Revision-Date: 2010-02-17 02:57+0100\n"
"Last-Translator: Yves-Marie Haussonne <ymh.work@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
-#: settings.py:39
+#: .\settings.py:40
msgid "French"
msgstr "Français"
-#: templates/registration/login.html:14
+#: .\templates\registration\login.html.py:21
msgid "Log in"
msgstr "Connexion"
-#: templates/registration/login.html:17
+#: .\templates\registration\login.html.py:24
msgid "Sorry, that's not a valid username or password."
msgstr "Désolé, mais ce n'est pas un identifiant ou un mot de passe valide"
-#: templates/registration/login.html:25
+#: .\templates\registration\login.html.py:35
+msgid "Forget password?"
+msgstr "Mot de passe oublié ?"
+
+#: .\templates\registration\login.html.py:38
msgid "login"
msgstr "Connexion"
-#: templates/registration/login.html:29
-msgid "Forget password?"
-msgstr "Mot de passe oublié ?"
+#: .\templates\registration\login.html.py:45
+msgid "Or login with your external account"
+msgstr "Ou bien utilisez l'un de vos comptes externes"
-msgid "header_title"
-msgstr "Plateforme LDT"
+#~ msgid "header_title"
+#~ msgstr "Plateforme LDT"
-msgid "page_title"
-msgstr "Plateforme LDT"
+#~ msgid "page_title"
+#~ msgstr "Plateforme LDT"
--- a/web/ldtplatform/templates/registration/login.html Mon Apr 18 16:03:36 2011 +0200
+++ b/web/ldtplatform/templates/registration/login.html Mon Apr 18 18:34:49 2011 +0200
@@ -28,10 +28,19 @@
<div id="loginform_div" class="span-12">
{% csrf_token %}
<input type="hidden" name="next" value="{{ next }}" />
-
<ul id="login_fields_list">
{{form.as_ul}}
</ul>
+ <ul>
+ <li><a href="{% url django.contrib.auth.views.password_reset %}" >{% trans "Forget password?" %}</a></li>
+ </ul>
+ <div id="submitcontent-buttons-login" class="span-24 last">
+ <button class="button"type="submit" value="login">{% trans "login" %}</button>
+ </div>
+ </div>
+ </form>
+ <div id="login_links" class="span-12 last">
+ <div id="login_links_list" class="span-12 last">
{% if social_list %}
<p>{% trans "Or login with your external account" %} :</p>
<ul>
@@ -41,20 +50,8 @@
{% comment %}{{social_list|safe}}{% endcomment %}
</ul>
{% endif %}
- </div>
- <div id="login_links" class="span-12 last">
- <div id="login_links_list" class="span-12 last">
- <ul>
- <li><a href="{% url django.contrib.auth.views.password_reset %}" >{% trans "Forget password?" %}</a></li>
- </ul>
- </div>
- </div>
- <div id="submitcontent" class="span-24 last">
- <div id="submitcontent-buttons" class="span-24 last">
- <button class="button"type="submit" value="login">{% trans "login" %}</button>
- </div>
- </div>
- </form>
+ </div>
+ </div>
</div>
{% endblock %}
--- a/web/static/ldt/css/ldtform.css Mon Apr 18 16:03:36 2011 +0200
+++ b/web/static/ldt/css/ldtform.css Mon Apr 18 18:34:49 2011 +0200
@@ -53,6 +53,10 @@
text-align: right;
}
+#submitcontent-buttons-login {
+ text-align: left;
+}
+
#submitcontent-loader {
text-align: left;
}
@@ -67,7 +71,7 @@
}
-#submitcontent-buttons input[type="submit"], #submitcontent-buttons button {
+#submitcontent-buttons input[type="submit"], #submitcontent-buttons button, #submitcontent-buttons-login input[type="submit"], #submitcontent-buttons-login button {
background-color: #656565;
color: white;
width:auto;
--- a/web/static/ldt/css/registration.css Mon Apr 18 16:03:36 2011 +0200
+++ b/web/static/ldt/css/registration.css Mon Apr 18 18:34:49 2011 +0200
@@ -14,7 +14,8 @@
#login_links_list {
border-left: 1px solid black;
height: 90%;
- padding-top: 6px;
+ padding-top: 6px;
+ padding-left: 25px;
}
#login_links_list ul {