Clean up and document getnikola#1912

Signed-off-by: Chris Warrick <kwpolska@gmail.com>

AUTHORS.txt

@@ -10,6 +10,7 @@
 * `Boris Kaul <https://github.com/localvoid>`_
 * `Brandon W. Maister <https://github.com/quodlibetor>`_
 * `Bussonnier Matthias <https://gtihub.com/carreau>`_
+* `Carlos Martín Sánchez <https://github.com/carlosvin>`_
 * `Carsten Grohmann <https://github.com/CarstenGrohmann>`_
 * `Casey M. Bessette <https://github.com/caseybessette>`_
 * `Chris Lee <https://github.com/clee>`_

CHANGES.txt

@@ -4,6 +4,8 @@ New in master
 Features
 --------
 
+* Make the Google Search example prettier, integrating well with
+  Bootstrap 3 (Issue #1912)
 * Add categories filter to post list directive (via Issue #1889)
 * Remove empty directories with nikola check --clean-files (Issue #1873)
 

nikola/conf.py.in

@@ -798,31 +798,31 @@ MARKDOWN_EXTENSIONS = ['fenced_code', 'codehilite', 'extra']
 # it appears on the navigation bar:
 #
 # SEARCH_FORM = """
-# <!-- Custom search -->
+# <!-- DuckDuckGo custom search -->
 # <form method="get" id="search" action="//duckduckgo.com/"
 #  class="navbar-form pull-left">
-# <input type="hidden" name="sites" value="%s"/>
-# <input type="hidden" name="k8" value="#444444"/>
-# <input type="hidden" name="k9" value="#D51920"/>
-# <input type="hidden" name="kt" value="h"/>
+# <input type="hidden" name="sites" value="%s">
+# <input type="hidden" name="k8" value="#444444">
+# <input type="hidden" name="k9" value="#D51920">
+# <input type="hidden" name="kt" value="h">
 # <input type="text" name="q" maxlength="255"
-#  placeholder="Search&hellip;" class="span2" style="margin-top: 4px;"/>
-# <input type="submit" value="DuckDuckGo Search" style="visibility: hidden;" />
+#  placeholder="Search&hellip;" class="span2" style="margin-top: 4px;">
+# <input type="submit" value="DuckDuckGo Search" style="visibility: hidden;">
 # </form>
 # <!-- End of custom search -->
 # """ % SITE_URL
 #
 # If you prefer a Google search form, here's an example that should just work:
 # SEARCH_FORM = """
-# <!-- Custom search -->
+# <!-- Google custom search -->
 # <form method="get" action="http://www.google.com/search" class="navbar-form navbar-right" role="search">
 # <div class="form-group">
-# <input type="text" name="q" class="form-control" placeholder="Search"/>
+# <input type="text" name="q" class="form-control" placeholder="Search">
 # </div>
 # <button type="submit" class="btn btn-primary">
 # 	<span class="glyphicon glyphicon-search"></span>
 # </button>
-# <input type="hidden" name="sitesearch" value="%s"/>
+# <input type="hidden" name="sitesearch" value="%s">
 # </form>
 # <!-- End of custom search -->
 # """ % SITE_URL