Repository: wicket Updated Branches: refs/heads/devutils-with-bootstrap [created] 24bc07b43
Use Bootstrap for styling DevUtils markup Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/24bc07b4 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/24bc07b4 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/24bc07b4 Branch: refs/heads/devutils-with-bootstrap Commit: 24bc07b4321780dc549c16531c17a19a9f7c63d7 Parents: 8f4a139 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon Sep 15 14:53:43 2014 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Sep 15 14:53:43 2014 +0300 ---------------------------------------------------------------------- wicket-devutils/pom.xml | 17 ++- .../apache/wicket/devutils/DevUtilsPage.html | 58 +------- .../apache/wicket/devutils/DevUtilsPage.java | 3 + .../wicket/devutils/debugbar/DebugBar.html | 6 +- .../wicket/devutils/debugbar/DebugBar.java | 13 +- .../devutils/debugbar/DebugBarInitializer.java | 12 ++ .../devutils/debugbar/InspectorDebugPanel.java | 4 +- .../devutils/debugbar/PageSizeDebugPanel.java | 5 +- .../debugbar/SessionSizeDebugPanel.java | 5 +- .../devutils/debugbar/StandardDebugPanel.html | 2 +- .../devutils/debugbar/StandardDebugPanel.java | 17 +-- .../devutils/debugbar/wicket-debugbar.css | 25 +--- .../wicket/devutils/debugbar/wicket-debugbar.js | 11 +- .../diskstore/browser/BrowserPanel.html | 8 +- .../devutils/inspector/EnhancedPageView.html | 135 ++++++++++++------- .../devutils/inspector/InspectorPage.html | 13 +- .../devutils/inspector/InspectorPage.java | 11 +- .../devutils/inspector/LiveSessionsPage.html | 16 +-- .../devutils/inspector/LiveSessionsPage.java | 3 - .../wicket/devutils/inspector/RequestsPage.html | 8 +- .../wicket/devutils/inspector/RequestsPage.java | 6 +- .../wicket/devutils/inspector/SessionView.html | 18 +-- 22 files changed, 185 insertions(+), 211 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/24bc07b4/wicket-devutils/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-devutils/pom.xml b/wicket-devutils/pom.xml index bfe37bc..40c255d 100644 --- a/wicket-devutils/pom.xml +++ b/wicket-devutils/pom.xml @@ -31,7 +31,12 @@ are typically used during development only, but may be turned on for additional production debugging. </description> - <dependencies> + + <properties> + <wicket-bootstrap.version>0.10.0-SNAPSHOT</wicket-bootstrap.version> + </properties> + + <dependencies> <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-core</artifactId> @@ -40,6 +45,16 @@ <groupId>org.apache.wicket</groupId> <artifactId>wicket-extensions</artifactId> </dependency> + <dependency> + <groupId>de.agilecoders.wicket</groupId> + <artifactId>wicket-bootstrap-core</artifactId> + <version>${wicket-bootstrap.version}</version> + </dependency> + <dependency> + <groupId>de.agilecoders.wicket</groupId> + <artifactId>wicket-bootstrap-themes</artifactId> + <version>${wicket-bootstrap.version}</version> + </dependency> </dependencies> <build> <pluginManagement> http://git-wip-us.apache.org/repos/asf/wicket/blob/24bc07b4/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.html ---------------------------------------------------------------------- diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.html b/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.html index 98a45ee..19418be 100644 --- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.html +++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.html @@ -17,60 +17,12 @@ --> <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> <head> -<title>DevUtilsPage.html</title> -<style type="text/css"> -body { - margin-left: 2em; - font-family: 'Lucida Sans', 'Helvetica', 'Sans-serif', 'sans'; - font-size: 9pt; - line-height: 1.8em; -} - -h1,h2,h3,h4,h5,h6,h7,h8 { - color: #E9601A; - font-size: -1; -} - -pre,table,td { - font-family: 'MS Trebuchet', 'Verdana', Arial, Helvetica; - font-size: 10pt; - line-height: 1.2em; -} - -h2 { - font-size: 1.2em; -} - -pre,table,td { - font-family: 'MS Trebuchet', 'Verdana', Arial, Helvetica; - font-size: 10pt; - line-height: 1.2em; -} - -pre { - border: 1px solid #ddd; - margin-left: 2em; -} - -h1 img { - vertical-align: middle; -} - -.resource { - color: blue; -} - -.tablestyle { - margin-left: 2em; - border: 1px solid #bbb; -} -</style> -<title>Requests Page</title> + <title>DevUtilsPage.html</title> </head> <body> - <div wicket:id="debug"></div> - <wicket:child /> - <br /> - <br /> + <div wicket:id="debug"></div> + <div class="container"> + <wicket:child /> + </div> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/24bc07b4/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.java ---------------------------------------------------------------------- diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.java index a8cb863..be57cd6 100644 --- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.java +++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.java @@ -16,6 +16,7 @@ */ package org.apache.wicket.devutils; +import de.agilecoders.wicket.core.markup.html.bootstrap.behavior.BootstrapBaseBehavior; import org.apache.wicket.devutils.debugbar.DebugBar; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.model.IModel; @@ -65,6 +66,8 @@ public class DevUtilsPage extends WebPage private void init() { add(new DebugBar("debug")); + + BootstrapBaseBehavior.addTo(this); } @Override http://git-wip-us.apache.org/repos/asf/wicket/blob/24bc07b4/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.html ---------------------------------------------------------------------- diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.html b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.html index f6db5d2..36fd174 100644 --- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.html +++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.html @@ -16,15 +16,13 @@ limitations under the License. --> <html xmlns="http://www.w3.org/1999/xhtml"; xmlns:wicket="http://wicket.apache.org";> -<head> -</head> <body> <wicket:panel> - <a id="wicketDebugBarCollapse" onclick="wicketDebugBarCollapse();"><img wicket:id="logo" src="wicket.png" alt="Wicket" /></a> + <a class="btn btn-link" id="wicketDebugBarCollapse" onclick="wicketDebugBarCollapse();"><i class="glyphicon glyphicon-collapse-up"></i></a> <span id="wicketDebugBarContents" wicket:id="content"> <span wicket:id="contributors"><span wicket:id="contrib" class="contributor"></span></span> - <a id="wicketDebugBarRemove" onclick="wicketDebugBarRemove();"><img wicket:id="removeImg" src="remove.png" alt="Remove" /></a> + <button type="button" class="close" onclick="wicketDebugBarRemove();"><span aria-hidden="true">×</span><span class="sr-only">Close</span></button> </span> </wicket:panel> http://git-wip-us.apache.org/repos/asf/wicket/blob/24bc07b4/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java ---------------------------------------------------------------------- diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java index c839d64..4d557b6 100644 --- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java +++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java @@ -28,13 +28,11 @@ import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.markup.html.WebMarkupContainer; -import org.apache.wicket.markup.html.image.Image; import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.html.list.ListView; import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.request.resource.CssResourceReference; import org.apache.wicket.request.resource.JavaScriptResourceReference; -import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.util.lang.Args; /** @@ -114,8 +112,6 @@ public class DebugBar extends DevUtilsPanel } })); - add(new Image("logo", new PackageResourceReference(DebugBar.class, "wicket.png"))); - add(contentSection("content", initiallyExpanded)); } @@ -151,15 +147,16 @@ public class DebugBar extends DevUtilsPanel } }); - section.add(new Image("removeImg", new PackageResourceReference(DebugBar.class, "remove.png"))); - return section; } @Override - public boolean isVisible() + protected void onConfigure() { - return getApplication().getDebugSettings().isDevelopmentUtilitiesEnabled(); + super.onConfigure(); + + boolean developmentUtilitiesEnabled = getApplication().getDebugSettings().isDevelopmentUtilitiesEnabled(); + setVisible(developmentUtilitiesEnabled); } @Override http://git-wip-us.apache.org/repos/asf/wicket/blob/24bc07b4/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBarInitializer.java ---------------------------------------------------------------------- diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBarInitializer.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBarInitializer.java index ae17d8e..8ca0d06 100644 --- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBarInitializer.java +++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBarInitializer.java @@ -16,8 +16,13 @@ */ package org.apache.wicket.devutils.debugbar; +import de.agilecoders.wicket.core.Bootstrap; +import de.agilecoders.wicket.core.settings.BootstrapSettings; +import de.agilecoders.wicket.core.settings.IBootstrapSettings; +import de.agilecoders.wicket.webjars.WicketWebjars; import org.apache.wicket.Application; import org.apache.wicket.IInitializer; +import org.apache.wicket.protocol.http.WebApplication; /** * Debug bar module initializer @@ -39,6 +44,13 @@ public class DebugBarInitializer implements IInitializer DebugBar.registerContributor(InspectorDebugPanel.DEBUG_BAR_CONTRIB, application); DebugBar.registerContributor(SessionSizeDebugPanel.DEBUG_BAR_CONTRIB, application); DebugBar.registerContributor(PageSizeDebugPanel.DEBUG_BAR_CONTRIB, application); + + if (WicketWebjars.isInstalled(application) == false) + { + WicketWebjars.install((WebApplication) application); + } + IBootstrapSettings bootstrapSettings = new BootstrapSettings(); + Bootstrap.install(application, bootstrapSettings); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/24bc07b4/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java ---------------------------------------------------------------------- diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java index 33a0705..19a5ebe 100644 --- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java +++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java @@ -65,9 +65,9 @@ public class InspectorDebugPanel extends StandardDebugPanel } @Override - protected ResourceReference getImageResourceReference() + protected String getIcon() { - return new PackageResourceReference(InspectorPage.class, "bug.png"); + return "glyphicon glyphicon-info-sign"; } @Override http://git-wip-us.apache.org/repos/asf/wicket/blob/24bc07b4/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/PageSizeDebugPanel.java ---------------------------------------------------------------------- diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/PageSizeDebugPanel.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/PageSizeDebugPanel.java index b0925dd..97e552b 100644 --- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/PageSizeDebugPanel.java +++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/PageSizeDebugPanel.java @@ -76,10 +76,9 @@ public class PageSizeDebugPanel extends StandardDebugPanel } @Override - protected ResourceReference getImageResourceReference() + protected String getIcon() { - // TODO: need better image for this: - return new PackageResourceReference(SessionSizeDebugPanel.class, "harddrive.png"); + return "glyphicon glyphicon-floppy-disk"; } @Override http://git-wip-us.apache.org/repos/asf/wicket/blob/24bc07b4/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/SessionSizeDebugPanel.java ---------------------------------------------------------------------- diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/SessionSizeDebugPanel.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/SessionSizeDebugPanel.java index 712200b..7cafeda 100644 --- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/SessionSizeDebugPanel.java +++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/SessionSizeDebugPanel.java @@ -67,10 +67,9 @@ public class SessionSizeDebugPanel extends StandardDebugPanel } @Override - protected ResourceReference getImageResourceReference() + protected String getIcon() { - // TODO: need better image for this: - return new PackageResourceReference(SessionSizeDebugPanel.class, "harddrive.png"); + return "glyphicon glyphicon-tasks"; } @Override http://git-wip-us.apache.org/repos/asf/wicket/blob/24bc07b4/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/StandardDebugPanel.html ---------------------------------------------------------------------- diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/StandardDebugPanel.html b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/StandardDebugPanel.html index 1b273fa..6ee4275 100644 --- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/StandardDebugPanel.html +++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/StandardDebugPanel.html @@ -21,7 +21,7 @@ <body> <wicket:panel> - <a href="#" wicket:id="link"><img wicket:id="img" alt="" /><span wicket:id="data"></span></a> + <a class="btn btn-link" href="javascript:;" wicket:id="link"><i wicket:id="icon"></i> <span wicket:id="data"></span></a> </wicket:panel> </body> http://git-wip-us.apache.org/repos/asf/wicket/blob/24bc07b4/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/StandardDebugPanel.java ---------------------------------------------------------------------- diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/StandardDebugPanel.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/StandardDebugPanel.java index c88499e..6ad1039 100644 --- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/StandardDebugPanel.java +++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/StandardDebugPanel.java @@ -16,7 +16,9 @@ */ package org.apache.wicket.devutils.debugbar; +import de.agilecoders.wicket.core.markup.html.bootstrap.behavior.CssClassNameAppender; import org.apache.wicket.Page; +import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.devutils.DevUtilsPanel; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; @@ -52,15 +54,10 @@ public abstract class StandardDebugPanel extends DevUtilsPanel super.onInitialize(); BookmarkablePageLink<Void> link = createLink("link"); add(link); - ResourceReference img = getImageResourceReference(); - if (img == null) - { - link.add(new WebMarkupContainer("img").setVisibilityAllowed(false)); - } - else - { - link.add(new Image("img", img)); - } + + String iconClass = getIcon(); + link.add(new WebMarkupContainer("icon").add(CssClassNameAppender.append("class", iconClass))); + link.add(new Label("data", getDataModel())); } @@ -71,7 +68,7 @@ public abstract class StandardDebugPanel extends DevUtilsPanel protected abstract IModel<String> getDataModel(); - protected abstract ResourceReference getImageResourceReference(); + protected abstract String getIcon(); protected abstract Class<? extends Page> getLinkPageClass(); http://git-wip-us.apache.org/repos/asf/wicket/blob/24bc07b4/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/wicket-debugbar.css ---------------------------------------------------------------------- diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/wicket-debugbar.css b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/wicket-debugbar.css index 08c429a..7d30d43 100644 --- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/wicket-debugbar.css +++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/wicket-debugbar.css @@ -20,29 +20,12 @@ position: absolute; right: 0; top: 0; - padding: 0px 10px 0px 5px; + padding: 0 10px 0 5px; } -#wicketDebugBar img { - margin: 4px 10px -3px 0px; - height: 16px; - width: 16px; - border: none; -} -#wicketDebugBarRemove img { - margin-left: 10px; - margin-right: 0px; -} -#wicketDebugBar .contributor a { - margin-right: 10px; - font-family: Verdana; +#wicketDebugBar a { font-size: 9pt; color: black; } -.wicketversioncontrib { - padding: 0em 0.5em; - background-color: #AAA; - opacity: 0.8; -} /* the color is put on the class rather than the ID so that if there is an error, we can simply change @@ -56,3 +39,7 @@ background-color: #DDDDDD; opacity: 0.8; } +#wicketDebugBarCollapse i { + margin-top: -7px; + font-size: large; +} http://git-wip-us.apache.org/repos/asf/wicket/blob/24bc07b4/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/wicket-debugbar.js ---------------------------------------------------------------------- diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/wicket-debugbar.js b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/wicket-debugbar.js index 6f1b287..ef57b78 100644 --- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/wicket-debugbar.js +++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/wicket-debugbar.js @@ -15,16 +15,11 @@ * limitations under the License. */ function wicketDebugBarCollapse() { - wicketDebugBarToggleVisibility('wicketDebugBarContents'); + jQuery('#wicketDebugBarContents').toggle(); + jQuery('#wicketDebugBarCollapse > i').toggleClass('glyphicon-collapse-up').toggleClass('glyphicon-collapse-down'); } function wicketDebugBarRemove() { - wicketDebugBarToggleVisibility('wicketDebugBar'); -} - -function wicketDebugBarToggleVisibility(elemID) { - var elem = document.getElementById(elemID); - var vis = elem.style.display != 'none'; - elem.style.display = (vis ? 'none' : ''); + jQuery('#wicketDebugBar').hide(); } http://git-wip-us.apache.org/repos/asf/wicket/blob/24bc07b4/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/BrowserPanel.html ---------------------------------------------------------------------- diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/BrowserPanel.html b/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/BrowserPanel.html index aba3252..da47be3 100644 --- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/BrowserPanel.html +++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/BrowserPanel.html @@ -19,10 +19,10 @@ <wicket:panel> <h3>Active sessions</h3> - <select wicket:id="sessions"></select> <a wicket:id="currentSessionLink" title="Selects the current session">Current session</a> + <select class="form-control" wicket:id="sessions"></select> <a class="btn btn-link" wicket:id="currentSessionLink" title="Selects the current session">Current session</a> - <h3>Stored pages</h3> <a wicket:id="refresh" title="Refreshes the content of the table below">refresh</a> - <table wicket:id="table" border="1" cellpadding="3" cellspacing="1"></table> + <h3>Stored pages</h3> <a class="btn btn-link" wicket:id="refresh" title="Refreshes the content of the table below">refresh</a> + <table class="table table-striped" wicket:id="table"></table> </wicket:panel> -</html> \ No newline at end of file +</html> http://git-wip-us.apache.org/repos/asf/wicket/blob/24bc07b4/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.html ---------------------------------------------------------------------- diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.html b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.html index f06cf2c..1ee2b6a 100644 --- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.html +++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.html @@ -16,65 +16,100 @@ limitations under the License. --> <html xmlns:wicket="http://wicket.apache.org";> -<head> <wicket:head> - <style> -.enhancedViewPage table { - border: 1px solid #DDDDDD; -} - -.enhancedViewPage th { - background: #C3C3C3; - color: white; - font-weight: bold; - padding: 0.2em; -} - -.enhancedViewPage tr.even { - background-color: #FFFFFF; -} - -.enhancedViewPage tr.odd { - background-color: #EEEEEE; -} - -.enhancedViewPage td { - padding: 0 0.2em; -} - -.enhancedViewPage .col_size { - text-align: left; - white-space: nowrap; -} - -.enhancedViewPage .col_renderTime { - text-align: center; - white-space: nowrap; -} - -.enhancedViewPage .col_path { - text-align: left; - min-width: 15em; -} - -.enhancedViewPage .col_stateless { - text-align: center; -} -</style> + <style> + .enhancedViewPage table { + border: 1px solid #DDDDDD; + } + + .enhancedViewPage th { + background: #C3C3C3; + color: white; + font-weight: bold; + padding: 0.2em; + } + + .enhancedViewPage tr.even { + background-color: #FFFFFF; + } + + .enhancedViewPage tr.odd { + background-color: #EEEEEE; + } + + .enhancedViewPage td { + padding: 0 0.2em; + } + + .enhancedViewPage .col_size { + text-align: left; + white-space: nowrap; + } + + .enhancedViewPage .col_renderTime { + text-align: center; + white-space: nowrap; + } + + .enhancedViewPage .col_path { + border: 1px solid #DDDDDD; + } + + .enhancedViewPage th { + background: #C3C3C3; + color: white; + font-weight: bold; + padding: 0.2em; + } + + .enhancedViewPage tr.even { + background-color: #FFFFFF; + } + + .enhancedViewPage tr.odd { + background-color: #EEEEEE; + } + + .enhancedViewPage td { + padding: 0 0.2em; + } + + .enhancedViewPage .col_size { + text-align: left; + white-space: nowrap; + } + + .enhancedViewPage .col_renderTime { + text-align: center; + white-space: nowrap; + } + + .enhancedViewPage .col_path { + text-align: left; + min-width: 15em; + } + + .enhancedViewPage .col_stateless { + text-align: center; + } + + </style> </wicket:head> -</head> <body> <wicket:panel> <h2>Page</h2> <p> <span wicket:id="info">Page</span> | render time: <span wicket:id="pageRenderDuration">n/a</span> </p> - <form wicket:id="form"> + <form wicket:id="form" role="form" class="form-inline"> <fieldset> <legend>Filtering</legend> - <div> + <div class="checkbox"> <label wicket:for="showBehaviors">Show behaviors</label><input type="checkbox" - wicket:id="showBehaviors" /><label wicket:for="showStateless">Show only stateful + wicket:id="showBehaviors" /> + </div> + <div class="checkbox"> + <label wicket:for="showStateless">Show only stateful Components and Behaviors + their parents</label><input type="checkbox" wicket:id="showStateless" /> </div> </fieldset> @@ -82,10 +117,10 @@ <legend>Visible columns</legend> <div wicket:id="visibleColumns"></div> </fieldset> - <button type="submit" wicket:id="submit">Apply filters</button> + <button class="btn btn-success" type="submit" wicket:id="submit">Apply filters</button> </form> <p> - <a wicket:id="collapseAll">collapse all</a> <a wicket:id="expandAll">expand all</a> + <a class="btn btn-link" wicket:id="collapseAll">collapse all</a> | <a class="btn btn-link" wicket:id="expandAll">expand all</a> </p> <div class="enhancedViewPage" wicket:id="tree">[tree]</div> </wicket:panel> http://git-wip-us.apache.org/repos/asf/wicket/blob/24bc07b4/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.html ---------------------------------------------------------------------- diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.html b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.html index d90d067..17fb081 100644 --- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.html +++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.html @@ -18,17 +18,16 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <wicket:head> -<title>Inspector Bug</title> + <title>Inspector Bug</title> </wicket:head> </head> <body> <wicket:extend> - <h1><img border="0" wicket:id="bug" src="bug.png"/> Wicket Inspector (Wicket Version: <span wicket:id="wicketVersion">1.2</span>)</h1> - <a href="javascript:history.go(-1)">Go Back</a><br/> - <a wicket:id="allsessions" href="#">All Sessions</a> - <span wicket:id="application">Application view here</span> - <span wicket:id="session">Session view here</span> - <span wicket:id="page">Page view here</span> + <h1><i class="glyphicon glyphicon-info-sign"></i> Wicket Inspector</h1> + <a class="btn btn-info" href="javascript:history.go(-1)">Go Back</a> <a class="btn btn-info" wicket:id="allsessions" href="#">All Sessions</a> + <div wicket:id="application">Application view here</div> + <div wicket:id="session">Session view here</div> + <div wicket:id="page">Page view here</div> </wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/24bc07b4/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.java ---------------------------------------------------------------------- diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.java index 023583d..f354c6c 100644 --- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.java +++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.java @@ -20,12 +20,9 @@ import org.apache.wicket.Application; import org.apache.wicket.Page; import org.apache.wicket.Session; import org.apache.wicket.devutils.DevUtilsPage; -import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.markup.html.image.Image; import org.apache.wicket.markup.html.link.BookmarkablePageLink; import org.apache.wicket.page.IManageablePage; import org.apache.wicket.request.mapper.parameter.PageParameters; -import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.util.string.StringValueConversionException; @@ -55,18 +52,12 @@ public final class InspectorPage extends DevUtilsPage final int pageId = parameters.get("pageId").toInt(); page = Session.get().getPageManager().getPage(pageId); } - catch (StringValueConversionException e) - { - // Ignore - } - catch (NullPointerException e) + catch (StringValueConversionException | NullPointerException e) { // Ignore } add(new EnhancedPageView("page", (Page)page)); - add(new Image("bug", new PackageResourceReference(InspectorPage.class, "bug.png"))); add(new BookmarkablePageLink<>("allsessions", LiveSessionsPage.class)); - add(new Label("wicketVersion", getApplication().getFrameworkSettings().getVersion())); } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/24bc07b4/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.html ---------------------------------------------------------------------- diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.html b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.html index 94dd964..72f5042 100644 --- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.html +++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.html @@ -22,21 +22,21 @@ </wicket:head> </head> <body> - <wicket:extend> - <h1><img border="0" wicket:id="bug" src="bug.png"/> Wicket Sessions Inspector</h1> - <a href="javascript:history.go(-1)">Go Back</a> + <wicket:extend> + <h1><i class="glyphicon glyphicon-info-sign"></i> Wicket Sessions Inspector</h1> + <a class="btn btn-info" href="javascript:history.go(-1)">Go Back</a> - <span wicket:id="application">Application view here</span> + <div wicket:id="application">Application view here</div> - <h2>Session Information <a wicket:id="togglelink" href="#"><span wicket:id="toggletext"></span></a></h2> - <table> + <h2>Session Information <a class="btn btn-link" wicket:id="togglelink" href="javascript:;"><span wicket:id="toggletext"></span></a></h2> + <table class="table table-striped"> <tr><td>Total created sessions</td><td><span wicket:id="totalSessions"></span></td></tr> <tr><td>Live session count</td><td><span wicket:id="liveSessions"></span></td></tr> <tr><td>Peak session count</td><td><span wicket:id="peakSessions"></span></td></tr> </table> <p>Live Sessions</p> - <table border="1"> + <table class="table table-bordered table-striped"> <tr> <th>Session Id</th> <th>Last Request Time</th> @@ -52,7 +52,7 @@ <td wicket:id="sessionSize" align="right"></td> </tr> </table> - <span wicket:id="navigator"></span> + <div wicket:id="navigator"></div> </wicket:extend> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/24bc07b4/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.java ---------------------------------------------------------------------- diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.java index 6ff3cce..1c2a1f9 100644 --- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.java +++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.java @@ -24,7 +24,6 @@ import java.util.List; import org.apache.wicket.Application; import org.apache.wicket.devutils.DevUtilsPage; import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.markup.html.image.NonCachingImage; import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.html.list.PageableListView; @@ -50,8 +49,6 @@ public class LiveSessionsPage extends DevUtilsPage */ public LiveSessionsPage() { - add(new NonCachingImage("bug")); - add(new ApplicationView("application", Application.get())); Link<Void> link = new Link<Void>("togglelink") http://git-wip-us.apache.org/repos/asf/wicket/blob/24bc07b4/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.html ---------------------------------------------------------------------- diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.html b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.html index 9cef06f..bec46b6 100644 --- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.html +++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.html @@ -18,13 +18,13 @@ <html xmlns:wicket="http://wicket.apache.org";> <head> <wicket:head> -<title>Requests Page</title> + <title>Requests Page</title> </wicket:head> </head> <body> <wicket:extend> - <h1><img border="0" wicket:id="bug" src="bug.png"/> Wicket Sessions Inspector</h1> - <a href="javascript:history.go(-1)">Go Back</a> + <h1><i class="glyphicon glyphicon-info-sign"></i> Wicket Sessions Inspector</h1> + <a class="btn btn-info" href="javascript:history.go(-1)">Go Back</a> <h2>Session</h2> <ul> @@ -38,7 +38,7 @@ </ul> <h2>Request Information</h2> - <table border="1"> + <table class="table table-striped table-bordered"> <tr> <th wicket:id="sessionid">Id</th> <th>Start Date</th> http://git-wip-us.apache.org/repos/asf/wicket/blob/24bc07b4/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.java ---------------------------------------------------------------------- diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.java index a44c5f1..dfef64e 100644 --- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.java +++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.java @@ -25,7 +25,6 @@ import org.apache.wicket.Application; import org.apache.wicket.devutils.DevUtilsPage; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.markup.html.image.NonCachingImage; import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.html.list.PageableListView; import org.apache.wicket.markup.html.navigation.paging.PagingNavigator; @@ -54,7 +53,6 @@ public class RequestsPage extends DevUtilsPage */ public RequestsPage(final SessionData sessionData) { - add(new NonCachingImage("bug")); if (sessionData == null) { add(new Label("id").setVisible(false)); @@ -69,10 +67,10 @@ public class RequestsPage extends DevUtilsPage else { add(new Label("id", new Model<>(sessionData.getSessionId()))); - add(new Label("sessionInfo", new Model<Serializable>( + add(new Label("sessionInfo", new Model<>( (Serializable)sessionData.getSessionInfo()))); add(new Label("startDate", new Model<>(sdf.format(sessionData.getStartDate())))); - add(new Label("lastRequestTime", new Model<String>( + add(new Label("lastRequestTime", new Model<>( sdf.format(sessionData.getLastActive())))); add(new Label("numberOfRequests", new Model<>(sessionData.getNumberOfRequests()))); add(new Label("totalTimeTaken", new Model<>(sessionData.getTotalTimeTaken()))); http://git-wip-us.apache.org/repos/asf/wicket/blob/24bc07b4/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionView.html ---------------------------------------------------------------------- diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionView.html b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionView.html index 7a8e308..27c499d 100644 --- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionView.html +++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionView.html @@ -17,14 +17,14 @@ --> <html xmlns:wicket="http://wicket.apache.org";> <body> - <wicket:panel> - <h2>Session</h2> - <ul> - <li>Id: <span wicket:id="id">9999</span></li> - <li>Locale: <span wicket:id="locale">en_US</span></li> - <li>Style: : <span wicket:id="style">none</span></li> - <li>Session Size: <span wicket:id="size">none</span></li> - </ul> - </wicket:panel> + <wicket:panel> + <h2>Session</h2> + <ul> + <li>Id: <span wicket:id="id">9999</span></li> + <li>Locale: <span wicket:id="locale">en_US</span></li> + <li>Style: : <span wicket:id="style">none</span></li> + <li>Session Size: <span wicket:id="size">none</span></li> + </ul> + </wicket:panel> </body> </html>
