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 2015/06/04 13:41:38 UTC
svn commit: r1683525 - in
/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag:
InRenderer.java SelectOneChoiceRenderer.java TextareaRenderer.java
Author: lofwyr
Date: Thu Jun 4 11:41:37 2015
New Revision: 1683525
URL: http://svn.apache.org/r1683525
Log:
TOBAGO-1368: Create a new theme which uses Bootstrap
- cleanup CSS class management
- fix wrong border in HTML option of selectOneChoice
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/InRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneChoiceRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TextareaRenderer.java
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/InRenderer.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/InRenderer.java?rev=1683525&r1=1683524&r2=1683525&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/InRenderer.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/InRenderer.java Thu Jun 4 11:41:37 2015
@@ -20,7 +20,6 @@
package org.apache.myfaces.tobago.renderkit.html.standard.standard.tag;
import org.apache.myfaces.tobago.component.Attributes;
-import org.apache.myfaces.tobago.component.SupportsCss;
import org.apache.myfaces.tobago.internal.component.AbstractUIIn;
import org.apache.myfaces.tobago.internal.component.AbstractUIInput;
import org.apache.myfaces.tobago.internal.util.FacesContextUtils;
@@ -28,6 +27,7 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.renderkit.InputRendererBase;
import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.css.Style;
+import org.apache.myfaces.tobago.renderkit.html.BootstrapClass;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.HtmlInputTypes;
@@ -48,15 +48,6 @@ public class InRenderer extends InputRen
private static final Logger LOG = LoggerFactory.getLogger(InRenderer.class);
@Override
- public void prepareRender(
- final FacesContext facesContext, final UIComponent component) throws IOException {
- super.prepareRender(facesContext, component);
-
- SupportsCss css = (SupportsCss) component;
- css.getCurrentCss().add("form-control");
- }
-
- @Override
public void decode(final FacesContext facesContext, final UIComponent component) {
super.decode(facesContext, component);
final String clientId = component.getClientId(facesContext);
@@ -131,7 +122,7 @@ public class InRenderer extends InputRen
writer.writeAttribute(HtmlAttributes.AUTOCOMPLETE, "off", false);
}
- writer.writeClassAttribute(Classes.create(input));
+ writer.writeClassAttribute(Classes.create(input), BootstrapClass.FORM_CONTROL);
writer.writeAttribute(HtmlAttributes.REQUIRED, required);
HtmlRendererUtils.renderFocus(id, input.isFocus(), ComponentUtils.isError(input), facesContext, writer);
writeAdditionalAttributes(facesContext, writer, input);
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/SelectOneChoiceRenderer.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/SelectOneChoiceRenderer.java?rev=1683525&r1=1683524&r2=1683525&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/SelectOneChoiceRenderer.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/SelectOneChoiceRenderer.java Thu Jun 4 11:41:37 2015
@@ -19,11 +19,11 @@
package org.apache.myfaces.tobago.renderkit.html.standard.standard.tag;
-import org.apache.myfaces.tobago.component.SupportsCss;
import org.apache.myfaces.tobago.component.UISelectOneChoice;
import org.apache.myfaces.tobago.renderkit.SelectOneRendererBase;
import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.css.Style;
+import org.apache.myfaces.tobago.renderkit.html.BootstrapClass;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
@@ -42,15 +42,6 @@ public class SelectOneChoiceRenderer ext
private static final Logger LOG = LoggerFactory.getLogger(SelectOneChoiceRenderer.class);
- @Override
- public void prepareRender(
- final FacesContext facesContext, final UIComponent component) throws IOException {
- super.prepareRender(facesContext, component);
-
- SupportsCss css = (SupportsCss) component;
- css.getCurrentCss().add("form-control");
- }
-
public boolean getRendersChildren() {
return true;
}
@@ -81,7 +72,7 @@ public class SelectOneChoiceRenderer ext
}
final Style style = new Style(facesContext, select);
writer.writeStyleAttribute(style);
- writer.writeClassAttribute(Classes.create(select));
+ writer.writeClassAttribute(Classes.create(select), BootstrapClass.FORM_CONTROL);
if (title != null) {
writer.writeAttribute(HtmlAttributes.TITLE, title, true);
}
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/TextareaRenderer.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/TextareaRenderer.java?rev=1683525&r1=1683524&r2=1683525&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/TextareaRenderer.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/TextareaRenderer.java Thu Jun 4 11:41:37 2015
@@ -20,19 +20,19 @@
package org.apache.myfaces.tobago.renderkit.html.standard.standard.tag;
import org.apache.myfaces.tobago.component.Attributes;
-import org.apache.myfaces.tobago.component.SupportsCss;
import org.apache.myfaces.tobago.component.UITextarea;
-import org.apache.myfaces.tobago.sanitizer.Sanitizer;
import org.apache.myfaces.tobago.config.TobagoConfig;
import org.apache.myfaces.tobago.renderkit.InputRendererBase;
import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.css.Style;
+import org.apache.myfaces.tobago.renderkit.html.BootstrapClass;
import org.apache.myfaces.tobago.renderkit.html.Command;
import org.apache.myfaces.tobago.renderkit.html.CommandMap;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtils;
+import org.apache.myfaces.tobago.sanitizer.Sanitizer;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import org.slf4j.Logger;
@@ -49,15 +49,6 @@ public class TextareaRenderer extends In
private static final Logger LOG = LoggerFactory.getLogger(TextareaRenderer.class);
@Override
- public void prepareRender(
- final FacesContext facesContext, final UIComponent component) throws IOException {
- super.prepareRender(facesContext, component);
-
- SupportsCss css = (SupportsCss) component;
- css.getCurrentCss().add("form-control");
- }
-
- @Override
public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
if (!(component instanceof UITextarea)) {
LOG.error("Wrong type: Need " + UITextarea.class.getName() + ", but was " + component.getClass().getName());
@@ -88,7 +79,7 @@ public class TextareaRenderer extends In
writer.writeAttribute(HtmlAttributes.TABINDEX, tabIndex);
}
- writer.writeClassAttribute(Classes.create(input));
+ writer.writeClassAttribute(Classes.create(input), BootstrapClass.FORM_CONTROL);
final Style style = new Style(facesContext, input);
writer.writeStyleAttribute(style);
final String onchange = ComponentUtils.getStringAttribute(input, Attributes.ONCHANGE);