myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r1717916 - in /myfaces/tobago/branches/tobago-3.0.x: tobago-example/tobago-example-demo/src/main/webapp/content/25-select/ tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ toba...
Date Fri, 04 Dec 2015 09:25:59 GMT
Author: lofwyr
Date: Fri Dec  4 09:25:59 2015
New Revision: 1717916

URL: http://svn.apache.org/viewvc?rev=1717916&view=rev
Log:
TOBAGO-1514: Bootstrap for SelectManyShuffle component

using Bootstrap button style

Modified:
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/25-select/select.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyShuttleRenderer.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/25-select/select.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/25-select/select.xhtml?rev=1717916&r1=1717915&r2=1717916&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/25-select/select.xhtml
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/25-select/select.xhtml
Fri Dec  4 09:25:59 2015
@@ -128,10 +128,16 @@
       <tc:selectItem itemValue="stars" itemLabel="Stars" itemDisabled="true"/>
     </tc:selectManyCheckbox>
 
-    <tc:selectManyShuttle>
+    <tc:selectManyShuttle label="Shuttle">
       <tc:selectItem itemValue="sun" itemLabel="Sun"/>
       <tc:selectItem itemValue="moon" itemLabel="Moon"/>
-      <tc:selectItem itemValue="stars" itemLabel="Stars" itemDisabled="true"/>
+      <tc:selectItem itemValue="stars" itemLabel="Stars (Disabled)" itemDisabled="true"/>
+    </tc:selectManyShuttle>
+
+    <tc:selectManyShuttle disabled="true" label="disabled">
+      <tc:selectItem itemValue="sun" itemLabel="Sun"/>
+      <tc:selectItem itemValue="moon" itemLabel="Moon"/>
+      <tc:selectItem itemValue="stars" itemLabel="Stars"/>
     </tc:selectManyShuttle>
 
     <tc:panel/>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyShuttleRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyShuttleRenderer.java?rev=1717916&r1=1717915&r2=1717916&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyShuttleRenderer.java
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyShuttleRenderer.java
Fri Dec  4 09:25:59 2015
@@ -138,7 +138,7 @@ public class SelectManyShuttleRenderer e
       final boolean disabled, final BootstrapClass icon, final int iconCount, final String
sub) throws IOException {
     writer.startElement(HtmlElements.BUTTON);
     writer.writeAttribute(HtmlAttributes.TYPE, HtmlButtonTypes.BUTTON);
-    writer.writeClassAttribute(Classes.create(component, sub));
+    writer.writeClassAttribute(Classes.create(component, sub), BootstrapClass.BTN, BootstrapClass.BTN_DEFAULT);
     writer.writeIdAttribute(component.getClientId(context) + ComponentUtils.SUB_SEPARATOR
+ sub);
     writer.writeAttribute(HtmlAttributes.DISABLED, disabled);
     for (int i = 0; i < iconCount; i++) {

Modified: myfaces/tobago/branches/tobago-3.0.x/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/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css?rev=1717916&r1=1717915&r2=1717916&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css
Fri Dec  4 09:25:59 2015
@@ -293,11 +293,11 @@ h6 > .glyphicon:first-child {
   padding: 1rem;
 }
 
-.tobago-selectManyShuttle-toolBar button {
+.tobago-selectManyShuttle-toolBar > button {
   display: block;
 }
 
-.tobago-selectManyShuttle-toolBar span:nth-child(2) {
+.tobago-selectManyShuttle-toolBar > .btn > span:nth-child(2) {
   margin-left: -0.5em;
 }
 
@@ -485,6 +485,8 @@ table.tobago-sheet-bodyTable>tbody>tr>td
 
 /*
 fixes missing space, I thinks normal Websites have a " " Space char in the source code, Tobago
not.
+
+fixme: there is a problem with the selectManyShuttle with this style.
 */
 .navbar button:nth-child(n+2),
 .navbar input:nth-child(n+2) {



Mime
View raw message