add osgi search parameters

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

diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
index 96e00d01725e56500177bb3729dae2af5e88da73..9d53f29d7bd94452174b70734aa8c27d27d7c50f 100644 (file)
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
@@ -232,6 +232,10 @@ search.artifact.results.classifier=Classifier
 search.artifact.search.form.query.classifier=Classifier
 search.artifact.result.filter=Remove Filters
 search.artifact.result.grid.filter=Filter
+search.artifact.search.form.query.bundleSymbolicName=Symbolic Name
+search.artifact.search.form.query.bundleVersion=Bundle Version
+search.artifact.search.form.query.bundleExportPackage=Export Package
+search.artifact.search.form.query.bundleExportService=Export Service
 
 #login
 login.username.placehoder=Username

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 73a5978075a0dc68b69f0e79511ec67b33b1e18c..04941d1d74c5eac7a47b5b6bc03b5edbce3aebcd 100644 (file)
--- 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
@@ -272,7 +272,41 @@
                 </form>
             </div>
             <div class="pill-pane" id="search-osgi-form-pane">
-              <p>osgi search form.</p>
+                <form class="well form-horizontal" id="search-osgi-form">
+                  <fieldset>
+                    <div class="control-group">
+                      <label class="control-label" for="groupId">${$.i18n.prop('search.artifact.search.form.query.bundleSymbolicName')}</label>
+                      <div class="controls">
+                        <input type="text" class="input-medium search-query" id="bundleSymbolicName" name="bundleSymbolicName" size="50"
+                               data-bind="value: searchRequest().bundleSymbolicName"/>
+                      </div>
+                    </div>
+                    <div class="control-group">
+                      <label class="control-label" for="groupId">${$.i18n.prop('search.artifact.search.form.query.bundleVersion')}</label>
+                      <div class="controls">
+                        <input type="text" class="input-medium search-query" id="bundleVersion" name="bundleVersion" size="50"
+                               data-bind="value: searchRequest().bundleVersion"/>
+                      </div>
+                    </div>
+                    <div class="control-group">
+                      <label class="control-label" for="groupId">${$.i18n.prop('search.artifact.search.form.query.bundleExportPackage')}</label>
+                      <div class="controls">
+                        <input type="text" class="input-medium search-query" id="bundleExportPackage" name="bundleExportPackage" size="50"
+                               data-bind="value: searchRequest().bundleExportPackage"/>
+                      </div>
+                    </div>
+                    <div class="control-group">
+                      <label class="control-label" for="groupId">${$.i18n.prop('search.artifact.search.form.query.bundleExportService')}</label>
+                      <div class="controls">
+                        <input type="text" class="input-medium search-query" id="bundleExportService" name="bundleExportService" size="50"
+                               data-bind="value: searchRequest().bundleExportService"/>
+                      </div>
+                    </div>
+                  </fieldset>
+                  <button type="submit" id="btn-osgi-search" class="btn btn-primary"
+                          data-bind="click: advancedSearch">${$.i18n.prop('search.artifact.search.form.btn.search')}</button>
+
+                </form>
             </div>
           </div>
         </div>