You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by hn...@apache.org on 2017/11/30 16:50:59 UTC
[myfaces-tobago] branch master updated: improve demo * better width
for navigation
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/master by this push:
new 8a7284f improve demo * better width for navigation
8a7284f is described below
commit 8a7284fdd054a03f6e83a1613e90f89e4c2a365e
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Thu Nov 30 17:50:53 2017 +0100
improve demo
* better width for navigation
---
.../tobago-example-demo/src/main/webapp/main.xhtml | 46 +++++++++-------------
.../src/main/webapp/navigation.xhtml | 8 ++--
2 files changed, 23 insertions(+), 31 deletions(-)
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/main.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/main.xhtml
index 3f8cdbb..2c14018 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/main.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/main.xhtml
@@ -24,7 +24,8 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns="http://www.w3.org/1999/xhtml">
<f:view locale="#{localeController.locale}">
- <tc:page applicationIcon="#{request.contextPath}/icon/favicon.ico" label="#{demoBundle.pageTitle} - #{title}" id="page">
+ <tc:page applicationIcon="#{request.contextPath}/icon/favicon.ico" label="#{demoBundle.pageTitle} - #{title}"
+ id="page">
<!--
<tc:dataAttribute name="tobago-log-level" value="DEBUG"/>
@@ -39,37 +40,27 @@
<ui:include src="/menu.xhtml"/>
- <tc:segmentLayout large="#{navigationState.viewSource ? '8seg 4seg' : '12seg'}">
-
- <tc:panel><!-- xxx this panel is needed currently because of a bug -->
-
- <tc:segmentLayout large="2seg 10seg" medium="3seg 9seg" small="4seg 8seg" extraSmall="12seg">
-
- <tc:panel>
- <ui:include src="/navigation.xhtml"/>
- </tc:panel>
-
- <tc:flexLayout rows="auto 1fr">
-
- <tc:messages id="messages" orderBy="severity" rendered="#{!hideGlobalMessages}"/>
-
- <tc:section label="#{title}" id="content">
- <tc:form id="mainForm">
- <ui:insert/>
- </tc:form>
- </tc:section>
+ <tc:segmentLayout extraLarge="auto 1fr 4seg" small="auto 1fr 12seg" extraSmall="12seg">
+ <tc:panel>
+ <tc:style width="250px"/>
+ <ui:include src="/navigation.xhtml"/>
+ </tc:panel>
- </tc:flexLayout>
+ <tc:flexLayout rows="auto 1fr">
+ <tc:messages id="messages" orderBy="severity" rendered="#{!hideGlobalMessages}"/>
- </tc:segmentLayout>
- </tc:panel>
+ <tc:section label="#{title}" id="content">
+ <tc:form id="mainForm">
+ <ui:insert/>
+ </tc:form>
+ </tc:section>
+ </tc:flexLayout>
<tc:panel rendered="#{navigationState.viewSource}">
<pre><code class="language-markup" id="demo-view-source">
<tc:out value="#{navigationTree.source}"/>
</code></pre>
</tc:panel>
-
</tc:segmentLayout>
<tc:popup id="info" collapsedMode="hidden">
@@ -79,17 +70,18 @@
<tc:operation name="hide" for="info"/>
</tc:button>
</f:facet>
- <tc:out label="Theme:" value="#{themeController.localizedTheme}" />
+ <tc:out label="Theme:" value="#{themeController.localizedTheme}"/>
<tc:out label="Locale:" value="#{localeController.localizedLocale}"/>
<tc:out label="Project Stage:" value="#{facesContext.application.projectStage}"/>
<tc:out label="CSP mode:" value="#{tobagoContext.tobagoConfig.contentSecurityPolicy.mode}"/>
- <tc:out label="Requests:" value="#{activityList.values[0].jsfRequest} / AJAX: #{activityList.values[0].ajaxRequest}"/>
+ <tc:out label="Requests:"
+ value="#{activityList.values[0].jsfRequest} / AJAX: #{activityList.values[0].ajaxRequest}"/>
</tc:box>
</tc:popup>
<tc:footer fixed="true">
© 2017 Apache Software Foundation, Licensed under the <a
- href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+ href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
</tc:footer>
</tc:page>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/navigation.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/navigation.xhtml
index 7250e8d..ad5d81d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/navigation.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/navigation.xhtml
@@ -23,10 +23,10 @@
<tc:treeMenu id="nav" value="#{navigationTree.tree}" var="node" state="#{navigationState.state}">
<tc:treeNode id="node">
<tc:treeCommand
- id="cmd"
- label="#{node.title}"
- outcome="#{node.outcome}"
- omit="true"/>
+ id="cmd"
+ label="» #{node.title}"
+ outcome="#{node.outcome}"
+ omit="true"/>
</tc:treeNode>
</tc:treeMenu>
</f:subview>
--
To stop receiving notification emails like this one, please contact
['"commits@myfaces.apache.org" <co...@myfaces.apache.org>'].