You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2015/09/24 18:06:08 UTC
svn commit: r1705092 - in
/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp:
content/00-intro/intro.xhtml footer.xhtml layout/overview.xhtml menu.xhtml
Author: lofwyr
Date: Thu Sep 24 16:06:08 2015
New Revision: 1705092
URL: http://svn.apache.org/viewvc?rev=1705092&view=rev
Log:
Demo: remove footer and put buttons into header
Removed:
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/footer.xhtml
Modified:
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/00-intro/intro.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/layout/overview.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/00-intro/intro.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/00-intro/intro.xhtml?rev=1705092&r1=1705091&r2=1705092&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/00-intro/intro.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/00-intro/intro.xhtml Thu Sep 24 16:06:08 2015
@@ -25,4 +25,6 @@
<tc:out escape="false" value="#{overviewBundle.intro_text}"/>
+ <tc:out value="#{overviewBundle.notTranslated}"/>
+
</ui:composition>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/layout/overview.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/layout/overview.xhtml?rev=1705092&r1=1705091&r2=1705092&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/layout/overview.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/layout/overview.xhtml Thu Sep 24 16:06:08 2015
@@ -43,7 +43,7 @@
<ui:include src="/navigation.xhtml"/>
</tc:panel>
- <tc:flexLayout rows="auto;*;auto">
+ <tc:flexLayout rows="auto;*">
<tc:messages orderBy="severity"/>
@@ -51,8 +51,6 @@
<ui:insert/>
</tc:box>
- <ui:include src="/footer.xhtml"/>
-
</tc:flexLayout>
</tc:flexLayout>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml?rev=1705092&r1=1705091&r2=1705092&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml Thu Sep 24 16:06:08 2015
@@ -76,22 +76,39 @@
<tc:command omit="true" label="Locale: #{clientConfigController.localizedLocale}"/>
<tc:command omit="true" label="Project Stage: #{tobagoContext.tobagoConfig.projectStage}"/>
<tc:command omit="true" label="CSP mode: #{tobagoContext.tobagoConfig.contentSecurityPolicy.mode}"/>
- <tc:command omit="true" label="Requests: #{activityList.values[0].jsfRequest} / AJAX: #{activityList.values[0].ajaxRequest}"/>
+ <tc:command omit="true"
+ label="Requests: #{activityList.values[0].jsfRequest} / AJAX: #{activityList.values[0].ajaxRequest}"/>
</tc:command>
</tc:commandGroup>
</tc:form>
- <tc:form>
- <tc:flowLayout>
- <tc:style textAlign="right"/>
+ <tc:flowLayout>
+ <tc:style textAlign="right"/>
+ <tc:form>
<tc:in placeholder="Search"/>
<tc:button defaultCommand="true" omit="true" label="go">
<tc:dataAttribute name="alert-text"
value="Sorry: Search not implemented"/>
</tc:button>
- </tc:flowLayout>
- </tc:form>
+ </tc:form>
+ <tc:form>
+ <tc:button immediate="true" id="previous"
+ image="glyphicon-chevron-left"
+ action="#{navigationState.gotoPrevious}"
+ disabled="#{navigationState.first}"
+ tip="#{overviewBundle.footer_previous}"/>
+ <tc:button immediate="true" id="next"
+ image="glyphicon-chevron-right"
+ action="#{navigationState.gotoNext}"
+ disabled="#{navigationState.last}"
+ tip="#{overviewBundle.footer_next}"/>
+ <tc:button action="#{navigationTree.viewSource}"
+ image="glyphicon-eye-open"
+ immediate="true" tip="#{overviewBundle.footer_viewSource}"
+ target="Source Viewer" transition="false"/>
+ </tc:form>
+ </tc:flowLayout>
</tc:nav>