From 49c004a8658b1ecbfb25c6a1dcaa3ee22651b7a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9D=D0=B0=D0=B7=D0=B0=D1=80=20=D0=9A=D0=BE=D1=82=D1=8E?=
 =?UTF-8?q?=D0=BA?= <kotzillla@gmail.com>
Date: Tue, 6 Jan 2015 16:11:37 +0200
Subject: [PATCH] Search placeholder

---
 functions/search_forms.py                                 | 2 +-
 .../client/includes/exposition/exposition_object.html     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/functions/search_forms.py b/functions/search_forms.py
index 7f1af9a0..ab82be6a 100644
--- a/functions/search_forms.py
+++ b/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
diff --git a/templates/client/includes/exposition/exposition_object.html b/templates/client/includes/exposition/exposition_object.html
index 6ea192bd..1a51af6e 100644
--- a/templates/client/includes/exposition/exposition_object.html
+++ b/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 %}