FELIX-1217: First step: remove start and start level input fields from list header, add new panel for install/update and add new refresh button
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@783772 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/webconsole/src/main/resources/res/ui/admin.css b/webconsole/src/main/resources/res/ui/admin.css
index d41c8f0..3b10581 100644
--- a/webconsole/src/main/resources/res/ui/admin.css
+++ b/webconsole/src/main/resources/res/ui/admin.css
@@ -628,4 +628,32 @@
}
.col_Actions {
width: 95px;
-}
\ No newline at end of file
+}
+#plugin_content {
+ margin-top: 26px;
+ margin-bottom: 26px;
+}
+.contentheader {
+ border: 0px solid #66dd44;
+ border-bottom: 1px solid #cccccc;
+ text-align: left;
+ padding: 5px;
+ padding-left: 10px;
+ color: #6181A9;
+ background-color: #f0f0f0;
+}
+.contentline {
+ padding-top: 15px;
+ padding-left:10px;
+ clear: both;
+ width: 100%;
+}
+.contentleft {
+ padding-left: 9px;
+ float: left;
+ width:110px;
+}
+.contentright {
+ display: inline;
+ width: 225px;
+}
diff --git a/webconsole/src/main/resources/res/ui/bundles.js b/webconsole/src/main/resources/res/ui/bundles.js
index c4e7298..028d8b4 100644
--- a/webconsole/src/main/resources/res/ui/bundles.js
+++ b/webconsole/src/main/resources/res/ui/bundles.js
@@ -214,13 +214,19 @@
$(document).ready(function(){
renderView( ["Id", "Name", "Version", "Symbolic Name", "Status", "Actions"],
"<input type='hidden' name='action' value='install'/>" +
+ "<input type='hidden' name='bundlestart' value='start'/>" +
+ "<input type='hidden' name='bundlestartlevel' value='" + startLevel + "'/>" +
"<input class='fileinput' type='file' name='bundlefile' style='margin-left:10px'/>" +
- " - Start <input class='checkradio' type='checkbox' name='bundlestart' value='start' style='vertical-align:middle;'/>" +
- " - Start Level <input class='input' type='input' name='bundlestartlevel' value='" + startLevel + "' size='4'/>" +
- "<input type='submit' value='Install or Update' style='margin-left:60px'/>" +
- "<button id='refreshPackages' type='button' name='refresh' style='margin-left:10px'>Refresh Packages</button>"
+ "<input type='submit' value='Install or Update' style='margin-left:10px'/>" +
+ "<button class='reloadButton' type='button' name='reload' style='margin-left:60px'>Reload</button>" +
+ "<button class='installButton' type='button' name='install'>Install/Update...</button>" +
+ "<button class='refreshPackages' type='button' name='refresh'>Refresh Packages</button>"
);
- $("#refreshPackages").click(refreshPackages);
+ $(".refreshPackages").click(refreshPackages);
+ $(".reloadButton").click(loadData);
+ $(".installButton").click(function() {
+ document.location = pluginRoot + "/upload";
+ });
renderData(data);
var extractMethod = function(node) {