[Wonder-cvs] SF.net SVN: wonder:[11759] branches/Wonder_2_0_0_Branch/Wonder/Common/ Frameworks/ERNeutralLook/Components/Nonlocalized.lproj

[<tc...@us...>]

Revision: 11759
          http://wonder.svn.sourceforge.net/wonder/?rev=11759&view=rev
Author:   tcripps
Date:     2010-11-30 00:42:16 +0000 (Tue, 30 Nov 2010)

Log Message:
-----------
Adding support for moving the inspect, pick, and delete widgets on list and pick list pages

Modified Paths:
--------------
    branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUListPage.wo/ERNEUListPage.html
    branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUListPage.wo/ERNEUListPage.wod
    branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUPickListPage.wo/ERNEUPickListPage.html
    branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUPickListPage.wo/ERNEUPickListPage.wod

Modified: branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUListPage.wo/ERNEUListPage.html
===================================================================
--- branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUListPage.wo/ERNEUListPage.html	2010-11-29 18:48:20 UTC (rev 11758)
+++ branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUListPage.wo/ERNEUListPage.html	2010-11-30 00:42:16 UTC (rev 11759)
@@ -38,26 +38,31 @@
 		<br />
 		<webobject name="ListTable">
 			<webobject name="ListTableHeaderRow">
-				<th>&nbsp;</th>
+				<webobject name="IfNotHasInspectActionsWidgetPropertyKey"><th>&nbsp;</th></webobject>
 				<webobject name="ColumnLabelRepetition">
 				<webobject name="IfPropertyKeyIsNotOmitted">
 				<webobject name="PropertyNameComponentGenericContainer">
-					<table>
-						<tr>
-							<th><webobject name="PropertyNameSwitchComponent"></webobject></th>
-							<td><webobject name="IsPropertySortable"><webobject name="SortOrder"></webobject></webobject></td>
-						</tr>
-					</table>
+					<webobject name="IfIsInspectActionsWidgetPropertyKey">&nbsp;</webobject>
+					<webobject name="IfIsNotInspectActionsWidgetPropertyKey">
+						<webobject name="IfIsDeleteWidgetPropertyKey">&nbsp;</webobject>
+						<webobject name="IfIsNotDeleteWidgetPropertyKey">
+						<table>
+							<tr>
+								<th><webobject name="PropertyNameSwitchComponent"></webobject></th>
+								<td><webobject name="IsPropertySortable"><webobject name="SortOrder"></webobject></webobject></td>
+							</tr>
+						</table>
+						</webobject>
+					</webobject>
 				</webobject>
-				<webobject name="ShouldDisplayDetailedPageMetrics">
-				<th scope="col" class="InlineMetrics">&nbsp;</th>
+				<webobject name="ShouldDisplayDetailedPageMetrics"><th scope="col" class="InlineMetrics">&nbsp;</th></webobject>
 				</webobject>
 				</webobject>
-				</webobject>
-				<th>&nbsp;</th>
+				<webobject name="IfNotHasDeleteWidgetPropertyKey"><th>&nbsp;</th></webobject>
 			</webobject>
 			<webobject name="EntityRepetition">
 			<webobject name="ListTableRow">
+				<webobject name="IfNotHasInspectActionsWidgetPropertyKey">
 				<td>
 					<webobject name="IsSelecting">
 						<webobject name="SelectEO"><webobject name="SelectImage"></webobject></webobject>
@@ -78,21 +83,56 @@
 						</webobject>
 					</webobject>
 				</td>
+				</webobject>
 				<webobject name="AttributeRepetition">
 				<webobject name="IfPropertyKeyIsNotOmitted">
-				<webobject name="AttributeCell"><webobject name="AttributeDisplay"></webobject></webobject>
-				<webobject name="ShouldDisplayDetailedPageMetrics">
-				<td class="InlineMetrics"><webobject name="InlineMetricsForPropertyKey"></webobject></td>
+				<webobject name="IfIsInspectActionsWidgetPropertyKey">
+					<td>
+						<webobject name="IsSelecting">
+							<webobject name="SelectEO"><webobject name="SelectImage"></webobject></webobject>
+						</webobject>
+						<webobject name="IsListing">
+							<webobject name="IsEntityWritable">
+								<webobject name="Conditional1">
+									<webobject name="ERXNonNullConditional2">
+										<webobject name="SwitchComponent2"></webobject>
+									</webobject>
+									<webobject name="ERXNonNullConditional1">
+										<webobject name="EditButton"></webobject>
+									</webobject>
+								</webobject>
+							</webobject>
+							<webobject name="IsEntityNotWritable">
+								<webobject name="InspectButton"></webobject>
+							</webobject>
+						</webobject>
+					</td>
 				</webobject>
+				<webobject name="IfIsNotInspectActionsWidgetPropertyKey">
+					<webobject name="IfIsDeleteWidgetPropertyKey">
+						<webobject name="IsListing">
+							<webobject name="IsEntityDeletable">
+								<webobject name="TrashSwitchComponent"></webobject>
+							</webobject>
+						</webobject>
+					</webobject>
+					<webobject name="IfIsNotDeleteWidgetPropertyKey">
+						<webobject name="AttributeCell"><webobject name="AttributeDisplay"></webobject></webobject>
+						<webobject name="ShouldDisplayDetailedPageMetrics">
+							<td class="InlineMetrics"><webobject name="InlineMetricsForPropertyKey"></webobject></td>
+						</webobject>
+					</webobject>
 				</webobject>
 				</webobject>
+				<webobject name="IfNotHasDeleteWidgetPropertyKey">
 				<td>
-					<webobject name="IsListing2">
-					<webobject name="IsEntityWritable2">
+					<webobject name="IsListing">
+					<webobject name="IsEntityDeletable">
 						<webobject name="TrashSwitchComponent"></webobject>
 					</webobject>
 					</webobject>
 				</td>
+				</webobject>
 			</webobject>
 			<tr>
 				<td bgcolor="#ffffff" colspan='<webobject name="ColSpanNumber"></webobject>'><img border="0" height="2" width="1" /></td>

Modified: branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUListPage.wo/ERNEUListPage.wod
===================================================================
--- branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUListPage.wo/ERNEUListPage.wod	2010-11-29 18:48:20 UTC (rev 11758)
+++ branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUListPage.wo/ERNEUListPage.wod	2010-11-30 00:42:16 UTC (rev 11759)
@@ -134,6 +134,38 @@
 	d2wContext = d2wContext;
 }
 
+IfIsDeleteWidgetPropertyKey: ERXEqualConditional {
+	value1 = d2wContext.propertyKey;
+	value2 = d2wContext.deleteWidgetPropertyKey;
+}
+
+IfIsInspectActionsWidgetPropertyKey: ERXEqualConditional {
+	value1 = d2wContext.propertyKey;
+	value2 = d2wContext.inspectActionsWidgetPropertyKey;
+}
+
+IfIsNotDeleteWidgetPropertyKey: ERXEqualConditional {
+	negate = true;
+	value1 = d2wContext.propertyKey;
+	value2 = d2wContext.deleteWidgetPropertyKey;
+}
+
+IfIsNotInspectActionsWidgetPropertyKey: ERXEqualConditional {
+	negate = true;
+	value1 = d2wContext.propertyKey;
+	value2 = d2wContext.inspectActionsWidgetPropertyKey;
+}
+
+IfNotHasDeleteWidgetPropertyKey: ERXNonNullConditional {
+	condition = d2wContext.deleteWidgetPropertyKey;
+	negate = true;
+}
+
+IfNotHasInspectActionsWidgetPropertyKey: ERXNonNullConditional {
+	condition = d2wContext.inspectActionsWidgetPropertyKey;
+	negate = true;
+}
+
 IfPropertyKeyIsNotOmitted: WOConditional {
 	condition = isKeyOmitted;
 	negate = true;
@@ -160,7 +192,7 @@
 	negate = true;
 }
 
-IsEntityWritable2: WOConditional {
+IsEntityDeletable: WOConditional {
 	_unroll = true;
 	condition = d2wContext.isEntityDeletable;
 }
@@ -179,12 +211,6 @@
 	negate = true;
 }
 
-IsListing2: WOConditional {
-	_unroll = true;
-	condition = isSelecting;
-	negate = true;
-}
-
 IsPropertySortable: WOConditional {
 	_unroll = true;
 	condition = d2wContext.propertyIsSortable;

Modified: branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUPickListPage.wo/ERNEUPickListPage.html
===================================================================
--- branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUPickListPage.wo/ERNEUPickListPage.html	2010-11-29 18:48:20 UTC (rev 11758)
+++ branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUPickListPage.wo/ERNEUPickListPage.html	2010-11-30 00:42:16 UTC (rev 11759)
@@ -20,7 +20,7 @@
 		
 			<webobject name="ListTable">
 				<webobject name="ListTableHeaderRow">
-					<th>&nbsp;</th>
+					<webobject name="IfNotHasInspectActionsWidgetPropertyKey"><th>&nbsp;</th></webobject>
 					<webobject name="ColumnLabelRepetition">
 					<webobject name="IfPropertyKeyIsNotOmitted">
 					<webobject name="PropertyNameComponentGenericContainer">
@@ -32,16 +32,15 @@
 						</table>
 					</webobject>
 					<webobject name="ShouldDisplayDetailedPageMetrics">
-					<th scope="col" class="InlineMetrics">
-						&nbsp;
-					</th>
+						<th scope="col" class="InlineMetrics">&nbsp;</th>
 					</webobject>
 					</webobject>
 					</webobject>
-					<th valign="bottom">Select</th>
+					<webobject name="IfNotHasPickWidgetPropertyKey"><th valign="bottom">Select</th></webobject>
 				</webobject>
 				<webobject name="EntityRepetition">
 				<webobject name="ListTableRow">
+					<webobject name="IfNotHasInspectActionsWidgetPropertyKey">
 					<td>
 						<webobject name="IsEntityInspectableConditional">
 							<webobject name="InspectObjectHyperlink"><webobject name="InspectImage"></webobject></webobject>
@@ -50,17 +49,35 @@
 							<webobject name="EditObjectHyperlink"><webobject name="EditImage"></webobject></webobject>
 						</webobject>
 					</td>
+					</webobject>
 					<webobject name="AttributeRepetition">
 					<webobject name="IfPropertyKeyIsNotOmitted">
-					<webobject name="AttributeCell"><webobject name="AttributeDisplay"></webobject></webobject>
-					<webobject name="ShouldDisplayDetailedPageMetrics">
-					<td class="InlineMetrics"><webobject name="InlineMetricsForPropertyKey"></webobject></td>
+						<webobject name="IfIsInspectActionsWidgetPropertyKey">
+							<td>
+								<webobject name="IsEntityInspectableConditional">
+									<webobject name="InspectObjectHyperlink"><webobject name="InspectImage"></webobject></webobject>
+								</webobject>
+								<webobject name="IsEntityWritableConditional">
+									<webobject name="EditObjectHyperlink"><webobject name="EditImage"></webobject></webobject>
+								</webobject>
+							</td>
+						</webobject>
+						<webobject name="IfIsNotInspectActionsWidgetPropertyKey">
+							<webobject name="IfIsPickWidgetPropertyKey">
+								<td class="SelectionWidget"><webobject name="SelectionWidgetSwitchComponent"></webobject></td>
+							</webobject>
+							<webobject name="IfIsNotPickWidgetPropertyKey">
+								<webobject name="AttributeCell"><webobject name="AttributeDisplay"></webobject></webobject>
+								<webobject name="ShouldDisplayDetailedPageMetrics">
+									<td class="InlineMetrics"><webobject name="InlineMetricsForPropertyKey"></webobject></td>
+								</webobject>
+							</webobject>
+						</webobject>
 					</webobject>
 					</webobject>
+					<webobject name="IfNotHasPickWidgetPropertyKey">
+						<td class="SelectionWidget"><webobject name="SelectionWidgetSwitchComponent"></webobject></td>
 					</webobject>
-					<td>
-						<webobject name="CheckBox2"></webobject>
-					</td>
 				</webobject>
 				<tr>
 					<td colspan='<webobject name="ColSpanNumber"></webobject>' bgcolor="#ffffff"><img border="0" height="2" width="1" /></td>

Modified: branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUPickListPage.wo/ERNEUPickListPage.wod
===================================================================
--- branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUPickListPage.wo/ERNEUPickListPage.wod	2010-11-29 18:48:20 UTC (rev 11758)
+++ branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUPickListPage.wo/ERNEUPickListPage.wod	2010-11-30 00:42:16 UTC (rev 11759)
@@ -45,11 +45,6 @@
 	extraPropertiesKey = "belowDisplayPropertyKeys";
 }
 
-CheckBox2: WOSwitchComponent {
-    WOComponentName = selectionWidgetName;
-	checked = checked;
-}
-
 ColSpanNumber: WOString {
 	value = colSpan;
 }
@@ -144,6 +139,38 @@
 	negate = true;
 }
 
+IfIsInspectActionsWidgetPropertyKey: ERXEqualConditional {
+	value1 = d2wContext.propertyKey;
+	value2 = d2wContext.inspectActionsWidgetPropertyKey;
+}
+
+IfIsNotInspectActionsWidgetPropertyKey: ERXEqualConditional {
+	negate = true;
+	value1 = d2wContext.propertyKey;
+	value2 = d2wContext.inspectActionsWidgetPropertyKey;
+}
+
+IfIsNotPickWidgetPropertyKey: ERXEqualConditional {
+	negate = true;
+	value1 = d2wContext.propertyKey;
+	value2 = d2wContext.pickWidgetPropertyKey;
+}
+
+IfIsPickWidgetPropertyKey: ERXEqualConditional {
+	value1 = d2wContext.propertyKey;
+	value2 = d2wContext.pickWidgetPropertyKey;
+}
+
+IfNotHasInspectActionsWidgetPropertyKey: ERXNonNullConditional {
+	condition = d2wContext.inspectActionsWidgetPropertyKey;
+	negate = true;
+}
+
+IfNotHasPickWidgetPropertyKey: ERXNonNullConditional {
+	condition = d2wContext.pickWidgetPropertyKey;
+	negate = true;
+}
+
 IfPropertyKeyIsNotOmitted: WOConditional {
 	condition = isKeyOmitted;
 	negate = true;
@@ -279,6 +306,11 @@
 	name = "Returns to the previous page";
 }
 
+SelectionWidgetSwitchComponent: WOSwitchComponent {
+	WOComponentName = selectionWidgetName;
+	checked = checked;
+}
+
 ShouldDisplayDetailedPageMetrics: WOConditional {
 	condition = shouldDisplayDetailedPageMetrics;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.