Update page for Bootstrap 3
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/1a1a9771 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/1a1a9771 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/1a1a9771 Branch: refs/heads/master Commit: 1a1a9771af5ee930395949d9f4dd28640c59b5e5 Parents: 5059ebb Author: Howard M. Lewis Ship <[email protected]> Authored: Mon Aug 26 07:57:16 2013 +0100 Committer: Howard M. Lewis Ship <[email protected]> Committed: Mon Aug 26 07:57:16 2013 +0100 ---------------------------------------------------------------------- .../META-INF/assets/core/dashboard.css | 8 +- .../tapestry5/corelib/pages/PageCatalog.tml | 102 +++++++++++-------- .../tapestry5/corelib/pages/T5Dashboard.tml | 39 +++---- 3 files changed, 88 insertions(+), 61 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1a1a9771/tapestry-core/src/main/resources/META-INF/assets/core/dashboard.css ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/core/dashboard.css b/tapestry-core/src/main/resources/META-INF/assets/core/dashboard.css index c066ca7..5f8007b 100644 --- a/tapestry-core/src/main/resources/META-INF/assets/core/dashboard.css +++ b/tapestry-core/src/main/resources/META-INF/assets/core/dashboard.css @@ -1,7 +1,11 @@ body { - padding-top: 40px; + padding-top: 55px; } -.brand sub { +.navbar-brand sub { font-size: x-small; +} + +.vert-offset { + margin-top: 5px; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1a1a9771/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/pages/PageCatalog.tml ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/pages/PageCatalog.tml b/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/pages/PageCatalog.tml index 3dc308f..65651ff 100644 --- a/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/pages/PageCatalog.tml +++ b/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/pages/PageCatalog.tml @@ -28,51 +28,71 @@ <div class="btn-group"> - <t:actionlink t:id="forceLoad" zone="pages" class="btn">Load all pages</t:actionlink> + <t:actionlink t:id="forceLoad" zone="pages" class="btn btn-default">Load all pages</t:actionlink> <t:if test="! productionMode"> - <t:actionlink t:id="clearCache" zone="pages" class="btn">Clear the cache</t:actionlink> - <t:actionlink t:id="reloadClasses" zone="pages" class="btn">Reload component classes</t:actionlink> + <t:actionlink t:id="clearCache" zone="pages" class="btn btn-default">Clear the cache</t:actionlink> + <t:actionlink t:id="reloadClasses" zone="pages" class="btn btn-default">Reload component classes + </t:actionlink> </t:if> - <t:actionlink t:id="runGC" zone="pages" class="btn">Run the GC</t:actionlink> + <t:actionlink t:id="runGC" zone="pages" class="btn btn-default">Run the GC</t:actionlink> </div> - <ul class="nav nav-pills nav-stacked"> - <li> - </li> - </ul> - - <t:form t:id="singlePageLoad" zone="pages" class="form-inline"> - - <t:label for="pageName">Load single page:</t:label> - <t:select t:id="pageName" model="pageNames"/> - - <input type="submit" value="Load Page" class="btn btn-primary"/> - - </t:form> - - <dl class="dl-horizontal"> - <dt>Defined Pages</dt> - <dd>Number of page classes.</dd> - <dt>Pages in Cache</dt> - <dd>Number of page instances currently loaded. This may include the same page class for different selectors. - </dd> - <dt>Unique Page Names</dt> - <dd>Number of pages loaded, ignoring selectors.</dd> - <dt>Selector</dt> - <dd>The locale (plus application-specific other information) for which the page was assembled. A new instance of - a Page will be created for each new selector, - as needed. - </dd> - <dt>Assembly Time</dt> - <dd>Time to assemble a complete instance of a page, including all sub-components, and all bindings and other - connections - between them. - </dd> - <dt>Component Count</dt> - <dd>Number of components on the page, including the root component.</dd> - <dt>Weight</dt> - <dd>Arbitrary number that includes number of components and mixins, template tokens, and other factors.</dd> - </dl> + <div class="panel panel-default vert-offset"> + <div class="panel-heading">Load single page</div> + <div class="panel-body"> + <t:form t:id="singlePageLoad" zone="pages" class="form-inline"> + + <div class="form-group"> + + <t:label for="pageName" class="sr-only">Load single page</t:label> + <t:select t:id="pageName" model="pageNames" class="col-md-5"/> + + </div> + + <input type="submit" value="Load Page" class="btn btn-primary"/> + + </t:form> + </div> + </div> + + + <div class="panel panel-default"> + <div class="panel-heading"> + <h3 class="panel-title">Key</h3></div> + <div class="panel-body"> + + <dl class="dl-horizontal"> + <dt>Defined Pages</dt> + <dd>Number of page classes.</dd> + <dt>Pages in Cache</dt> + <dd>Number of page instances currently loaded. This may include the same page class for different + selectors. + </dd> + <dt>Unique Page Names</dt> + <dd>Number of pages loaded, ignoring selectors.</dd> + <dt>Selector</dt> + <dd>The locale (plus application-specific other information) for which the page was assembled. A new + instance of + a Page will be created for each new selector, + as needed. + </dd> + <dt>Assembly Time</dt> + <dd>Time to assemble a complete instance of a page, including all sub-components, and all bindings and + other + connections + between them. + </dd> + <dt>Component Count</dt> + <dd>Number of components on the page, including the root component.</dd> + <dt>Weight</dt> + <dd>Arbitrary number that includes number of components and mixins, template tokens, and other + factors. + </dd> + <dt>Attach Count</dt> + <dd>Number of times the page has been attached to a request.</dd> + </dl> + </div> + </div> </t:block> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1a1a9771/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/pages/T5Dashboard.tml ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/pages/T5Dashboard.tml b/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/pages/T5Dashboard.tml index 7e909f9..5c4f0f9 100644 --- a/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/pages/T5Dashboard.tml +++ b/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/pages/T5Dashboard.tml @@ -3,26 +3,29 @@ <head><title>Tapestry 5 Dashboard</title></head> <body> -<div class="navbar navbar-fixed-top navbar-inverse"> - <div class="navbar-inner"> - <a href="${symbol:tapestry.context-path}/" class="brand">Apache Tapestry 5 - <sub>${frameworkVersion} - <t:if test="!productionMode"> - (dev mode) - </t:if> - </sub> - </a> - <ul class="nav nav-pills"> - <t:loop source="dashboardManager.tabNames" value="tabName"> - <li class="${tabClass}"> - <t:pagelink page="core/t5dashboard" context="tabName.toLowerCase()">${tabName}</t:pagelink> - </li> - </t:loop> - </ul> +<nav class="navbar navbar-fixed-top navbar-inverse"> + <div class="container"> + + <div class="navbar-header"> + <a href="${symbol:tapestry.context-path}/" class="navbar-brand">Apache Tapestry 5 + <sub>${frameworkVersion} + <t:if test="!productionMode"> + (dev mode) + </t:if> + </sub> + </a> + <ul class="nav navbar-nav nav-pills"> + <t:loop source="dashboardManager.tabNames" value="tabName"> + <li class="${tabClass}"> + <t:pagelink page="core/t5dashboard" context="tabName.toLowerCase()">${tabName}</t:pagelink> + </li> + </t:loop> + </ul> + </div> </div> -</div> +</nav> -<div class="container-fluid"> +<div class="container"> <t:alerts/> <t:delegate to="content"/> </div>
