Port tables to bootstrap stylesheets.
git-svn-id: https://svn.apache.org/repos/asf/karaf/webconsole/trunk@1242783 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/context/CamelContextsPage.html b/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/context/CamelContextsPage.html
index 9ec2596..09e56ed 100644
--- a/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/context/CamelContextsPage.html
+++ b/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/context/CamelContextsPage.html
@@ -18,6 +18,6 @@
<wicket:extend xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
<h1>Deployed camel contexts</h1>
- <table wicket:id="contexts" class="dataview" />
+ <table wicket:id="contexts" class="table table-striped table-condensed" />
</wicket:extend>
\ No newline at end of file
diff --git a/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/context/DumpPage.html b/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/context/DumpPage.html
index f6d994d..316d3fc 100644
--- a/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/context/DumpPage.html
+++ b/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/context/DumpPage.html
@@ -22,7 +22,7 @@
<ul>
<li wicket:id="properties">
- <table wicket:id="propertyMap" class="dataview" />
+ <table wicket:id="propertyMap" class="table table-striped table-condensed" />
</li>
</ul>
diff --git a/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/widget/CamelWidget.html b/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/widget/CamelWidget.html
index 4e283ab..f238052 100644
--- a/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/widget/CamelWidget.html
+++ b/camel/src/main/resources/org/apache/karaf/webconsole/camel/internal/widget/CamelWidget.html
@@ -21,7 +21,7 @@
<p>You have <span wicket:id="count">13</span> camel contexts deployed. First four are:</p>
- <table class="dataview">
+ <table class="table table-striped table-condensed">
<tr>
<th>Name</th>
</tr>
diff --git a/cxf/src/main/resources/org/apache/karaf/webconsole/cxf/internal/services/CxfServicesPage.html b/cxf/src/main/resources/org/apache/karaf/webconsole/cxf/internal/services/CxfServicesPage.html
index 7c0a33d..de3c68f 100644
--- a/cxf/src/main/resources/org/apache/karaf/webconsole/cxf/internal/services/CxfServicesPage.html
+++ b/cxf/src/main/resources/org/apache/karaf/webconsole/cxf/internal/services/CxfServicesPage.html
@@ -18,6 +18,6 @@
<wicket:extend xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
<h1>Deployed CXF services</h1>
- <table wicket:id="buses" class="dataview" />
+ <table wicket:id="buses" class="table table-striped table-condensed" />
</wicket:extend>
\ No newline at end of file
diff --git a/cxf/src/main/resources/org/apache/karaf/webconsole/cxf/internal/services/DetailsPage.html b/cxf/src/main/resources/org/apache/karaf/webconsole/cxf/internal/services/DetailsPage.html
index 741a03c..179f91c 100644
--- a/cxf/src/main/resources/org/apache/karaf/webconsole/cxf/internal/services/DetailsPage.html
+++ b/cxf/src/main/resources/org/apache/karaf/webconsole/cxf/internal/services/DetailsPage.html
@@ -21,7 +21,7 @@
<a wicket:id="traceOn">Enable tracing</a>
<a wicket:id="traceOff">Disable tracing</a>
- <table class="dataview">
+ <table class="table table-striped table-condensed">
<tr>
<th colspan="2">Server</th>
<th>Operations</th>
diff --git a/karaf/admin/src/main/resources/org/apache/karaf/webconsole/karaf/admin/list/InstancesPage.html b/karaf/admin/src/main/resources/org/apache/karaf/webconsole/karaf/admin/list/InstancesPage.html
index 00e8cf8..92019f1 100644
--- a/karaf/admin/src/main/resources/org/apache/karaf/webconsole/karaf/admin/list/InstancesPage.html
+++ b/karaf/admin/src/main/resources/org/apache/karaf/webconsole/karaf/admin/list/InstancesPage.html
@@ -24,7 +24,7 @@
<wicket:extend>
<h1>Instances</h1>
- <table wicket:id="instances" class="dataview" />
+ <table wicket:id="instances" class="table table-striped table-condensed" />
</wicket:extend>
</body>
diff --git a/karaf/features/src/main/resources/org/apache/karaf/webconsole/karaf/features/feature/FeaturesPage.html b/karaf/features/src/main/resources/org/apache/karaf/webconsole/karaf/features/feature/FeaturesPage.html
index ddde4a0..b61f568 100644
--- a/karaf/features/src/main/resources/org/apache/karaf/webconsole/karaf/features/feature/FeaturesPage.html
+++ b/karaf/features/src/main/resources/org/apache/karaf/webconsole/karaf/features/feature/FeaturesPage.html
@@ -23,7 +23,7 @@
<body>
<wicket:extend>
<h1>Features</h1>
- <table wicket:id="features" class="dataview"/>
+ <table wicket:id="features" class="table table-striped table-condensed"/>
</wicket:extend>
</body>
</html>
diff --git a/karaf/features/src/main/resources/org/apache/karaf/webconsole/karaf/features/repository/RepositoriesPage.html b/karaf/features/src/main/resources/org/apache/karaf/webconsole/karaf/features/repository/RepositoriesPage.html
index a273ee3..d0b8d73 100644
--- a/karaf/features/src/main/resources/org/apache/karaf/webconsole/karaf/features/repository/RepositoriesPage.html
+++ b/karaf/features/src/main/resources/org/apache/karaf/webconsole/karaf/features/repository/RepositoriesPage.html
@@ -23,7 +23,7 @@
<body>
<wicket:extend>
<h1>Feature Repositories</h1>
- <table wicket:id="repositories" class="dataview"/>
+ <table wicket:id="repositories" class="table table-striped table-condensed"/>
</wicket:extend>
</body>
diff --git a/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/BlueprintPage.html b/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/BlueprintPage.html
index 3aa867f..58b4a3d 100644
--- a/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/BlueprintPage.html
+++ b/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/BlueprintPage.html
@@ -18,5 +18,5 @@
<wicket:extend xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
<h1>Blueprint containers</h1>
- <table wicket:id="containers" class="dataview" />
+ <table wicket:id="containers" class="table table-striped table-condensed" />
</wicket:extend>
\ No newline at end of file
diff --git a/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/navigation.css b/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/navigation.css
index 40ccfd1..4534415 100644
--- a/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/navigation.css
+++ b/osgi/blueprint/src/main/resources/org/apache/karaf/webconsole/osgi/blueprint/navigation.css
@@ -1,4 +1,4 @@
-#topmenu ul li span.blueprint {
+.navbar span.blueprint {
padding-left: 16px;
background: url("bundle/blueprint.gif") no-repeat;
}
\ No newline at end of file
diff --git a/osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/BundlesPage.html b/osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/BundlesPage.html
index 28a4979..c8651f3 100644
--- a/osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/BundlesPage.html
+++ b/osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/BundlesPage.html
@@ -18,6 +18,6 @@
<wicket:extend xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
<h1>Bundles</h1>
- <table wicket:id="bundles" class="dataview" />
+ <table wicket:id="bundles" class="table table-striped table-condensed" />
</wicket:extend>
diff --git a/osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/view/decoration.css b/osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/view/decoration.css
index cd76156..3222be5 100644
--- a/osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/view/decoration.css
+++ b/osgi/bundle/src/main/resources/org/apache/karaf/webconsole/osgi/bundle/internal/view/decoration.css
@@ -1,18 +1,11 @@
-div.decorations {
- display: inline;
-}
-
div.decorations ul {
list-style-type: none;
margin: 0px;
}
div.decorations ul li {
- display: inline;
-}
-
-div.decoration {
- display: inline;
+ display: block;
+ float: left;
}
span.system {
diff --git a/osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/ConfigurationEditPage.html b/osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/ConfigurationEditPage.html
index 4587b81..5755d23 100644
--- a/osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/ConfigurationEditPage.html
+++ b/osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/ConfigurationEditPage.html
@@ -30,6 +30,6 @@
<p>
System properties (not editable)
</p>
- <table wicket:id="system" class="dataview" />
+ <table wicket:id="system" class="table table-striped table-condensed" />
</wicket:extend>
diff --git a/osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/ConfigurationsPage.html b/osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/ConfigurationsPage.html
index e221573..af55031 100644
--- a/osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/ConfigurationsPage.html
+++ b/osgi/config/src/main/resources/org/apache/karaf/webconsole/osgi/config/ConfigurationsPage.html
@@ -18,6 +18,6 @@
<wicket:extend xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
<h1>Configurations</h1>
- <table wicket:id="configurations" class="dataview" />
+ <table wicket:id="configurations" class="table table-striped table-condensed" />
</wicket:extend>
\ No newline at end of file
diff --git a/osgi/framework/src/main/java/org/apache/karaf/webconsole/osgi/framework/internal/FrameworkPage.java b/osgi/framework/src/main/java/org/apache/karaf/webconsole/osgi/framework/internal/FrameworkPage.java
index 07147c6..d04dc71 100644
--- a/osgi/framework/src/main/java/org/apache/karaf/webconsole/osgi/framework/internal/FrameworkPage.java
+++ b/osgi/framework/src/main/java/org/apache/karaf/webconsole/osgi/framework/internal/FrameworkPage.java
@@ -27,7 +27,7 @@
/**
* Initial page for OSGi module.
*/
-@PaxWicketMountPoint(mountPoint = "/osgi/framework")
+@PaxWicketMountPoint(mountPoint = "/osgi")
@AuthorizeInstantiation({"admin", "osgi-user", "osgi-developer"})
public class FrameworkPage extends OsgiPage {
diff --git a/osgi/log/src/main/resources/org/apache/karaf/webconsole/osgi/log/LogsPage.html b/osgi/log/src/main/resources/org/apache/karaf/webconsole/osgi/log/LogsPage.html
index 706b093..3d38ec6 100644
--- a/osgi/log/src/main/resources/org/apache/karaf/webconsole/osgi/log/LogsPage.html
+++ b/osgi/log/src/main/resources/org/apache/karaf/webconsole/osgi/log/LogsPage.html
@@ -54,6 +54,6 @@
</form>
</div>
- <table wicket:id="logs" class="dataview" />
+ <table wicket:id="logs" class="table table-striped table-condensed" />
</wicket:extend>
\ No newline at end of file
diff --git a/servicemix/src/main/resources/org/apache/karaf/webconsole/servicemix/internal/DetailsPage.html b/servicemix/src/main/resources/org/apache/karaf/webconsole/servicemix/internal/DetailsPage.html
index d3b1b2b..b37c821 100644
--- a/servicemix/src/main/resources/org/apache/karaf/webconsole/servicemix/internal/DetailsPage.html
+++ b/servicemix/src/main/resources/org/apache/karaf/webconsole/servicemix/internal/DetailsPage.html
@@ -19,12 +19,12 @@
<h1>Exchange <span wicket:id="id">24319433961</span></h1>
<h2>Properties</h2>
- <table wicket:id="properties" class="dataview" />
+ <table wicket:id="properties" class="table table-striped table-condensed" />
<h2>Input</h2>
<h3>Message headers</h3>
- <table wicket:id="inHeaders" class="dataview" />
+ <table wicket:id="inHeaders" class="table table-striped table-condensed" />
<h3>Message body</h3>
<pre class="message" wicket:id="inBody">
@@ -34,7 +34,7 @@
<h2>Output</h2>
<h3>Message headers</h3>
- <table wicket:id="outHeaders" class="dataview" />
+ <table wicket:id="outHeaders" class="table table-striped table-condensed" />
<h3>Message body</h3>
<pre class="message" wicket:id="outBody">
@@ -44,7 +44,7 @@
<h2>Fault</h2>
<h3>Fault headers</h3>
- <table wicket:id="faultHeaders" class="dataview" />
+ <table wicket:id="faultHeaders" class="table table-striped table-condensed" />
<h3>Fault body</h3>
<pre class="message" wicket:id="faultBody">
diff --git a/servicemix/src/main/resources/org/apache/karaf/webconsole/servicemix/internal/ServiceMixPage.html b/servicemix/src/main/resources/org/apache/karaf/webconsole/servicemix/internal/ServiceMixPage.html
index 5db4538..82d9fa3 100644
--- a/servicemix/src/main/resources/org/apache/karaf/webconsole/servicemix/internal/ServiceMixPage.html
+++ b/servicemix/src/main/resources/org/apache/karaf/webconsole/servicemix/internal/ServiceMixPage.html
@@ -18,5 +18,5 @@
<wicket:extend xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
<h1>ServiceMix page</h1>
- <table wicket:id="endpoints" class="dataview" />
+ <table wicket:id="endpoints" class="table table-striped table-condensed" />
</wicket:extend>
\ No newline at end of file
diff --git a/servicemix/src/main/resources/org/apache/karaf/webconsole/servicemix/internal/TrackNmrPage.html b/servicemix/src/main/resources/org/apache/karaf/webconsole/servicemix/internal/TrackNmrPage.html
index 2a081bc..8f2adf5 100644
--- a/servicemix/src/main/resources/org/apache/karaf/webconsole/servicemix/internal/TrackNmrPage.html
+++ b/servicemix/src/main/resources/org/apache/karaf/webconsole/servicemix/internal/TrackNmrPage.html
@@ -18,5 +18,5 @@
<wicket:extend xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
<h1>Nmr events</h1>
- <table wicket:id="exchanges" class="dataview" />
+ <table wicket:id="exchanges" class="table table-striped table-condensed" />
</wicket:extend>
