You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/02/27 01:56:14 UTC

svn commit: r1293981 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva: main.js templates/search.html

Author: olamy
Date: Mon Feb 27 00:56:14 2012
New Revision: 1293981

URL: http://svn.apache.org/viewvc?rev=1293981&view=rev
Log:
start main search screen design

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js?rev=1293981&r1=1293980&r2=1293981&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js Mon Feb 27 00:56:14 2012
@@ -206,7 +206,8 @@ $(function() {
 
       }
 		});
-
+    // by default display search screen
+    displaySearch();
 
   }
   startArchivaApplication();

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html?rev=1293981&r1=1293980&r2=1293981&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html Mon Feb 27 00:56:14 2012
@@ -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