myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r1762117 - in /myfaces/tobago/trunk: tobago-example/tobago-example-demo/ tobago-example/tobago-example-demo/src/main/webapp/content/40-test/8000-sheet/10-sheet-types/ tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/...
Date Sat, 24 Sep 2016 09:07:12 GMT
Author: lofwyr
Date: Sat Sep 24 09:07:12 2016
New Revision: 1762117

URL: http://svn.apache.org/viewvc?rev=1762117&view=rev
Log:
TOBAGO 1544: Demo
* fix for empty tc:out tags in a sheet
* sheet-types test improved
[developed by hnoeth]

Modified:
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/8000-sheet/10-sheet-types/sheet-types.test.js
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/8000-sheet/10-sheet-types/sheet-types.xhtml
    myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml?rev=1762117&r1=1762116&r2=1762117&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml Sat Sep 24 09:07:12 2016
@@ -46,6 +46,31 @@
     </testResources>
     <plugins>
       <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>xml-maven-plugin</artifactId>
+        <version>1.0.1</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>validate</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <validationSets>
+            <validationSet>
+              <dir>src/main/webapp</dir>
+              <includes>
+                <include>**/*.xhtml</include>
+              </includes>
+              <excludes>
+                  <exclude>**/x-error-in-syntax.xhtml</exclude>
+              </excludes>
+            </validationSet>
+          </validationSets>
+        </configuration>
+      </plugin>
+      <plugin>
         <groupId>org.apache.myfaces.tobago</groupId>
         <artifactId>tobago-theme-plugin</artifactId>
         <executions>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/8000-sheet/10-sheet-types/sheet-types.test.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/8000-sheet/10-sheet-types/sheet-types.test.js?rev=1762117&r1=1762116&r2=1762117&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/8000-sheet/10-sheet-types/sheet-types.test.js
(original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/8000-sheet/10-sheet-types/sheet-types.test.js
Sat Sep 24 09:07:12 2016
@@ -47,7 +47,7 @@ QUnit.test("Column 4: tc:date", function
   assert.expect(4);
 
   var $column = getColumn(4);
-  testWidthHeight(assert, $column, 115, 57, 115, 38);
+  testWidthHeight(assert, $column, 160, 57, 160, 38);
 });
 
 QUnit.test("Column 5: tc:button", function(assert) {

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/8000-sheet/10-sheet-types/sheet-types.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/8000-sheet/10-sheet-types/sheet-types.xhtml?rev=1762117&r1=1762116&r2=1762117&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/8000-sheet/10-sheet-types/sheet-types.xhtml
(original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/8000-sheet/10-sheet-types/sheet-types.xhtml
Sat Sep 24 09:07:12 2016
@@ -23,12 +23,12 @@
                 xmlns:ui="http://java.sun.com/jsf/facelets">
   <ui:param name="title" value="#{overviewBundle.sheet_types}"/>
   <tc:sheet value="#{sheetController.solarList}" id="sheet" var="luminary"
-            columns="50px;70px;70px;10px;90px;115px;100px;70px;180px;90px;130px"
+            columns="50px;70px;70px;10px;90px;160px;100px;70px;180px;90px;130px"
             rows="10">
     <tc:columnSelector/>
     <tc:column label="&lt;tc:out>" id="c_out">
       <tc:out value="#{luminary.name}"/>
-    </tc:column>x
+    </tc:column>
     <tc:column label="&lt;tc:out>" align="right" id="c_out_r">
       <tc:out value="#{luminary.name}"/>
     </tc:column>
@@ -39,9 +39,7 @@
       <tc:in value="#{luminary.name}" id="in"/>
     </tc:column>
     <tc:column label="&lt;tc:date>" id="c_date">
-      <tc:date value="#{luminary.discoverYear}" converter="#{sheetController.yearConverter}">
-        <tc:style minWidth="0"/>
-      </tc:date>
+      <tc:date value="#{luminary.discoverYear}" converter="#{sheetController.yearConverter}"/>
     </tc:column>
     <tc:column label="&lt;tc:button>" id="c_button">
       <tc:button label="#{luminary.name}"/>

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css?rev=1762117&r1=1762116&r2=1762117&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css
(original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css
Sat Sep 24 09:07:12 2016
@@ -360,7 +360,7 @@ button.tobago-treeCommand:focus, button.
   display: block;
 }
 
-  /* out -------------------------------------------------------------------- */
+/* out -------------------------------------------------------------------- */
 
 .tobago-out-markup-strong {
   font-weight: bold;
@@ -375,6 +375,11 @@ button.tobago-treeCommand:focus, button.
   text-align: right;
 }
 
+/* make sure, tc:out has always the same height, no matter if value is empty */
+span.tobago-out:empty:before {
+  content: "\200b";
+}
+
 /* page ----------------------------------------------------------- */
 
 .tobago-page {



Mime
View raw message