You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2013/04/01 16:27:22 UTC

[03/40] git commit: [#2835] ticket:287 Make search field bigger, add help button

[#2835] ticket:287 Make search field bigger, add help button


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/4ab5bda6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/4ab5bda6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/4ab5bda6

Branch: refs/heads/cj/5963
Commit: 4ab5bda6e99eb178b53cc187b51a136c75945456
Parents: db0dd9c
Author: Igor Bondarenko <je...@gmail.com>
Authored: Tue Mar 5 11:42:00 2013 +0000
Committer: Dave Brondsema <db...@geek.net>
Committed: Tue Mar 26 20:57:33 2013 +0000

----------------------------------------------------------------------
 Allura/allura/lib/widgets/resources/css/search.css |    3 ++
 Allura/allura/lib/widgets/search.py                |    1 +
 .../allura/templates/widgets/search_results.html   |   16 +++++++++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/4ab5bda6/Allura/allura/lib/widgets/resources/css/search.css
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/resources/css/search.css b/Allura/allura/lib/widgets/resources/css/search.css
new file mode 100644
index 0000000..16b792a
--- /dev/null
+++ b/Allura/allura/lib/widgets/resources/css/search.css
@@ -0,0 +1,3 @@
+input.search-query {
+  width: 95%;
+}

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/4ab5bda6/Allura/allura/lib/widgets/search.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/search.py b/Allura/allura/lib/widgets/search.py
index ec6ed51..fc17b3e 100644
--- a/Allura/allura/lib/widgets/search.py
+++ b/Allura/allura/lib/widgets/search.py
@@ -21,3 +21,4 @@ class SearchResults(ew_core.Widget):
         for f in self.fields:
             for r in f.resources():
                 yield r
+        yield ew.CSSLink('css/search.css')

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/4ab5bda6/Allura/allura/templates/widgets/search_results.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/search_results.html b/Allura/allura/templates/widgets/search_results.html
index 3e51c43..d6811a6 100644
--- a/Allura/allura/templates/widgets/search_results.html
+++ b/Allura/allura/templates/widgets/search_results.html
@@ -1,7 +1,19 @@
 <form method="GET" action=".">
-  <div class="grid-19">
-    <input type="text" name="q" value="{{q}}" class="defaultText" title="Search App"/>
+  <div class="grid-10">
+    <input type="text" name="q" value="{{q}}" class="search-query" title="Search App"/>
+  </div>
+  <div class="grid-3">
+    <input type="submit" value="Search">
+  </div>
+  <div class="grid-6">
+    <a href="#" class="btn search_help_modal">
+      <b data-icon="{{g.icons['help'].char}}" class="ico {{g.icons['help'].css}}"></b>
+      Help
+    </a>
   </div>
+
+
+
   <div class="grid-19">
     <input type="submit" value="Search App">
     <input type="submit" name="project" value="Search Entire Project">