Merge commit '8c091aac6ba4b21bfd674fd55a3f710539b60193'
diff --git a/Allura/allura/nf/allura/css/site_style.css b/Allura/allura/nf/allura/css/site_style.css
index 1f9935b..e7d5e65 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -1752,6 +1752,23 @@
position: relative;
z-index: 2;
}
+#sidebar #search {
+ position: relative;
+}
+#sidebar #search .fa-search {
+ position: absolute;
+ z-index: 2;
+ top: 15px;
+ right: 0;
+ font-size: 14px;
+ text-align: center;
+ height: 23px;
+ width: 23px;
+ line-height: 23px;
+}
+#sidebar #search .fa-search:hover {
+ cursor: pointer;
+}
#sidebar ul {
border: 1px solid #aaaaaa;
-moz-border-radius: 4px;
diff --git a/Allura/allura/templates/jinja_master/sidebar_menu.html b/Allura/allura/templates/jinja_master/sidebar_menu.html
index 8d2831a..ff00db3 100644
--- a/Allura/allura/templates/jinja_master/sidebar_menu.html
+++ b/Allura/allura/templates/jinja_master/sidebar_menu.html
@@ -47,9 +47,13 @@
{% if c.app and c.app.searchable %}
<form id="search" method="GET" action="{{c.app.url + 'search/'}}">
<input name="q" type="text" title="Search {{c.app.config.options.mount_label}}" placeholder="Search {{c.app.config.options.mount_label}}">
+ <label>
+ <input type="submit" style="display:none">
+ <b class="fa fa-search" title="Submit"></b>
+ </label>
</form>
{% else %}
- <div> </div>
+ <div class="placeholder-no-searchbox"> </div>
{% endif %}
{% if c.custom_sidebar_menu %}
{% for s in c.custom_sidebar_menu %}
