Merge branch 'develop' of git.general-servers.com:expomap/expomap into develop

functions/search_forms.py

@@ -22,7 +22,7 @@ from place_conference.models import PlaceConference
 
 
 class AbstactSearchForm(forms.Form):
-    q = forms.CharField(label=_(u'Я ищу'), required=False)
+    q = forms.CharField(label=_(u'Я ищу'), required=False, widget=forms.TextInput(attrs={'placeholder':_(u'Тематика, слово или название')}))
     w = forms.CharField(label=_(u'Где'), required=False)
     models = None
     data_with_parents = None

templates/client/includes/exposition/exposition_object.html

@@ -368,10 +368,10 @@
     -->
     <div class="e-cat look-also">
         <div class="sect-title">{% trans 'Смотрите также:' %}</div>
-        <a href="{{ exposition.catalog }}city/{{ exposition.city.url }}/">{% trans "Выставки:" %} {{ exposition.city.name }}</a>
-        <a href="{{ exposition.catalog }}country/{{ exposition.country.url }}/">{% trans "Выставки:" %} {{ exposition.country.name }}</a>
-        <a href="{{ exposition.catalog }}theme/{{ exposition.theme.all.0.url }}/country/{{ exposition.country.url }}/">{% trans "Выставки по тематике " %}"{{ exposition.theme.all.0.name|lower }}" {% trans "в" %} {{ exposition.country.name }}</a>
-        <a href="{{ exposition.catalog }}theme/{{ exposition.theme.all.0.url }}/city/{{ exposition.city.url }}/">{% trans "Выставки по тематике " %}"{{ exposition.theme.all.0.name|lower }}" {% trans "в" %} {{ exposition.city.name }}</a>
+        <a href="{{ exposition.catalog }}city/{{ exposition.city.url }}/">{% trans "Выставки" %} {% if request.LANGUAGE_CODE == 'ru' %}{{ exposition.city.inflect }}{% else %}{% trans 'in' %} {{ exposition.city.name }}{% endif %}</a>
+        <a href="{{ exposition.catalog }}country/{{ exposition.country.url }}/">{% trans "Выставки" %} {% if request.LANGUAGE_CODE == 'ru' %}{{ exposition.country.inflect }}{% else %}{% trans 'in' %} {{ exposition.country.name }}{% endif %}</a>
+        <a href="{{ exposition.catalog }}theme/{{ exposition.theme.all.0.url }}/country/{{ exposition.country.url }}/">{% trans "Выставки по тематике " %}&laquo;{{ exposition.theme.all.0.name|lower }}&raquo; {% if request.LANGUAGE_CODE == 'ru' %}{{ exposition.country.inflect }}{% else %}{% trans 'in' %} {{ exposition.country.name }}{% endif %}</a>
+        <a href="{{ exposition.catalog }}theme/{{ exposition.theme.all.0.url }}/city/{{ exposition.city.url }}/">{% trans "Выставки по тематике " %}&laquo;{{ exposition.theme.all.0.name|lower }}&raquo; {% if request.LANGUAGE_CODE == 'ru' %}{{ exposition.city.inflect }}{% else %}{% trans 'in' %} {{ exposition.city.name }}{% endif %}</a>
     </div>
 
 {% endblock %}