svn commit: r1200461 - in /myfaces/tobago/trunk/tobago-theme: tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html...

[lo...@apache.org]

Author: lofwyr
Date: Thu Nov 10 18:15:10 2011
New Revision: 1200461

URL: http://svn.apache.org/viewvc?rev=1200461&view=rev
Log:
TOBAGO-606: Layout
 - fixing height of the messages tag.

Modified:
    myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.java
    myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties
    myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties
    myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/property/tobago-theme-config.properties

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.java?rev=1200461&r1=1200460&r2=1200461&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MessagesRenderer.java Thu Nov 10 18:15:10 2011
@@ -242,18 +242,10 @@ public class MessagesRenderer extends La
   }
 
   @Override
-  public Measure getHeight(FacesContext facesContext, Configurable component) {
-    Measure measure = super.getPreferredHeight(facesContext, component);
-    UIMessages messages = (UIMessages) component;
-    int count = messages.createMessageList(facesContext).size();
-    return measure.multiply(count);
-  } 
-
-  /*@Override
   public Measure getPreferredHeight(FacesContext facesContext, Configurable component) {
     Measure measure = super.getPreferredHeight(facesContext, component);
     UIMessages messages = (UIMessages) component;
     int count = messages.createMessageList(facesContext).size();
     return measure.multiply(count);
-  }*/
+  }
 }

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties?rev=1200461&r1=1200460&r2=1200461&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties Thu Nov 10 18:15:10 2011
@@ -129,11 +129,6 @@ MenuBar.minimumHeight=19
 MenuBar.preferredHeight=19
 MenuBar.maximumHeight=19
 
-Message.messageHeight=20
-
-Messages.fixedHeight=0
-Messages.messageHeight=20
-
 Out.preferredHeight=25
 
 Page.headerHeight=0

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties?rev=1200461&r1=1200460&r2=1200461&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties Thu Nov 10 18:15:10 2011
@@ -75,6 +75,8 @@ Link.minimumHeight=14
 Link.preferredHeight=14
 Link.maximumHeight=14
 
+Messages.preferredHeight=15
+
 Out.preferredHeight=20
 
 Progress.preferredHeight=20

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/property/tobago-theme-config.properties
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/property/tobago-theme-config.properties?rev=1200461&r1=1200460&r2=1200461&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/property/tobago-theme-config.properties (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/property/tobago-theme-config.properties Thu Nov 10 18:15:10 2011
@@ -50,8 +50,7 @@ Label.css.padding-top=0
 Label.css.padding-right=0
 Label.css.padding-bottom=0
 
-Messages.preferredHeight=20
-Messages.height=20
+Messages.preferredHeight=17
 
 Page.borderLeft=0
 Page.borderTop=0