ue default ES conf, try to fix lang menu against BIDI

diff --git a/docker-compose.yml b/docker-compose.yml
index 5cd8f62f4664b8b7a307da97c6f9ccbdb5dbcc2e..3cee694c2103fc61c0a1245f2ad3586e19c529ee 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -46,8 +46,6 @@ broker:
 
 search:
   image: elasticsearch:1
-  volumes:
-    - ./etc/elasticsearch.yml:/etc/elasticsearch/elasticsearch.yml
 
 app:
   build: .

diff --git a/telemeta/templates/telemeta/base.html b/telemeta/templates/telemeta/base.html
index b4133cd43d62076630ab8a72ab38fb9601db5876..7a4fb90355c64538ad5be8000483bd4a0394ef28 100644 (file)
--- a/telemeta/templates/telemeta/base.html
+++ b/telemeta/templates/telemeta/base.html
@@ -159,7 +159,7 @@
                                 </li>
                             {% endif %}
                         </ul>
-                        <form id="formlang" action="/i18n/setlang/" method="post" style="display:inline-block;" onchange='this.submit();'>
+                        <form id="formlang" action="/i18n/setlang/" method="post" style="display:inline-block; {% if LANGUAGE_BIDI %}float: left;{% endif %}" onchange='this.submit();'>
                             {% csrf_token %}
                             <select name="language" class="form-control" id="language-selector">
                                 {% for lang in LANGUAGES %}