myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r1738905 - /myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/intro.xhtml
Date Wed, 13 Apr 2016 07:52:28 GMT
Author: lofwyr
Date: Wed Apr 13 07:52:28 2016
New Revision: 1738905

URL: http://svn.apache.org/viewvc?rev=1738905&view=rev
Log:
revert: TOBAGO-1544: Revise Demo Application for Tobago 3.0
was commited by fault

Modified:
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/intro.xhtml

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/10-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/10-intro/intro.xhtml?rev=1738905&r1=1738904&r2=1738905&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/intro.xhtml
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/intro.xhtml
Wed Apr 13 07:52:28 2016
@@ -17,22 +17,136 @@
  * limitations under the License.
 -->
 
-<ui:composition template="/plain.xhtml"
+<ui:composition template="/main.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="#{overviewBundle.intro}"/>
 
+  <tc:out escape="false" value="#{overviewBundle.intro_text}" id="text"/>
+
+  <tc:out value="#{overviewBundle.notTranslated}" id="nt" />
+
   <tc:section label="Some short examples (Todo: revise)">
 
-    <tc:in value="#{overviewController.suggestInput}" tabIndex="3" id="suggest_input"
-           label="#{overviewBundle.basic_suggestLabel}" tip="#{overviewBundle.basic_suggestTip}"
-           placeholder="Country (Language)">
-      <tc:suggest suggestMethod="#{overviewController.getInputSuggestItems}"
-                  id="suggest" delay="300" minimumCharacters="1" maximumItems="10"/>
+    <f:facet name="layout">
+      <tc:gridLayout rows="auto;2*;3*;auto;2*;2*;auto;2*;2*"/>
+      <!--<tc:gridLayout border="0" rows="*;*;*;*;*;*;*;*;*;*"/>-->
+    </f:facet>
+
+    <!-- row -->
+    <tc:separator label="#{overviewBundle.basic_sampleInputTitle}"/>
+
+    <!-- row -->
+    <tc:out escape="false" value="#{overviewBundle.basic_text_input}" id="basic_text_input"/>
+
+    <!-- row -->
+    <tc:panel>
+      <f:facet name="layout">
+        <tc:gridLayout columns="*;*"/>
+      </f:facet>
+
+      <tc:panel>
+        <f:facet name="layout">
+          <tc:gridLayout rows="auto;auto;auto;auto"/>
+        </f:facet>
+        <tc:in value="#{overviewController.basicInput}" required="true" tabIndex="1" id="basic_input"
+               label="#{overviewBundle.basic_textboxLabel}" tip="#{overviewBundle.basic_textboxTip}"/>
+        <tc:in value="#{overviewController.suggestInput}" tabIndex="3" id="suggest_input"
+               label="#{overviewBundle.basic_suggestLabel}" tip="#{overviewBundle.basic_suggestTip}"
+               placeholder="Country (Language)">
+          <tc:suggest suggestMethod="#{overviewController.getInputSuggestItems}"
+                      id="suggest" delay="300" minimumCharacters="1" maximumItems="10"/>
+        </tc:in>
+        <tc:date value="#{overviewController.basicDate}" tabIndex="4" id="basic_date"
+                 label="#{overviewBundle.basic_dateLabel}" required="true">
+          <f:convertDateTime pattern="dd/MM/yyyy"/>
+          <tc:validateSubmittedValueLength maximum="10"/>
+        </tc:date>
+        <tc:date label="#{overviewBundle.basic_timeLabel}" tabIndex="5" id="basic_time"
+                 value="#{overviewController.basicTime}">
+          <f:convertDateTime pattern="HH:mm" timeZone="CET"/>
+        </tc:date>
+        <tc:in value="#{overviewController.placeholder}" tabIndex="6" id="basic_placeholder"
+               label="Placeholder" placeholder="Search..."/>
+      </tc:panel>
+
+      <tc:textarea value="#{overviewController.basicArea}" tabIndex="2" tip="max length
= 1000"
+                   label="#{overviewBundle.basic_textareaLabel}">
+        <f:validateLength maximum="1000"/>
+      </tc:textarea>
+    </tc:panel>
+
+    <!-- row -->
+    <tc:separator label="#{overviewBundle.basic_sampleSelectTitle}"/>
+
+    <!-- row -->
+    <tc:out escape="false" value="#{overviewBundle.basic_text_select}"/>
+
+    <!-- row -->
+    <tc:panel>
+      <f:facet name="layout">
+        <tc:gridLayout columns="*;*" border="0"/>
+      </f:facet>
+      <tc:selectOneRadio label="Select One" value="#{overviewController.radioValue}" id="rg0">
+        <tc:selectItems value="#{overviewController.currencyItems}" id="items0"
+                        var="currency" itemValue="#{currency.currencyCode}" itemLabel="#{currency.displayName}"
+                        itemImage="data/#{currency.currencyCode}-14.png"/>
+        <!-- images come from tobago-example-data -->
+        <!--
+                <f:facet name="click">
+                  <tc:command/>
+                </f:facet>
+        -->
+      </tc:selectOneRadio>
+
+      <tc:panel>
+        <f:facet name="layout">
+          <tc:gridLayout rows="auto;auto"/>
+        </f:facet>
+        <tc:selectManyCheckbox label="Select Many" value="#{overviewController.multiValue}"
+                               id="cbg0" renderRange="1-2" converter="salutationId">
+          <f:selectItems value="#{overviewController.items}" id="itemsg0"/>
+        </tc:selectManyCheckbox>
+        <tc:selectOneChoice label="Select One Choice" value="#{overviewController.singleValue}"
+                            converter="salutationId">
+          <f:selectItems value="#{overviewController.items}"/>
+        </tc:selectOneChoice>
+      </tc:panel>
+    </tc:panel>
+
+    <!-- row -->
+    <tc:separator label="#{overviewBundle.basic_sampleLinkTitle}"/>
+
+    <!-- row -->
+    <tc:out escape="false" value="#{overviewBundle.basic_text_action}"/>
+
+    <!-- row -->
+    <tc:flowLayout>
+      <tc:link id="link"
+               actionListener="#{overviewController.click}"
+               label="#{overviewBundle.basic_linkAction}"/>
+      <tc:link id="image"
+               actionListener="#{overviewController.click}"
+               image="image/image_button.png"/>
+      <tc:button id="button"
+                 actionListener="#{overviewController.click}"
+                 label="#{overviewBundle.basic_buttonAction}"/>
+    </tc:flowLayout>
+
+    <!-- row -->
+    <tc:in value="#{overviewController.lastAction}" readonly="true"
+           label="#{overviewBundle.basic_lastActionLabel}">
+      <tc:gridLayoutConstraint columnSpan="5"/>
     </tc:in>
 
+    <!-- todo: deprecated -->
+    <tc:script>
+      new Tobago.AcceleratorKey(function() {Tobago.clickOnElement('page:image');}, 'O', "ctrl");
+      new Tobago.AcceleratorKey(function() {Tobago.clickOnElement('page:button');}, 'B',
"ctrl");
+    </tc:script>
+
   </tc:section>
 
 </ui:composition>



Mime
View raw message