2:52 a.m.
Author: hoang_to
Date: 2010-08-10 03:52:37 -0400 (Tue, 10 Aug 2010)
New Revision: 3789
Added:
portal/branches/branched-r3776/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UITree/background/NullItemIcon.gif
Modified:
portal/branches/branched-r3776/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UITree/Stylesheet.css
portal/branches/branched-r3776/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UITree/background/Dotted.gif
portal/branches/branched-r3776/webui/core/src/main/java/org/exoplatform/webui/core/UITree.java
Log:
Apply patch for GTNPORTAL-990
Modified:
portal/branches/branched-r3776/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UITree/Stylesheet.css
===================================================================
---
portal/branches/branched-r3776/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UITree/Stylesheet.css 2010-08-10
07:38:03 UTC (rev 3788)
+++
portal/branches/branched-r3776/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UITree/Stylesheet.css 2010-08-10
07:52:37 UTC (rev 3789)
@@ -52,7 +52,7 @@
}
.UITrees .Node {
- line-height: 18px;
+ line-height: 19px;
padding-top: 7px;
margin-left: 15px; /* orientation=lt */
margin-right: 15px; /* orientation=rt */
@@ -97,6 +97,15 @@
font-weight: bold;
color: #058ee6;
cursor: pointer;
+}
+
+.UITrees .Node .NullItemIcon {
+ padding-left: 18px; /* orientation=lt */
+ padding-right: 18px; /* orientation=rt */
+ background: url('background/NullItemIcon.gif') no-repeat 6px top; /*
orientation=lt */
+ background: url('background/NullItemIcon-rt.gif') no-repeat 98.5% top; /*
orientation=rt */
+ -webkit-background: url('background/NullItemIcon-rt.gif') no-repeat 98.2% top;
/* orientation=rt */
+ width: 100%; height: auto;
}
/** ################# Icons ###################*/
Modified:
portal/branches/branched-r3776/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UITree/background/Dotted.gif
===================================================================
(Binary files differ)
Added:
portal/branches/branched-r3776/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UITree/background/NullItemIcon.gif
===================================================================
(Binary files differ)
Property changes on:
portal/branches/branched-r3776/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UITree/background/NullItemIcon.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified:
portal/branches/branched-r3776/webui/core/src/main/java/org/exoplatform/webui/core/UITree.java
===================================================================
---
portal/branches/branched-r3776/webui/core/src/main/java/org/exoplatform/webui/core/UITree.java 2010-08-10
07:38:03 UTC (rev 3788)
+++
portal/branches/branched-r3776/webui/core/src/main/java/org/exoplatform/webui/core/UITree.java 2010-08-10
07:52:37 UTC (rev 3789)
@@ -19,6 +19,7 @@
package org.exoplatform.webui.core;
+import org.exoplatform.portal.config.model.PageNode;
import org.exoplatform.util.ReflectionUtil;
import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.commons.serialization.api.annotations.Serialized;
@@ -53,6 +54,11 @@
* The css class name to show the collapse icon
*/
private String colapseIcon = "CollapseIcon";
+
+ /**
+ * The css class name to show the null icon (item has no child)
+ */
+ private String nullItemIcon = "NullItemIcon";
/**
* The css class name to show the selected icon
@@ -265,6 +271,9 @@
iconGroup = selectedIcon;
note = " NodeSelected";
}
+ if(obj instanceof PageNode && ((PageNode)obj).getChildren().size() == 0) {
+ nodeIcon = nullItemIcon;
+ }
if (beanIconField_ != null && beanIconField_.length() > 0)
{
if (getFieldValue(obj, beanIconField_) != null)
@@ -284,11 +293,14 @@
{
builder.append(" <div
class=\"").append(nodeIcon).append("\"
onclick=\"").append(actionLink).append("\">");
}
- else
+ else if (nodeIcon.equals(colapseIcon))
{
builder.append(" <div class=\"").append(nodeIcon).append(
"\"
onclick=\"eXo.portal.UIPortalControl.collapseTree(this)").append("\">");
}
+ else {//Null item
+ builder.append(" <div
class=\"").append(nodeIcon).append("\">");
+ }
if (uiPopupMenu_ == null)
{
builder.append(" <a href=\"javascript:void(0);\"
class=\"NodeIcon ").append(iconGroup).append(note).append(