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/02/11 21:03:54 UTC
svn commit: r1659055 - in /myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html: BootstrapClass.java TobagoClass.java standard/standard/tag/MessagesRenderer.java

Author: lofwyr
Date: Wed Feb 11 20:03:54 2015
New Revision: 1659055

URL: http://svn.apache.org/r1659055
Log:
TOBAGO-1368: Create a new theme which uses Bootstrap
- tc:messages: alert box

Modified:
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/BootstrapClass.java
    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/MessagesRenderer.java

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/BootstrapClass.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/BootstrapClass.java?rev=1659055&r1=1659054&r2=1659055&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/BootstrapClass.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/BootstrapClass.java Wed Feb 11 20:03:54 2015
@@ -21,12 +21,18 @@ package org.apache.myfaces.tobago.render
 
 import org.apache.myfaces.tobago.renderkit.css.CssItem;
 
+import javax.faces.application.FacesMessage;
+
 /**
  * @since 3.0.0
  */
 public enum BootstrapClass implements CssItem {
 
   ACTIVE("active"),
+  ALERT("alert"),
+  ALERT_DANGER("alert-danger"),
+  ALERT_WARNING("alert-warning"),
+  ALERT_INFO("alert-info"),
   COLLAPSE("collapse"),
   CONTAINER("container"),
   CONTAINER_FLUID("container-fluid"),
@@ -79,4 +85,18 @@ public enum BootstrapClass implements Cs
     };
   }
 
+  public static CssItem alert(final FacesMessage.Severity severity) {
+
+    switch (severity.getOrdinal()) {
+      case 1:
+        return ALERT_INFO;
+      case 2:
+        return ALERT_WARNING;
+      case 3:
+      case 4:
+      default:
+        return ALERT_DANGER;
+    }
+  }
+
 }

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=1659055&r1=1659054&r2=1659055&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 Wed Feb 11 20:03:54 2015
@@ -28,7 +28,8 @@ import org.apache.myfaces.tobago.renderk
  */
 public enum TobagoClass implements CssItem {
 
-  POPUP("tobago-popup");
+  POPUP("tobago-popup"),
+  MESSAGES("tobago-messages");
 
   private final String name;
 

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/MessagesRenderer.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/MessagesRenderer.java?rev=1659055&r1=1659054&r2=1659055&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/MessagesRenderer.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/MessagesRenderer.java Wed Feb 11 20:03:54 2015
@@ -40,9 +40,11 @@ import org.apache.myfaces.tobago.layout.
 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.HtmlInputTypes;
+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.util.CreateComponentUtils;
@@ -81,8 +83,9 @@ public class MessagesRenderer extends La
     final List<UIMessages.Item> messageList = messages.createMessageList(facesContext);
 
     if (messageList.size() > 0) { // in ie empty span gets a height
-      writer.startElement(HtmlElements.SPAN, messages);
-      writer.writeClassAttribute(Classes.create(messages));
+      writer.startElement(HtmlElements.DIV, messages);
+      final FacesMessage.Severity maximumSeverity = FacesContext.getCurrentInstance().getMaximumSeverity();
+      writer.writeClassAttribute(TobagoClass.MESSAGES, BootstrapClass.ALERT, BootstrapClass.alert(maximumSeverity));
       HtmlRendererUtils.writeDataAttributes(facesContext, writer, messages);
       writer.writeStyleAttribute(new Style(facesContext, messages));
 
@@ -113,7 +116,7 @@ public class MessagesRenderer extends La
         ComponentUtils.findPage(facesContext, messages).setFocusId(focusId);
       }
 */
-      writer.endElement(HtmlElements.SPAN);
+      writer.endElement(HtmlElements.DIV);
       if (messages.getFor() == null) {
         final String clientId = messages.getClientId(facesContext);
         writer.startElement(HtmlElements.INPUT, null);