changement disposition formulaire langue

diff --git a/telemeta/static/telemeta/css/telemeta.css b/telemeta/static/telemeta/css/telemeta.css
index 1a7263baca42fba6cc581e8c8fb26845f829b722..1630f43934282770a890f5223e61cd15715695da 100644 (file)
--- a/telemeta/static/telemeta/css/telemeta.css
+++ b/telemeta/static/telemeta/css/telemeta.css
@@ -473,6 +473,7 @@ form.login .submit {
     background-color: #6a0307 ;
     border-top: .25em solid #6a0307;
     padding-left:26px;
+    position:relative;
 }
 
 #menu a, #menu a:visited{
@@ -514,10 +515,18 @@ form.login .submit {
 /* Drop Down Menus */
 .clear {clear:both}
 
+#formlang{
+    display:inline-block;
+    position:absolute;
+    right:1%;
+    top:10%;
+}
+
 #nav {
     margin:0;
     padding:0;
     list-style:none;
+    display:inline-block;
 }
 
 /* make the LI display inline */

diff --git a/telemeta/templates/telemeta/base.html b/telemeta/templates/telemeta/base.html
index a216cc3eea245632ff346be7119b38490be9350c..77b57eb9bd5cad65fda6550a3a97e3d8906009e6 100644 (file)
--- a/telemeta/templates/telemeta/base.html
+++ b/telemeta/templates/telemeta/base.html
@@ -83,32 +83,12 @@
   {{ user.username }}
 {% endif %}
 <a href="{% url "telemeta-flatpage" "help" %}">{% trans "Help" %}</a> |
-<a href="{% url "telemeta-logout" %}">{% trans "Sign out" %} |
+<a href="{% url "telemeta-logout" %}">{% trans "Sign out" %}
 <img src="{{ STATIC_URL }}telemeta/images/logout.png" alt="logout" style="vertical-align:middle" /></a>
 {% else %}
 <a href="{% url "telemeta-flatpage" "help" %}">{% trans "Help" %}</a> |
-<a href="{% url "telemeta-login" %}">{% trans "Sign in" %}</a> |
+<a href="{% url "telemeta-login" %}">{% trans "Sign in" %}</a>
 {% endif %}
-<form action="/i18n/setlang/" method="post" style="display:inline-block;">
-
-    {% csrf_token %}
-
-    <input name="next" type="hidden" value="{% url 'telemeta-home' %}" />
-
-    <select name="language" style="color:#6a0307">
-
-    {% for lang in LANGUAGES %}
-
-        <option value="{{ lang.0 }}">{{ lang.1 }}</option>
-
-    {% endfor %}
-
-    </select>
-
-
-    <input type="submit" value="Ok" />
-
-</form>
 
 </div>
 
@@ -162,6 +142,27 @@
  </li>
 {% endif %}
 </ul>
+<form id="formlang" action="/i18n/setlang/" method="post" style="display:inline-block;">
+
+    {% csrf_token %}
+
+    <input name="next" type="hidden" value="{% url 'telemeta-home' %}" />
+
+    <select name="language" style="color:#6a0307">
+
+    {% for lang in LANGUAGES %}
+
+        <option value="{{ lang.0 }}">{{ lang.1 }}</option>
+
+    {% endfor %}
+
+    </select>
+
+
+    <input type="submit" value="Ok" />
+
+</form>
+
 
 {% endblock menu %}
 </div>