[Cluster-devel] conga/luci/storage portlet_cluconfig_macro

[rmccabe at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2007-10-23 15:44:38

Modified files:
	luci/storage   : portlet_cluconfig_macro 

Log message:
	get rid of the blank portal item under Volume Groups

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/portlet_cluconfig_macro.diff?cvsroot=cluster&r1=1.3&r2=1.4

--- conga/luci/storage/portlet_cluconfig_macro	2007/09/25 03:50:27	1.3
+++ conga/luci/storage/portlet_cluconfig_macro	2007/10/23 15:44:37	1.4
@@ -5,25 +5,27 @@
 	<li class="cluConfigTreeItem visualNoMarker"
 		tal:define="parent_shows_children show_children|nothing;
 					children item/children|nothing;
-					cur_item item/currentItem;"
+					cur_item item/currentItem | nothing"
 		tal:condition="python: (cur_item or parent_shows_children or children)">
 
 		<tal:level define="item_type_class python: 'type-' + item['cfg_type'];">
 			<div tal:attributes="class item_type_class">
 				<a tal:condition="cur_item"
-					tal:attributes="href item/absolute_url;
+					tal:attributes="
+						href item/absolute_url;
 						title item/Description|nothing;
-						class string: cluConfigTreeCurrentItem visualIconPadding"
-					tal:content="item/Title|nothing">Selected Item Title</a>
+						class string:cluConfigTreeCurrentItem visualIconPadding"
+					tal:content="item/Title|nothing" />
 
 				<tal:children condition="python: parent_shows_children or children">
-					<a tal:condition="not: cur_item"
-						tal:attributes="href item/absolute_url;
-							title item/Description|nothing;
-							class string: visualIconPadding;"
-						tal:content="item/Title|nothing">
-							Unselected Item Title
-					</a>
+					<tal:block condition="python:item and item.has_key('Title') and item['Title'].strip()">
+						<a tal:condition="not:cur_item"
+							tal:attributes="
+								href item/absolute_url;
+								title item/Description|nothing;
+								class string:visualIconPadding;"
+							tal:content="item/Title|nothing" />
+					</tal:block>
 				</tal:children>
 			</div>