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 2016/04/29 10:17:36 UTC
svn commit: r1741571 [2/2] - in
/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main:
java/org/apache/myfaces/tobago/example/demo/
java/org/apache/myfaces/tobago/example/demo/bestpractice/ webapp/
webapp/content/10-intro/ webapp/content/20...
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/70-dataAttribute/dataAttribute.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/70-dataAttribute/dataAttribute.xhtml?rev=1741571&r1=1741570&r2=1741571&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/70-dataAttribute/dataAttribute.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/70-dataAttribute/dataAttribute.xhtml Fri Apr 29 08:17:35 2016
@@ -18,55 +18,53 @@
-->
<ui:composition template="/main.xhtml"
+ xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:f="http://java.sun.com/jsf/core">
- <ui:param name="title" value="The Data Attributes"/>
-
- <tc:script file="content/70-dataAttribute/dataAttribute.js"/>
-
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout rows="100px;*;*" columns="*;*"/>
- </f:facet>
-
- <tc:out escape="false" value="Each box contains a panel with a tc:dataAttribute.
- It contains a color code which will be used by JavaScript which is included into this page.
- <br>
- Demo: Try to click or double-click in the content area of the boxes.
- <ul>
- <li> click: get the color from the data-colored attribute and set the background-color with it.
- </li>
- <li> double-click: reset the background-color.
- </li>
- </ul>
- ">
- <tc:gridLayoutConstraint columnSpan="2"/>
- </tc:out>
-
- <tc:box label="Green">
- <tc:panel>
- <tc:dataAttribute name="color" value="#00ff00"/>
- </tc:panel>
- </tc:box>
-
- <tc:box label="Red">
- <tc:panel>
- <tc:dataAttribute name="color" value="#ff0000"/>
- </tc:panel>
- </tc:box>
-
- <tc:box label="Yellow">
- <tc:panel>
- <tc:dataAttribute name="color" value="#ffff00"/>
- </tc:panel>
- </tc:box>
-
- <tc:box label="Blue">
- <tc:panel>
- <tc:dataAttribute name="color" value="#0000ff"/>
- </tc:panel>
- </tc:box>
-
- </tc:panel>
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+ <ui:param name="title" value="#{overviewBundle.dataAttribute} <tc:dataAttribute>"/>
+ <tc:script file="content/30-concept/70-dataAttribute/dataAttribute.js"/>
+ <p>Add a data attribute to an UIComponent with <code class="language-markup"><tc:dataAttribute/></code>.
+ The data attribute is added to the parent and can be used by scripts.</p>
+ <tc:link label="Tag Library Documentation" image="image/feather-leaf.png"
+ link="#{overviewBundle.tagDocUrl}/dataAttribute.html"/>
+
+ <tc:section label="Example">
+ <p>Each box contains a panel with a data attribute.
+ It contains a color code which will be used by a JavaScript which is included into this page.
+ Click in the content area of the boxes to set up a color. Doubleclick to remove it.</p>
+ <pre><code class="language-markup"><tc:box label="Green">
+ <tc:panel>
+ <tc:style customClass="demo-data-attribute"/>
+ <tc:dataAttribute name="color" value="#00ff00"/>
+ ...</code></pre>
+ <tc:segmentLayout small="6;6">
+ <tc:box label="Green">
+ <tc:panel>
+ <tc:style customClass="demo-data-attribute"/>
+ <tc:dataAttribute name="color" value="#00ff00"/>
+ </tc:panel>
+ </tc:box>
+
+ <tc:box label="Red">
+ <tc:panel>
+ <tc:style customClass="demo-data-attribute"/>
+ <tc:dataAttribute name="color" value="#ff0000"/>
+ </tc:panel>
+ </tc:box>
+
+ <tc:box label="Yellow">
+ <tc:panel>
+ <tc:style customClass="demo-data-attribute"/>
+ <tc:dataAttribute name="color" value="#ffff00"/>
+ </tc:panel>
+ </tc:box>
+
+ <tc:box label="Blue">
+ <tc:panel>
+ <tc:style customClass="demo-data-attribute"/>
+ <tc:dataAttribute name="color" value="#0000ff"/>
+ </tc:panel>
+ </tc:box>
+ </tc:segmentLayout>
+ </tc:section>
</ui:composition>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml?rev=1741571&r1=1741570&r2=1741571&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml Fri Apr 29 08:17:35 2016
@@ -123,7 +123,7 @@
disabled="#{navigationState.last}"
tip="#{overviewBundle.footer_next}"/>
<tc:button action="#{navigationState.toggleViewSource}"
- image="fa-eye"
+ image="fa-code"
immediate="true" tip="#{overviewBundle.footer_viewSource}"/>
</tc:form>
</tc:flowLayout>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/plain.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/plain.xhtml?rev=1741571&r1=1741570&r2=1741571&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/plain.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/plain.xhtml Fri Apr 29 08:17:35 2016
@@ -24,9 +24,6 @@
<f:view locale="#{clientConfigController.locale}">
<tc:loadBundle basename="overview" var="overviewBundle"/>
<tc:page label="Test" id="page" width="1000px" height="750px">
- <f:facet name="layout">
- <tc:gridLayout/>
- </f:facet>
<ui:insert/>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/style/demo.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/style/demo.css?rev=1741571&r1=1741570&r2=1741571&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/style/demo.css (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/style/demo.css Fri Apr 29 08:17:35 2016
@@ -27,6 +27,16 @@
background-color: #2aabff;
}
+.demo-data-attribute {
+ height: 100px;
+ border: 1px solid #000000;
+ border-radius: .25rem;
+}
+
+pre, code {
+ font-size: 75%;
+}
+
/* todo: should be switchable
.comment {
display: none;
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml?rev=1741571&r1=1741570&r2=1741571&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml Fri Apr 29 08:17:35 2016
@@ -60,7 +60,7 @@
<entry key="selectManyListbox">Multiselection List</entry>
<entry key="selectManyShuttle">Shuttle List</entry>
<entry key="default_command">Default Command</entry>
- <entry key="button_link">Link</entry>
+ <entry key="button_link">Link & Button</entry>
<entry key="toolBar">Toolbar</entry>
<entry key="menu">Menubar</entry>
<entry key="container">Container</entry>
@@ -81,7 +81,8 @@
<entry key="sheet_column_event">Column Event</entry>
<entry key="sheet_dropdown">Dropdown Box</entry>
<entry key="sheet_filter">Filtering</entry>
- <entry key="sheet_header">Header</entry>
+ <entry key="sheet_static_header">Static Header</entry>
+ <entry key="sheet_multi_header">Multi Header</entry>
<entry key="sheet_tree">Column Tree</entry>
<entry key="tree">Tree Control</entry>
<entry key="tree_command_types">Command</entry>
@@ -108,6 +109,11 @@
<entry key="labeled_layout">LabeledLayout</entry>
<entry key="grid_layout">GridLayout</entry>
<entry key="format">Formatting</entry>
+ <entry key="transition">Transition</entry>
+ <entry key="for_each">For Each</entry>
+ <entry key="collapsible">Collapsible</entry>
+ <entry key="accessKey">Access Keys</entry>
+ <entry key="dataAttribute">Data Attributes</entry>
<entry key="roles">Roles</entry>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml?rev=1741571&r1=1741570&r2=1741571&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview_de.properties.xml Fri Apr 29 08:17:35 2016
@@ -41,7 +41,6 @@
<!--<entry key="bestPractice">Best Practice</entry>-->
<entry key="error">Fehlerbehandlung</entry>
- <entry key="transition">Seitenübergang</entry>
<entry key="submit">Ãbernehmen</entry>
<entry key="cancel">Abbrechen</entry>