myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r1755928 [1/5] - in /myfaces/tobago/trunk/tobago-theme: tobago-theme-charlotteville/src/main/resources/META-INF/ tobago-theme-richmond/src/main/resources/META-INF/ tobago-theme-scarborough/src/main/resources/META-INF/ tobago-theme-speyside/...
Date Thu, 11 Aug 2016 10:14:25 GMT
Author: lofwyr
Date: Thu Aug 11 10:14:25 2016
New Revision: 1755928

URL: http://svn.apache.org/viewvc?rev=1755928&view=rev
Log:
TOBAGO-1588: Update Bootstrap to 4.0.0 alpha 3 (from alpha 2)

Added:
    myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/bootstrap/4.0.0-alpha.3/
    myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/bootstrap/4.0.0-alpha.3/css/
    myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/bootstrap/4.0.0-alpha.3/css/bootstrap.css
  (with props)
    myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/bootstrap/4.0.0-alpha.3/css/bootstrap.css.map
  (with props)
    myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/bootstrap/4.0.0-alpha.3/css/bootstrap.min.css
  (with props)
    myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/bootstrap/4.0.0-alpha.3/css/bootstrap.min.css.map
  (with props)
    myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/bootstrap/4.0.0-alpha.3/js/
    myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/bootstrap/4.0.0-alpha.3/js/bootstrap.js
  (with props)
    myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/bootstrap/4.0.0-alpha.3/js/bootstrap.min.js
  (with props)
Removed:
    myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/bootstrap/4.0.0-alpha.2/
Modified:
    myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-config.xml
    myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-config.xml
    myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-config.xml
    myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/tobago-config.xml
    myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java
    myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LabelLayoutRendererBase.java
    myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LabelRenderer.java
    myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
    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-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-config.xml?rev=1755928&r1=1755927&r2=1755928&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-config.xml
(original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-config.xml
Thu Aug 11 10:14:25 2016
@@ -38,8 +38,8 @@
 <!--
       <resources production="true">
         <excludes>
-          <script name="bootstrap/4.0.0-alpha.2/js/bootstrap.js"/>
-          <style name="bootstrap/4.0.0-alpha.2/css/bootstrap.css"/>
+          <script name="bootstrap/4.0.0-alpha.3/js/bootstrap.js"/>
+          <style name="bootstrap/4.0.0-alpha.3/css/bootstrap.css"/>
         </excludes>
         <script name="bootstrap-charlotteville/3.3.6/js/bootstrap.js"/>
         <style name="bootstrap-charlotteville/3.3.6/css/bootstrap.css"/>
@@ -47,8 +47,8 @@
       </resources>
       <resources production="false">
         <excludes>
-          <script name="bootstrap/4.0.0-alpha.2/js/bootstrap.js"/>
-          <style name="bootstrap/4.0.0-alpha.2/css/bootstrap.css"/>
+          <script name="bootstrap/4.0.0-alpha.3/js/bootstrap.js"/>
+          <style name="bootstrap/4.0.0-alpha.3/css/bootstrap.css"/>
         </excludes>
         <script name="bootstrap-charlotteville/3.3.6/js/bootstrap.js"/>
         <style name="bootstrap-charlotteville/3.3.6/css/bootstrap.css"/>

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-config.xml?rev=1755928&r1=1755927&r2=1755928&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-config.xml
(original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-config.xml
Thu Aug 11 10:14:25 2016
@@ -38,8 +38,8 @@
 <!--
       <resources production="true">
         <excludes>
-          <script name="bootstrap/4.0.0-alpha.2/js/bootstrap.js"/>
-          <style name="bootstrap/4.0.0-alpha.2/css/bootstrap.css"/>
+          <script name="bootstrap/4.0.0-alpha.3/js/bootstrap.js"/>
+          <style name="bootstrap/4.0.0-alpha.3/css/bootstrap.css"/>
         </excludes>
         <script name="bootstrap-richmond/3.3.6/js/bootstrap.js"/>
         <style name="bootstrap-richmond/3.3.6/css/bootstrap.css"/>
@@ -47,8 +47,8 @@
       </resources>
       <resources production="false">
         <excludes>
-          <script name="bootstrap/4.0.0-alpha.2/js/bootstrap.js"/>
-          <style name="bootstrap/4.0.0-alpha.2/css/bootstrap.css"/>
+          <script name="bootstrap/4.0.0-alpha.3/js/bootstrap.js"/>
+          <style name="bootstrap/4.0.0-alpha.3/css/bootstrap.css"/>
         </excludes>
         <script name="bootstrap-richmond/3.3.6/js/bootstrap.js"/>
         <style name="bootstrap-richmond/3.3.6/css/bootstrap.css"/>

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-config.xml?rev=1755928&r1=1755927&r2=1755928&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-config.xml
(original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-config.xml
Thu Aug 11 10:14:25 2016
@@ -38,8 +38,8 @@
 <!--
       <resources production="true">
         <excludes>
-          <script name="bootstrap/4.0.0-alpha.2/js/bootstrap.js"/>
-          <style name="bootstrap/4.0.0-alpha.2/css/bootstrap.css"/>
+          <script name="bootstrap/4.0.0-alpha.3/js/bootstrap.js"/>
+          <style name="bootstrap/4.0.0-alpha.3/css/bootstrap.css"/>
         </excludes>
         <script name="bootstrap-scarborough/3.3.6/js/bootstrap.js"/>
         <style name="bootstrap-scarborough/3.3.6/css/bootstrap.css"/>
@@ -47,8 +47,8 @@
       </resources>
       <resources production="false">
         <excludes>
-          <script name="bootstrap/4.0.0-alpha.2/js/bootstrap.js"/>
-          <style name="bootstrap/4.0.0-alpha.2/css/bootstrap.css"/>
+          <script name="bootstrap/4.0.0-alpha.3/js/bootstrap.js"/>
+          <style name="bootstrap/4.0.0-alpha.3/css/bootstrap.css"/>
         </excludes>
         <script name="bootstrap-scarborough/3.3.6/js/bootstrap.js"/>
         <style name="bootstrap-scarborough/3.3.6/css/bootstrap.css"/>

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/tobago-config.xml?rev=1755928&r1=1755927&r2=1755928&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/tobago-config.xml
(original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/tobago-config.xml
Thu Aug 11 10:14:25 2016
@@ -39,17 +39,17 @@
 <!--
       <resources production="true">
         <excludes>
-          <script name="bootstrap/4.0.0-alpha.2/js/bootstrap.js"/>
-          <style name="bootstrap/4.0.0-alpha.2/css/bootstrap.css"/>
+          <script name="bootstrap/4.0.0-alpha.3/js/bootstrap.js"/>
+          <style name="bootstrap/4.0.0-alpha.3/css/bootstrap.css"/>
         </excludes>
         <script name="bootstrap-speyside/3.3.6/js/bootstrap.js"/>
         <style name="bootstrap-speyside/3.3.6/css/bootstrap.css"/>
       </resources>
       <resources production="false">
         <excludes>
-          <script name="bootstrap/4.0.0-alpha.2/js/bootstrap.js"/>
-          <style name="bootstrap/4.0.0-alpha.2/css/bootstrap.css"/>
-          <style name="bootstrap/4.0.0-alpha.2/css/bootstrap-theme.css"/>
+          <script name="bootstrap/4.0.0-alpha.3/js/bootstrap.js"/>
+          <style name="bootstrap/4.0.0-alpha.3/css/bootstrap.css"/>
+          <style name="bootstrap/4.0.0-alpha.3/css/bootstrap-theme.css"/>
         </excludes>
         <script name="bootstrap-speyside/3.3.6/js/bootstrap.js"/>
         <style name="bootstrap-speyside/3.3.6/css/bootstrap.css"/>

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java?rev=1755928&r1=1755927&r2=1755928&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java
(original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClass.java
Thu Aug 11 10:14:25 2016
@@ -54,6 +54,7 @@ public enum BootstrapClass implements Cs
   CLOSE("close"),
   COLLAPSE("collapse"),
   COLLAPSED("collapsed"),
+  COL_FORM_LABEL("col-form-label"),
   COL_LG_1("col-lg-1"),
   COL_LG_2("col-lg-2"),
   COL_LG_3("col-lg-3"),
@@ -112,7 +113,6 @@ public enum BootstrapClass implements Cs
   DROPDOWN_TOGGLE("dropdown-toggle"),
   FADE("fade"),
   FORM_CONTROL("form-control"),
-  FORM_CONTROL_LABEL("form-control-label"),
   FORM_CONTROL_STATIC("form-control-static"),
   FORM_GROUP("form-group"),
   FORM_INLINE("form-inline"),

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LabelLayoutRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LabelLayoutRendererBase.java?rev=1755928&r1=1755927&r2=1755928&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LabelLayoutRendererBase.java
(original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LabelLayoutRendererBase.java
Thu Aug 11 10:14:25 2016
@@ -194,7 +194,7 @@ public abstract class LabelLayoutRendere
     if (StringUtils.isNotBlank(label)) {
       writer.startElement(HtmlElements.LABEL);
       writer.writeAttribute(HtmlAttributes.FOR, component.getClientId(), false);
-      writer.writeClassAttribute(TobagoClass.LABEL, BootstrapClass.FORM_CONTROL_LABEL);
+      writer.writeClassAttribute(TobagoClass.LABEL, BootstrapClass.COL_FORM_LABEL);
       if (component instanceof SupportsAccessKey) {
         LabelWithAccessKey labelWithAccessKey = new LabelWithAccessKey((SupportsAccessKey)
component);
         HtmlRendererUtils.writeLabelWithAccessKey(writer, labelWithAccessKey);

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LabelRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LabelRenderer.java?rev=1755928&r1=1755927&r2=1755928&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LabelRenderer.java
(original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LabelRenderer.java
Thu Aug 11 10:14:25 2016
@@ -74,7 +74,7 @@ public class LabelRenderer extends Rende
     writer.startElement(HtmlElements.LABEL);
     HtmlRendererUtils.writeDataAttributes(facesContext, writer, label);
     writer.writeClassAttribute(
-        Classes.create(label, correspondingMarkup), BootstrapClass.FORM_CONTROL_LABEL, label.getCustomClass());
+        Classes.create(label, correspondingMarkup), BootstrapClass.COL_FORM_LABEL, label.getCustomClass());
     writer.writeStyleAttribute(label.getStyle());
     writer.writeIdAttribute(clientId);
     if (forId != null) {

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml?rev=1755928&r1=1755927&r2=1755928&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
(original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
Thu Aug 11 10:14:25 2016
@@ -386,13 +386,13 @@
         <script name="jquery/jquery-2.2.0.js"/>
         <script name="script/contrib/jquery-ui-1.10.4.custom.js"/>
         <script name="tether/1.1.1/js/tether.js"/>
-        <script name="bootstrap/4.0.0-alpha.2/js/bootstrap.js"/>
+        <script name="bootstrap/4.0.0-alpha.3/js/bootstrap.js"/>
         <script name="moment/2.13.0/moment-with-locales.js"/>
         <script name="bootstrap-datetimepicker/4.17.37/js/bootstrap-datetimepicker.js"/>
         <script name="script/tobago.js"/>
         <script name="typeahead/0.11.1/typeahead.js"/>
         <style name="tether/1.1.1/css/tether.css"/>
-        <style name="bootstrap/4.0.0-alpha.2/css/bootstrap.css"/>
+        <style name="bootstrap/4.0.0-alpha.3/css/bootstrap.css"/>
         <style name="font-awesome/4.6.1/css/font-awesome.css"/>
         <style name="style/tobago.css"/>
         <style name="bootstrap-datetimepicker/4.17.37/css/bootstrap-datetimepicker.css"/>
@@ -401,7 +401,7 @@
         <script name="jquery/jquery-2.2.0.js"/>
         <script name="script/contrib/jquery-ui-1.10.4.custom.js"/>
         <script name="tether/1.1.1/js/tether.js"/>
-        <script name="bootstrap/4.0.0-alpha.2/js/bootstrap.js"/>
+        <script name="bootstrap/4.0.0-alpha.3/js/bootstrap.js"/>
         <script name="moment/2.13.0/moment-with-locales.js"/>
         <script name="bootstrap-datetimepicker/4.17.37/js/bootstrap-datetimepicker.js"/>
         <script name="script/tobago.js"/>
@@ -419,7 +419,7 @@
         <script name="script/tobago-utils.js"/>
         <script name="typeahead/0.11.1/typeahead.js"/>
         <style name="tether/1.1.1/css/tether.css"/>
-        <style name="bootstrap/4.0.0-alpha.2/css/bootstrap.css"/>
+        <style name="bootstrap/4.0.0-alpha.3/css/bootstrap.css"/>
         <style name="font-awesome/4.6.1/css/font-awesome.css"/>
         <style name="style/tobago.css"/>
         <style name="bootstrap-datetimepicker/4.17.37/css/bootstrap-datetimepicker.css"/>



Mime
View raw message