change CSS for search bar

diff --git a/examples/sandbox/src/django-haystack b/examples/sandbox/src/django-haystack
index 97475f2813a36e402296d5f2389fe10cd4cd1e0b..bd60745ce82318b1819768c9a31db0579228654d 160000 (submodule)
--- a/examples/sandbox/src/django-haystack
+++ b/examples/sandbox/src/django-haystack
@@ -1 +1 @@
-Subproject commit 97475f2813a36e402296d5f2389fe10cd4cd1e0b
+Subproject commit bd60745ce82318b1819768c9a31db0579228654d

diff --git a/telemeta/forms/haystack_form.py b/telemeta/forms/haystack_form.py
index 73d4071693c20d264bff77f54904a3fb8e54fd4e..b5800ebf118c4b56ff429052c322c50374caddaa 100644 (file)
--- a/telemeta/forms/haystack_form.py
+++ b/telemeta/forms/haystack_form.py
@@ -5,7 +5,7 @@ from haystack.query import SearchQuerySet
 
 
 class HaySearchForm(FacetedSearchForm):
-
+    q = forms.CharField(required=False, widget=forms.TextInput(attrs={'class': 'form-control', 'type' : 'text'}))
     def search(self):
         sqs = SearchQuerySet().load_all()
 
@@ -33,7 +33,7 @@ class HaySearchForm(FacetedSearchForm):
 class HayAdvanceForm(SearchForm):
 
     #to replace de basic search form field
-    q = forms.CharField(required=False, label=('Title'), widget=forms.TextInput(attrs={'type': 'search'}))
+    q = forms.CharField(required=False, widget=forms.TextInput(attrs={'type': 'search'}))
 
     code = forms.CharField(required=False, label=('Code'), widget=forms.TextInput(attrs={'type': 'search'}))
     location = forms.CharField(required=False, label=('Location'), widget=forms.TextInput(attrs={'type': 'search'}))

diff --git a/telemeta/static/telemeta/css/telemeta.css b/telemeta/static/telemeta/css/telemeta.css
index e667bf052448d48ceacc9e876aca18b9f450cb5f..370bb1d84c2ff07933412d5cdd16b155a702c582 100644 (file)
--- a/telemeta/static/telemeta/css/telemeta.css
+++ b/telemeta/static/telemeta/css/telemeta.css
@@ -1227,7 +1227,7 @@ a.image-link {
     color:#ffffff;
     background-color:#6a0307;
     border-color:#6a0307;
-    box-shadow: 5px 5px 5px #888888;
+
 }
 
 #btn:hover{
@@ -1235,9 +1235,50 @@ a.image-link {
     color:#6a0307;
     background-color:#ffffff;
     border-color:#6a0307;
-    box-shadow: 5px 5px 5px #888888;
+
 }
 
+textarea:focus,
+input[type="text"]:focus,
+input[type="password"]:focus,
+input[type="datetime"]:focus,
+input[type="datetime-local"]:focus,
+input[type="date"]:focus,
+input[type="month"]:focus,
+input[type="time"]:focus,
+input[type="week"]:focus,
+input[type="number"]:focus,
+input[type="email"]:focus,
+input[type="url"]:focus,
+input[type="search"]:focus,
+input[type="tel"]:focus,
+input[type="color"]:focus,
+.uneditable-input:focus {
+  border-color: rgba(106, 3, 7, 0.8);
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075) inset, 0 0 8px rgba(106, 3, 7, 0.6);
+  outline: 0 none;
+}
+
+.form-control::-moz-placeholder {
+  color: #6a0307;
+  opacity: 1;
+}
+.form-control:-ms-input-placeholder {
+  color: #6a0307;
+}
+.form-control::-webkit-input-placeholder {
+  color: #6a0307;
+}
+.form-control[disabled],
+.form-control[readonly],
+fieldset[disabled] .form-control {
+  cursor: not-allowed;
+  background-color: #6a0307;
+  opacity: 1;
+}
+textarea.form-control {
+  height: auto;
+}
 
 .list_item, .list_item:visited, .list_item:hover{
     display:block;

diff --git a/telemeta/templates/search/search.html b/telemeta/templates/search/search.html
index 1f78a75899077415f2ac996a530ff9ec330ec622..2125ec9b453298771f565a09a9a23542c0a62748 100644 (file)
--- a/telemeta/templates/search/search.html
+++ b/telemeta/templates/search/search.html
@@ -9,16 +9,13 @@
 {% block content %}
 
     <form method="get" action=".">
-        <table>
-            {{ form.as_table }}
-            <tr>
-                <td>&nbsp;</td>
-                <td>
-                    <input type="submit" value="{% trans "Search" %}">
-                </td>
-            </tr>
-        </table>
-        <div><a href="{% url "haystack_advance_search" %}">&raquo; recherche avancée</a></div></br>
+        <div class="input-group col-md-3">
+            {{ form.q.errors }}
+            <span class="input-group-addon" id="sizing-addon1" style="background-color:#6a0307;color:white;border-color:#6a0307;" ><span class="glyphicon glyphicon-search"></span></span>{{form.q}}
+        </div>
+        <button style="margin-top:10px" type="submit" id="btn" class="btn btn-default">{% trans "Search" %}</button>
+        <div ><a href="{% url "haystack_advance_search" %}">&raquo; recherche avancée</a></div></br>
+    </form>
         {% if query %}