From: Olivier Lamy <olamy@apache.org>
Date: Mon, 27 Feb 2012 00:56:14 +0000 (+0000)
Subject: start main search screen design
X-Git-Tag: archiva-1.4-M3~1208
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7226045ca1be38b79811a17e5614302e7bc86aad;p=archiva.git

start main search screen design

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1293981 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
index 5ebea9d3a..2eaa2687a 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
@@ -206,7 +206,8 @@ $(function() {
 
       }
 		});
-
+    // by default display search screen
+    displaySearch();
 
   }
   startArchivaApplication();
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
index 8a13996be..7a007815e 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
@@ -150,5 +150,45 @@
   <div class="page-header">
     <h3>${$.i18n.prop('search.artifact.header')}</h3>
   </div>
-  here
+  <div class="accordion" id="search-artifacts-accordion">
+    <div class="accordion-group">
+        <div class="accordion-heading">
+          <a class="accordion-toggle" href="#search-form-collapse" data-parent="#search-artifacts-accordion" data-toggle="collapse">${$.i18n.prop('search.artifact.form.header')}</a>
+        </div>
+        <div id="search-form-collapse" class="accordion-body collapse in">
+          <div class="tabbable tabs-below">
+            <ul class="nav nav-tabs">
+              <li class="active">
+                <a href="#search-basic-form-pane" data-toggle="tab">${$.i18n.prop('search.artifact.search.form.basic')}</a>
+              </li>
+              <li>
+                <a href="#search-advanced-form-pane" data-toggle="tab">${$.i18n.prop('search.artifact.search.form.advanced')}</a>
+              </li>
+              <li>
+                <a href="#search-osgi-form-pane" data-toggle="tab">${$.i18n.prop('search.artifact.search.form.osgi')}</a>
+              </li>
+            </ul>
+            <div class="tab-content">
+              <div class="tab-pane active" id="search-basic-form-pane">
+                <form id="search-basic-form" class="form-search">
+                  <input type="text"/>
+                </form>
+              </div>
+              <div class="tab-pane" id="search-advanced-form-pane">
+                <p>advanced search form.</p>
+              </div>
+              <div class="tab-pane" id="search-osgi-form-pane">
+                <p>osgi search form.</p>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div class="accordion-heading">
+          <a class="accordion-toggle" href="#search-results" data-parent="#search-artifacts-accordion" data-toggle="collapse">${$.i18n.prop('search.artifact.results.header')}</a>
+        </div>
+        <div id="search-results" class="accordion-body collapse">
+          results
+        </div>
+    </div>
 </script>
\ No newline at end of file