You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2014/04/29 11:22:23 UTC
[4/4] git commit: TAP5-2303: adjustments for Bootstrap-based
quickstart app layout
TAP5-2303: adjustments for Bootstrap-based quickstart app layout
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/277d82c8
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/277d82c8
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/277d82c8
Branch: refs/heads/master
Commit: 277d82c85055bbc9e15365c55c9adfa69fa273be
Parents: dbc2799
Author: Jochen Kemnade <jo...@eddyson.de>
Authored: Tue Apr 29 11:20:57 2014 +0200
Committer: Jochen Kemnade <jo...@eddyson.de>
Committed: Tue Apr 29 11:20:57 2014 +0200
----------------------------------------------------------------------
.../src/main/java/components/Layout.java | 1 +
.../src/main/resources/components/Layout.tml | 41 ++++++++++----------
2 files changed, 22 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/277d82c8/quickstart/filtered/archetype-resources/src/main/java/components/Layout.java
----------------------------------------------------------------------
diff --git a/quickstart/filtered/archetype-resources/src/main/java/components/Layout.java b/quickstart/filtered/archetype-resources/src/main/java/components/Layout.java
index d2d3732..fd4b532 100644
--- a/quickstart/filtered/archetype-resources/src/main/java/components/Layout.java
+++ b/quickstart/filtered/archetype-resources/src/main/java/components/Layout.java
@@ -14,6 +14,7 @@ import org.apache.tapestry5.SymbolConstants;
/**
* Layout component for pages of application test-project.
*/
+@Import(module="bootstrap/collapse")
public class Layout
{
@Inject
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/277d82c8/quickstart/filtered/archetype-resources/src/main/resources/components/Layout.tml
----------------------------------------------------------------------
diff --git a/quickstart/filtered/archetype-resources/src/main/resources/components/Layout.tml b/quickstart/filtered/archetype-resources/src/main/resources/components/Layout.tml
index 3edc360..c4865b1 100644
--- a/quickstart/filtered/archetype-resources/src/main/resources/components/Layout.tml
+++ b/quickstart/filtered/archetype-resources/src/main/resources/components/Layout.tml
@@ -28,31 +28,32 @@
<body>
-<div class="navbar navbar-inverse navbar-fixed-top">
- <div class="navbar-header">
- <div class="container">
- <button type="button" class="btn navbar-btn" data-toggle="collapse" data-target=".nav-collapse">
+<div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+ <div class="container">
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+ <span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <t:pagelink page="index" class="brand">${artifactId}</t:pagelink>
- <div class="nav-collapse collapse">
- <ul class="nav">
- <t:loop source="pageNames" value="pageName">
- <li class="prop:classForPageName">
- <t:pagelink page="prop:pageName">${D}{pageName}</t:pagelink>
- </li>
- </t:loop>
- </ul>
- <span class="pull-right">
- <t:pagelink page="login">
- <button type="submit" class="btn">Sign in</button>
- </t:pagelink>
- </span>
-
- </div><!--/.nav-collapse -->
+ <t:pagelink page="index" class="navbar-brand">app</t:pagelink>
</div>
+ <div class="navbar-collapse collapse">
+ <ul class="nav navbar-nav">
+ <t:loop source="pageNames" value="pageName">
+ <t:any element="li" class="prop:classForPageName">
+ <t:pagelink page="prop:pageName">${pageName}</t:pagelink>
+ </t:any>
+ </t:loop>
+ </ul>
+ <span class="navbar-right">
+ <li>
+ <t:pagelink page="login" class="btn btn-default navbar-btn">Sign in</t:pagelink>
+ </li>
+ </span>
+
+ </div><!--/.nav-collapse -->
</div>
</div>