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/09/03 13:33:02 UTC
svn commit: r1700988 - in
/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main:
java/org/apache/myfaces/tobago/renderkit/
java/org/apache/myfaces/tobago/renderkit/html/
java/org/apache/myfaces/tobago/renderkit/html/standard...
Author: lofwyr
Date: Thu Sep 3 11:33:01 2015
New Revision: 1700988
URL: http://svn.apache.org/r1700988
Log:
TOBAGO-1485: Label support of the tc-library, so the tx-tibrary will be unnecessary (and deprecated)
Added:
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java
- copied, changed from r1700846, myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.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/LabelLayoutRendererBase.java
Modified:
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/TobagoClass.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/DateRenderer.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/FileRenderer.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/HiddenRenderer.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/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/InputRendererBase.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/OutRenderer.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/SegmentLayoutRenderer.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/SelectManyCheckboxRenderer.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/SelectManyListboxRenderer.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/SelectManyShuttleRenderer.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/SelectOneListboxRenderer.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/SelectOneRadioRenderer.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/SelectOneRendererBase.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/SuggestRenderer.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
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-layout.js
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
Copied: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java (from r1700846, myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.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/SelectManyRendererBase.java?p2=myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java&p1=myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java&r1=1700846&r2=1700988&rev=1700988&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java Thu Sep 3 11:33:01 2015
@@ -20,6 +20,7 @@
package org.apache.myfaces.tobago.renderkit;
import org.apache.myfaces.tobago.internal.util.ArrayUtils;
+import org.apache.myfaces.tobago.renderkit.html.standard.standard.tag.InputRendererBase;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -28,9 +29,9 @@ import javax.el.ValueExpression;
import javax.faces.FacesException;
import javax.faces.application.ProjectStage;
import javax.faces.component.UIComponent;
+import javax.faces.component.UIInput;
import javax.faces.component.UISelectItem;
import javax.faces.component.UISelectItems;
-import javax.faces.component.UIInput;
import javax.faces.component.UISelectMany;
import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
@@ -53,7 +54,7 @@ import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
-public class SelectManyRendererBase extends LayoutComponentRendererBase {
+public abstract class SelectManyRendererBase extends InputRendererBase {
private static final Logger LOG = LoggerFactory.getLogger(SelectManyRendererBase.class);
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/TobagoClass.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/TobagoClass.java?rev=1700988&r1=1700987&r2=1700988&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/TobagoClass.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/TobagoClass.java Thu Sep 3 11:33:01 2015
@@ -28,6 +28,8 @@ import org.apache.myfaces.tobago.renderk
*/
public enum TobagoClass implements CssItem {
+ FLEX_LAYOUT("tobago-flexLayout"),
+ LABEL("tobago-label"),
MESSAGES("tobago-messages"),
PANEL("tobago-panel"),
POPUP("tobago-popup");
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/DateRenderer.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/DateRenderer.java?rev=1700988&r1=1700987&r2=1700988&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/DateRenderer.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/DateRenderer.java Thu Sep 3 11:33:01 2015
@@ -66,11 +66,8 @@ public class DateRenderer extends InRend
}
@Override
- public void encodeBegin(FacesContext facesContext, UIComponent component) throws IOException {
-
- final AbstractUIDate date = (AbstractUIDate) component;
+ protected void encodeBeginField(FacesContext facesContext, UIComponent component) throws IOException {
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- final String pattern = date.getPattern();
writer.startElement(HtmlElements.DIV, null);
writer.writeClassAttribute(TobagoClass.PANEL);
@@ -78,7 +75,17 @@ public class DateRenderer extends InRend
writer.startElement(HtmlElements.DIV, null);
writer.writeClassAttribute(BootstrapClass.INPUT_GROUP);
- super.encodeBegin(facesContext, component);
+ super.encodeBeginField(facesContext, component);
+ }
+
+ @Override
+ public void encodeEndField(FacesContext facesContext, UIComponent component) throws IOException {
+
+ super.encodeEndField(facesContext, component);
+
+ final AbstractUIDate date = (AbstractUIDate) component;
+ final String pattern = date.getPattern();
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
writer.startElement(HtmlElements.SPAN, null);
writer.writeClassAttribute(BootstrapClass.INPUT_GROUP_BTN);
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/FileRenderer.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/FileRenderer.java?rev=1700988&r1=1700987&r2=1700988&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/FileRenderer.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/FileRenderer.java Thu Sep 3 11:33:01 2015
@@ -91,7 +91,7 @@ public class FileRenderer extends InputR
}
}
- public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
+ protected void encodeBeginField(FacesContext facesContext, UIComponent component) throws IOException {
final AbstractUIFile file = (AbstractUIFile) component;
final String clientId = file.getClientId(facesContext);
@@ -133,8 +133,11 @@ public class FileRenderer extends InputR
if (title != null) {
writer.writeAttribute(HtmlAttributes.TITLE, title, true);
}
- writer.endElement(HtmlElements.INPUT);
+ }
+ protected void encodeEndField(FacesContext facesContext, UIComponent component) throws IOException {
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ writer.endElement(HtmlElements.INPUT);
writer.endElement(HtmlElements.DIV);
}
}
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/HiddenRenderer.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/HiddenRenderer.java?rev=1700988&r1=1700987&r2=1700988&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/HiddenRenderer.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/HiddenRenderer.java Thu Sep 3 11:33:01 2015
@@ -36,7 +36,7 @@ import java.io.IOException;
// TODO: Its not nice, that the base class use layout
public class HiddenRenderer extends InputRendererBase {
- public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
+ protected void encodeBeginField(FacesContext facesContext, UIComponent component) throws IOException {
final String clientId = component.getClientId(facesContext);
final String value = RenderUtils.currentValue(component);
@@ -57,6 +57,10 @@ public class HiddenRenderer extends Inpu
writer.writeIdAttribute(clientId);
HtmlRendererUtils.writeDataAttributes(facesContext, writer, component);
writer.writeAttribute(HtmlAttributes.VALUE, value != null ? value : "", true);
+ }
+
+ protected void encodeEndField(FacesContext facesContext, UIComponent component) throws IOException {
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
writer.endElement(HtmlElements.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/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=1700988&r1=1700987&r2=1700988&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 Sep 3 11:33:01 2015
@@ -55,9 +55,8 @@ public class InRenderer extends InputRen
}
}
- @Override
- public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
-
+ protected void encodeBeginField(FacesContext facesContext, UIComponent component)
+ throws IOException {
final AbstractUIInput input = (AbstractUIInput) component;
final String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, input);
final String currentValue = getCurrentValue(facesContext, input);
@@ -121,6 +120,10 @@ public class InRenderer extends InputRen
HtmlRendererUtils.renderFocus(id, input.isFocus(), ComponentUtils.isError(input), facesContext, writer);
writeAdditionalAttributes(facesContext, writer, input);
HtmlRendererUtils.renderCommandFacet(input, facesContext, writer);
+ }
+
+ protected void encodeEndField(FacesContext facesContext, UIComponent component) throws IOException {
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
writer.endElement(HtmlElements.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/InputRendererBase.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/InputRendererBase.java?rev=1700988&r1=1700987&r2=1700988&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/InputRendererBase.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/InputRendererBase.java Thu Sep 3 11:33:01 2015
@@ -23,7 +23,6 @@ import org.apache.myfaces.tobago.compone
import org.apache.myfaces.tobago.component.UITextarea;
import org.apache.myfaces.tobago.config.TobagoConfig;
import org.apache.myfaces.tobago.internal.util.StringUtils;
-import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
import org.apache.myfaces.tobago.sanitizer.Sanitizer;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.slf4j.Logger;
@@ -34,7 +33,7 @@ import javax.faces.component.UIInput;
import javax.faces.context.FacesContext;
import java.util.Map;
-public class InputRendererBase extends LayoutComponentRendererBase {
+public abstract class InputRendererBase extends LabelLayoutRendererBase {
private static final Logger LOG = LoggerFactory.getLogger(InputRendererBase.class);
Added: myfaces/tobago/branches/tobago-3.0.x/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/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LabelLayoutRendererBase.java?rev=1700988&view=auto
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LabelLayoutRendererBase.java (added)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LabelLayoutRendererBase.java Thu Sep 3 11:33:01 2015
@@ -0,0 +1,153 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.myfaces.tobago.renderkit.html.standard.standard.tag;
+
+import org.apache.myfaces.tobago.component.Attributes;
+import org.apache.myfaces.tobago.component.LabelLayout;
+import org.apache.myfaces.tobago.component.SupportsLabelLayout;
+import org.apache.myfaces.tobago.internal.util.StringUtils;
+import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
+import org.apache.myfaces.tobago.renderkit.css.CssItem;
+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.TobagoClass;
+import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
+import org.apache.myfaces.tobago.util.ComponentUtils;
+import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import java.io.IOException;
+
+/**
+ * Manages the rendering of the <b>label</b> and the <b>field</b> together with different possibilities for
+ * the position of the label (defined by {@link org.apache.myfaces.tobago.component.Attributes.LABEL_LAYOUT}
+ */
+public abstract class LabelLayoutRendererBase extends LayoutComponentRendererBase {
+
+ @Override
+ public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
+ encodeBeginSurrounding(facesContext, component);
+ encodeBeginField(facesContext, component);
+ }
+
+ @Override
+ public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
+ encodeEndField(facesContext, component);
+ encodeEndSurrounding(facesContext, component);
+ }
+
+ protected abstract void encodeBeginField(FacesContext facesContext, UIComponent component) throws IOException;
+
+ protected abstract void encodeEndField(FacesContext facesContext, UIComponent component) throws IOException;
+
+ protected void encodeBeginSurrounding(final FacesContext facesContext, final UIComponent component)
+ throws IOException {
+
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+
+ // possible values:
+ // - none
+ // - flexLeft (default)
+ // - flexRight
+ // - top
+ // - segmentLeft (todo)
+ // - segmentRight (todo)
+ // - flowLeft (todo)
+ // - flowRight (todo)
+ final LabelLayout labelLayout = ((SupportsLabelLayout) component).getLabelLayout();
+ final CssItem divClass;
+ switch (labelLayout) {
+ case flexLeft:
+ case flexRight:
+ divClass = TobagoClass.FLEX_LAYOUT;
+ break;
+ default: // none, top, segmentLeft, segmentRight, flowLeft, flowRight
+ divClass = null;
+ }
+
+// if (labelLayout != LabelLayout.none) {
+ writer.startElement(HtmlElements.DIV, component);
+// }
+// writer.writeClassAttribute(divClass, BootstrapClass.maximumSeverity(component));
+ // todo: check if BootstrapClass.FORM_GROUP is needed, I've removed it, because of it's margin-bottom: 15px;
+ // todo: so we lost too much space
+ // todo: without it, e. g. an input field in the header will not be layouted correctly
+ writer.writeClassAttribute(divClass, BootstrapClass.FORM_GROUP, BootstrapClass.maximumSeverity(component));
+ switch (labelLayout) {
+ case flexLeft:
+ // todo: const, utils, etc.
+ writer.writeAttribute("data-tobago-layout", "{\"columns\":[\"auto\",1]}", true);
+ break;
+ case flexRight:
+ // todo: const, utils, etc.
+ writer.writeAttribute("data-tobago-layout", "{\"columns\":[1,\"auto\"]}", true);
+ break;
+ default:
+ // nothing to do
+ }
+
+ switch (labelLayout) {
+ case none:
+ case flexRight:
+ case segmentRight:
+ case flowRight:
+ break;
+ default:
+ encodeLabel(component, writer, labelLayout);
+ }
+ }
+
+ protected void encodeEndSurrounding(final FacesContext facesContext, final UIComponent component) throws IOException {
+
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final LabelLayout labelLayout = ((SupportsLabelLayout) component).getLabelLayout();
+
+ switch (labelLayout) {
+ case flexRight:
+ case segmentRight:
+ case flowRight:
+ encodeLabel(component, writer, labelLayout);
+ break;
+ default:
+ // nothing to do
+ }
+
+// if (labelLayout != LabelLayout.none) {
+ writer.endElement(HtmlElements.DIV);
+// }
+ }
+
+ protected void encodeLabel(UIComponent component, TobagoResponseWriter writer, LabelLayout labelLayout)
+ throws IOException {
+ // TBD: maybe use an interface for getLabel()
+ final String label = ComponentUtils.getStringAttribute(component, Attributes.LABEL);
+ if (StringUtils.isNotBlank(label)) {
+ writer.startElement(HtmlElements.LABEL, component);
+ writer.writeAttribute(HtmlAttributes.FOR, component.getClientId(), false);
+ writer.writeClassAttribute(TobagoClass.LABEL);
+ // todo: label with accesskey
+ writer.writeText(label);
+ writer.endElement(HtmlElements.LABEL);
+ }
+ }
+
+}
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/OutRenderer.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/OutRenderer.java?rev=1700988&r1=1700987&r2=1700988&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/OutRenderer.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/OutRenderer.java Thu Sep 3 11:33:01 2015
@@ -20,16 +20,15 @@
package org.apache.myfaces.tobago.renderkit.html.standard.standard.tag;
import org.apache.myfaces.tobago.component.UIOut;
-import org.apache.myfaces.tobago.renderkit.html.BootstrapClass;
-import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
-import org.apache.myfaces.tobago.sanitizer.Sanitizer;
import org.apache.myfaces.tobago.config.TobagoConfig;
-import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
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;
import org.apache.myfaces.tobago.renderkit.util.RenderUtils;
+import org.apache.myfaces.tobago.sanitizer.Sanitizer;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import javax.faces.component.UIComponent;
@@ -37,10 +36,10 @@ import javax.faces.context.FacesContext;
import java.io.IOException;
import java.util.StringTokenizer;
-public class OutRenderer extends LayoutComponentRendererBase {
+public class OutRenderer extends LabelLayoutRendererBase {
@Override
- public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
+ public void encodeBeginField(final FacesContext facesContext, final UIComponent component) throws IOException {
final UIOut out = (UIOut) component;
@@ -85,6 +84,15 @@ public class OutRenderer extends LayoutC
}
writer.write(text);
}
+ }
+
+ @Override
+ public void encodeEndField(final FacesContext facesContext, final UIComponent component) throws IOException {
+
+ final UIOut out = (UIOut) component;
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ final boolean createSpan = out.isCreateSpan();
+
if (createSpan) {
writer.endElement(HtmlElements.P);
}
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/SegmentLayoutRenderer.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/SegmentLayoutRenderer.java?rev=1700988&r1=1700987&r2=1700988&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/SegmentLayoutRenderer.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/SegmentLayoutRenderer.java Thu Sep 3 11:33:01 2015
@@ -42,7 +42,7 @@ import java.io.IOException;
import java.util.List;
/**
- * Renders the 12 columns layout.
+ * Renders the 12 columns grid layout.
*/
public class SegmentLayoutRenderer extends RendererBase {
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/SelectManyCheckboxRenderer.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/SelectManyCheckboxRenderer.java?rev=1700988&r1=1700987&r2=1700988&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/SelectManyCheckboxRenderer.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/SelectManyCheckboxRenderer.java Thu Sep 3 11:33:01 2015
@@ -52,7 +52,8 @@ public class SelectManyCheckboxRenderer
}
}
- public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
+ @Override
+ public void encodeBeginField(final FacesContext facesContext, final UIComponent component) throws IOException {
final UISelectManyCheckbox select = (UISelectManyCheckbox) component;
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
@@ -122,8 +123,12 @@ public class SelectManyCheckboxRenderer
writer.endElement(HtmlElements.LABEL);
writer.endElement(HtmlElements.LI);
}
- writer.endElement(HtmlElements.OL);
+ }
+ @Override
+ public void encodeEndField(final FacesContext facesContext, final UIComponent component) throws IOException {
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ writer.endElement(HtmlElements.OL);
}
@Override
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/SelectManyListboxRenderer.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/SelectManyListboxRenderer.java?rev=1700988&r1=1700987&r2=1700988&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/SelectManyListboxRenderer.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/SelectManyListboxRenderer.java Thu Sep 3 11:33:01 2015
@@ -30,8 +30,6 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.util.SelectItemUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -40,13 +38,12 @@ import java.io.IOException;
public class SelectManyListboxRenderer extends SelectManyRendererBase {
- private static final Logger LOG = LoggerFactory.getLogger(SelectManyListboxRenderer.class);
-
public boolean getRendersChildren() {
return true;
}
- public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
+ @Override
+ public void encodeBeginField(final FacesContext facesContext, final UIComponent component) throws IOException {
final UISelectManyListbox select = (UISelectManyListbox) component;
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
@@ -78,10 +75,13 @@ public class SelectManyListboxRenderer e
HtmlRendererUtils.renderCommandFacet(select, facesContext, writer);
final Object[] values = select.getSelectedValues();
final String[] submittedValues = getSubmittedValues(select);
+
HtmlRendererUtils.renderSelectItems(select, items, values, submittedValues, writer, facesContext);
+ }
+ @Override
+ public void encodeEndField(final FacesContext facesContext, final UIComponent component) throws IOException {
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
writer.endElement(HtmlElements.SELECT);
}
-
}
-
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=1700988&r1=1700987&r2=1700988&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 Thu Sep 3 11:33:01 2015
@@ -39,7 +39,7 @@ import java.io.IOException;
public class SelectManyShuttleRenderer extends SelectManyRendererBase {
@Override
- public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
+ public void encodeBeginField(final FacesContext facesContext, final UIComponent component) throws IOException {
final UISelectManyShuttle select = (UISelectManyShuttle) component;
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
writer.startElement(HtmlElements.DIV, select);
@@ -125,7 +125,11 @@ public class SelectManyShuttleRenderer e
HtmlRendererUtils.renderSelectItems(select, items, values, submittedValues, writer, facesContext);
writer.endElement(HtmlElements.SELECT);
+ }
+ @Override
+ public void encodeEndField(final FacesContext facesContext, final UIComponent component) throws IOException {
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
writer.endElement(HtmlElements.DIV);
}
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=1700988&r1=1700987&r2=1700988&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 Sep 3 11:33:01 2015
@@ -29,8 +29,6 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.util.SelectItemUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -39,13 +37,11 @@ import java.io.IOException;
public class SelectOneChoiceRenderer extends SelectOneRendererBase {
- private static final Logger LOG = LoggerFactory.getLogger(SelectOneChoiceRenderer.class);
-
public boolean getRendersChildren() {
return true;
}
- public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
+ protected void encodeBeginField(FacesContext facesContext, UIComponent component) throws IOException {
final UISelectOneChoice select = (UISelectOneChoice) component;
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
@@ -69,13 +65,16 @@ public class SelectOneChoiceRenderer ext
if (title != null) {
writer.writeAttribute(HtmlAttributes.TITLE, title, true);
}
- HtmlRendererUtils.renderCommandFacet(select, facesContext , writer);
+ HtmlRendererUtils.renderCommandFacet(select, facesContext, writer);
HtmlRendererUtils.renderFocus(id, select.isFocus(), ComponentUtils.isError(select), facesContext, writer);
-
+
HtmlRendererUtils.renderSelectItems(select, items, select.getValue(), (String) select.getSubmittedValue(), writer,
facesContext);
+ }
+
+ protected void encodeEndField(FacesContext facesContext, UIComponent component) throws IOException {
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
writer.endElement(HtmlElements.SELECT);
- super.encodeEnd(facesContext, select);
}
}
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/SelectOneListboxRenderer.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/SelectOneListboxRenderer.java?rev=1700988&r1=1700987&r2=1700988&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/SelectOneListboxRenderer.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/SelectOneListboxRenderer.java Thu Sep 3 11:33:01 2015
@@ -29,8 +29,6 @@ import org.apache.myfaces.tobago.renderk
import org.apache.myfaces.tobago.renderkit.util.SelectItemUtils;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -39,13 +37,11 @@ import java.io.IOException;
public class SelectOneListboxRenderer extends SelectOneRendererBase {
- private static final Logger LOG = LoggerFactory.getLogger(SelectOneListboxRenderer.class);
-
public boolean getRendersChildren() {
return true;
}
- public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
+ public void encodeBeginField(final FacesContext facesContext, final UIComponent component) throws IOException {
final UISelectOneListbox select = (UISelectOneListbox) component;
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
@@ -78,9 +74,10 @@ public class SelectOneListboxRenderer ex
HtmlRendererUtils.renderSelectItems(select, items, select.getValue(), (String) select.getSubmittedValue(),
writer, facesContext);
- writer.endElement(HtmlElements.SELECT);
- super.encodeEnd(facesContext, select);
}
+ protected void encodeEndField(FacesContext facesContext, UIComponent component) throws IOException {
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ writer.endElement(HtmlElements.SELECT);
+ }
}
-
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/SelectOneRadioRenderer.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/SelectOneRadioRenderer.java?rev=1700988&r1=1700987&r2=1700988&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/SelectOneRadioRenderer.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/SelectOneRadioRenderer.java Thu Sep 3 11:33:01 2015
@@ -53,7 +53,7 @@ public class SelectOneRadioRenderer exte
}
}
- public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
+ protected void encodeBeginField(FacesContext facesContext, UIComponent component) throws IOException {
final UISelectOneRadio select = (UISelectOneRadio) component;
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
@@ -137,8 +137,11 @@ public class SelectOneRadioRenderer exte
writer.endElement(HtmlElements.LABEL);
writer.endElement(HtmlElements.LI);
}
- writer.endElement(HtmlElements.OL);
+ }
+ protected void encodeEndField(FacesContext facesContext, UIComponent component) throws IOException {
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ writer.endElement(HtmlElements.OL);
}
@Override
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/SelectOneRendererBase.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/SelectOneRendererBase.java?rev=1700988&r1=1700987&r2=1700988&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/SelectOneRendererBase.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/SelectOneRendererBase.java Thu Sep 3 11:33:01 2015
@@ -19,9 +19,9 @@
package org.apache.myfaces.tobago.renderkit.html.standard.standard.tag;
+import org.apache.myfaces.tobago.util.ComponentUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.myfaces.tobago.util.ComponentUtils;
import javax.faces.component.UIComponent;
import javax.faces.component.UISelectOne;
@@ -47,6 +47,4 @@ public abstract class SelectOneRendererB
uiSelectOne.setSubmittedValue(newValue);
}
}
-
}
-
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/SuggestRenderer.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/SuggestRenderer.java?rev=1700988&r1=1700987&r2=1700988&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/SuggestRenderer.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/SuggestRenderer.java Thu Sep 3 11:33:01 2015
@@ -24,6 +24,7 @@ import org.apache.myfaces.tobago.compone
import org.apache.myfaces.tobago.context.ResourceManagerUtils;
import org.apache.myfaces.tobago.model.AutoSuggestItem;
import org.apache.myfaces.tobago.model.AutoSuggestItems;
+import org.apache.myfaces.tobago.renderkit.RendererBase;
import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.html.DataAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
@@ -39,7 +40,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-public class SuggestRenderer extends InputRendererBase {
+public class SuggestRenderer extends RendererBase {
@Override
public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
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=1700988&r1=1700987&r2=1700988&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 Sep 3 11:33:01 2015
@@ -45,7 +45,7 @@ public class TextareaRenderer extends In
private static final Logger LOG = LoggerFactory.getLogger(TextareaRenderer.class);
@Override
- public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
+ public void encodeBeginField(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());
return;
@@ -120,11 +120,11 @@ public class TextareaRenderer extends In
}
writer.writeText(currentValue);
}
- writer.endElement(HtmlElements.TEXTAREA);
- /*if (placeholder != null && !VariableResolverUtils.resolveClientProperties(facesContext)
- .getUserAgent().hasCapability(Capability.PLACEHOLDER)) {
- HtmlRendererUtils.createPlaceholderDiv(input, currentValue, placeholder, style, writer);
- }*/
+ }
+ @Override
+ protected void encodeEndField(FacesContext facesContext, UIComponent component) throws IOException {
+ final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
+ writer.endElement(HtmlElements.TEXTAREA);
}
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml?rev=1700988&r1=1700987&r2=1700988&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml Thu Sep 3 11:33:01 2015
@@ -395,19 +395,20 @@
<script name="script/contrib/jquery-1.11.1.js"/>
<script name="script/contrib/jquery-ui-1.10.4.custom.js"/>
<script name="script/contrib/jquery-ui-timepicker-addon-1.4.5.js"/>
- <script name="script/tobago.js"/>
<script name="bootstrap/3.3.5/js/bootstrap.js"/>
+ <script name="script/tobago.js"/>
<script name="typeahead/0.11.1/typeahead.js"/>
<style name="style/contrib/ui-lightness/jquery-ui-1.10.4.custom.css"/>
<style name="style/contrib/jquery-ui-timepicker-addon-1.4.5.css"/>
- <style name="style/tobago.css"/>
<style name="bootstrap/3.3.5/css/bootstrap.css"/>
<style name="bootstrap/3.3.5/css/bootstrap-theme.css"/>
+ <style name="style/tobago.css"/>
</resources>
<resources production="false">
<script name="script/contrib/jquery-1.11.1.js"/>
<script name="script/contrib/jquery-ui-1.10.4.custom.js"/>
<script name="script/contrib/jquery-ui-timepicker-addon-1.4.5.js"/>
+ <script name="bootstrap/3.3.5/js/bootstrap.js"/>
<script name="script/tobago.js"/>
<script name="script/tobago-calendar.js"/>
<script name="script/tobago-console.js"/>
@@ -422,13 +423,12 @@
<script name="script/tobago-tab.js"/>
<script name="script/tobago-tree.js"/>
<script name="script/tobago-utils.js"/>
- <script name="bootstrap/3.3.5/js/bootstrap.js"/>
<script name="typeahead/0.11.1/typeahead.js"/>
<style name="style/contrib/ui-lightness/jquery-ui-1.10.4.custom.css"/>
<style name="style/contrib/jquery-ui-timepicker-addon-1.4.5.css"/>
- <style name="style/tobago.css"/>
<style name="bootstrap/3.3.5/css/bootstrap.css"/>
<style name="bootstrap/3.3.5/css/bootstrap-theme.css"/>
+ <style name="style/tobago.css"/>
</resources>
</theme-definition>
</theme-definitions>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-layout.js
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/script/tobago-layout.js?rev=1700988&r1=1700987&r2=1700988&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/script/tobago-layout.js (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-layout.js Thu Sep 3 11:33:01 2015
@@ -48,17 +48,22 @@ function layout(table, horizontal) {
var css;
var desired;
+ var tobagoLayout = table.data("tobago-layout");
+ if (! tobagoLayout) {
+ return;
+ }
+
if (horizontal) {
// cells = table.find("tr:first>td");
banks = table.children("colgroup").children("col");
- tokens = table.data("tobago-layout").columns;
+ tokens = tobagoLayout.columns;
css = "width";
desired = table.outerWidth();
// desired = table.parent().data("tobago-style").width.replace("px", ""); // todo: data("tobago-layout") wohl doch nicht so gut...? der wert wurde ja schon berechnet...
} else {
// cells = table.find("tr");
banks = table.children("tbody").children("tr");
- tokens = table.data("tobago-layout").rows;
+ tokens = tobagoLayout.rows;
css = "height";
desired = table.outerHeight();
// desired = table.parent().data("tobago-style").height.replace("px", ""); // todo: data("tobago-layout")
@@ -142,13 +147,18 @@ function layoutFlex(container, horizonta
var tokens;
var css;
+ var tobagoLayout = container.data("tobago-layout");
+ if (! tobagoLayout) {
+ return;
+ }
+
if (horizontal) {
banks = container.children();
- tokens = container.data("tobago-layout").columns;
+ tokens = tobagoLayout.columns;
css = "width";
} else {
banks = container.children();
- tokens = container.data("tobago-layout").rows;
+ tokens = tobagoLayout.rows;
css = "height";
}
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=1700988&r1=1700987&r2=1700988&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 Thu Sep 3 11:33:01 2015
@@ -49,6 +49,9 @@
display: -webkit-flex; /* needed e.g. for Safari 8.0.2 */
display: -ms-flexbox; /* needed for IE 10 */
display: flex;
+
+ /* XXX it overrides the 15px from bootstrap .form-group, TODO: check if this is a good solution */
+ margin-bottom: 5px;
}
.tobago-flexLayout-markup-vertically {
@@ -61,6 +64,7 @@
.tobago-flexLayout > .input-group:nth-child(n+2),
.tobago-flexLayout > .tobago-out:nth-child(n+2),
.tobago-flexLayout > .tobago-panel:nth-child(n+2),
+.tobago-flexLayout > .tobago-label:nth-child(n+2),
.tobago-flexLayout > .twitter-typeahead:nth-child(n+2) {
margin-left: 5px;
}