From 9dc698e77555e1389992493736965e20572cc579 Mon Sep 17 00:00:00 2001
From: Robin Dickson <robindickson@gmail.com>
Date: Mon, 6 Jun 2016 11:23:45 +0100
Subject: [PATCH 1/2] Convert search page to use bootstrap

---
 app/views/search/index.html.erb | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb
index e2e23440..0570af1c 100644
--- a/app/views/search/index.html.erb
+++ b/app/views/search/index.html.erb
@@ -1,6 +1,15 @@
-<div id="display_box_search">
-  <%= form_tag(search_results_path, :id => 'search-form') do %>
-    <%= text_field_tag(:search, params[:search]) %>
-    <%= submit_tag t('common.search') %>
-  <% end %>
+<div class="bootstrap">
+<div class="container-fluid">
+  <div class="row">
+    <div class="col-xs-12 col-sm-6 col-sm-offset-3">
+      <%= form_tag(search_results_path) do %>
+        <div class="form-group">
+          <%= label_tag 'Search', nil, class: 'sr-only' %>
+          <%= text_field_tag(:search, params[:search], class: 'form-control', autofocus: true) %>
+        </div>
+        <%= submit_tag t('common.search'), class: 'btn btn-primary pull-right' %>
+      <% end %>
+    </div>
+  </div>
+</div>
 </div>

From 67f33b3e3982f38b7e2f89832622085183f99440 Mon Sep 17 00:00:00 2001
From: Robin Dickson <robindickson@gmail.com>
Date: Mon, 6 Jun 2016 16:28:14 +0100
Subject: [PATCH 2/2] Remove JS for search input autofocus

Previously replaced by HTML5 autofocus.
---
 app/assets/javascripts/tracks.js.erb | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/assets/javascripts/tracks.js.erb b/app/assets/javascripts/tracks.js.erb
index 9fdbbb90..80813d5f 100644
--- a/app/assets/javascripts/tracks.js.erb
+++ b/app/assets/javascripts/tracks.js.erb
@@ -894,12 +894,6 @@ var RecurringTodosPage = {
     }
 };
 
-var SearchPage = {
-    setup_behavior: function() {
-        $('#search-form #search').focus();
-    }
-};
-
 /**************************************/
 /* generic Tracks functions           */
 /**************************************/
@@ -1145,7 +1139,7 @@ $(document).ready(function() {
     /* enable page specific behavior */
     $([ 'PreferencesPage', 'NotesPage', 'ProjectListPage', 'ContextListPage',
         'FeedsPage', 'RecurringTodosPage', 'TodoItems', 'TracksPages',
-        'TracksForm', 'SearchPage', 'UsersPage' ]).each(function() {
+        'TracksForm', 'UsersPage' ]).each(function() {
         eval(this+'.setup_behavior();');
     });