myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From we...@apache.org
Subject svn commit: r1628380 - in /myfaces/tobago/trunk/tobago-theme: tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/ tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/...
Date Tue, 30 Sep 2014 09:22:48 GMT
Author: weber
Date: Tue Sep 30 09:22:48 2014
New Revision: 1628380

URL: http://svn.apache.org/r1628380
Log:
TOBAGO-1391 - TabGroup should allow a icon in front of tab label: suppress image tag without
src value

Modified:
    myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/tobago.css
    myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabGroupRenderer.java

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/tobago.css
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/style/tobago.css?rev=1628380&r1=1628379&r2=1628380&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/tobago.css
(original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/tobago.css
Tue Sep 30 09:22:48 2014
@@ -1244,12 +1244,14 @@ a:active.tobago-sheet-pagingLink {
 .tobago-tab-image {
   position: relative;
   top: 1px;
+  border: none;
 }
 
 .tobago-tab-image-right-margin {
   margin-right: 5px;
   position: relative;
   top: 1px;
+  border: none;
 }
 
 .tobago-tabGroup {

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabGroupRenderer.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/TabGroupRenderer.java?rev=1628380&r1=1628379&r2=1628380&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabGroupRenderer.java
(original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabGroupRenderer.java
Tue Sep 30 09:22:48 2014
@@ -230,7 +230,8 @@ public class TabGroupRenderer extends La
           }
 
           String image = tab.getImage();
-          if (image != null) {
+          // tab.getImage() resolves to empty string if el-expression resolves to null
+          if (image != null && !image.isEmpty()) {
             if (ResourceManagerUtils.isAbsoluteResource(image)) {
               // absolute Path to image : nothing to do
             } else {



Mime
View raw message