Author: mrisaliti
Date: Fri Sep 18 17:48:15 2009
New Revision: 816728
URL: http://svn.apache.org/viewvc?rev=816728&view=rev
Log:
Fix the content decorators and add some labelTitleProperty to various screens
Modified:
ofbiz/trunk/applications/content/widget/CommonScreens.xml
ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml
Modified: ofbiz/trunk/applications/content/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/CommonScreens.xml?rev=816728&r1=816727&r2=816728&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/CommonScreens.xml Fri Sep 18
17:48:15 2009
@@ -94,7 +94,7 @@
<not><if-empty
field="currentValue.contentId"/></not>
</condition>
<widgets>
- <label style="h1"
text="${uiLabelMap.${titleProperty}} ${uiLabelMap.CommonFor}:
${currentValue.contentName},${currentValue.description}
[${currentValue.contentId}] ${uiLabelMap.${extraFunctionName}}"/>
+ <label style="h1"
text="${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}:
${currentValue.contentName},${currentValue.description}
[${currentValue.contentId}] ${${extraFunctionName}}"/>
</widgets>
<fail-widgets>
<label style="h1"
text="${uiLabelMap.PageTitleAddContent}"/>
@@ -160,7 +160,7 @@
<widgets>
<include-menu
name="dataresourceTopMenu"
location="component://content/widget/content/DataResourceMenus.xml"/>
<include-menu name="dataresource"
location="component://content/widget/content/DataResourceMenus.xml"/>
- <label style="h1"
text="${uiLabelMap.${titleProperty}} ${uiLabelMap.CommonFor}:
${currentValue.dataResourceName} [${currentValue.dataResourceId}]
${uiLabelMap.${extraFunctionName}}"/>
+ <label style="h1"
text="${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}:
${currentValue.dataResourceName} [${currentValue.dataResourceId}]
${${extraFunctionName}}"/>
</widgets>
<fail-widgets>
<include-menu
name="dataresourceTopMenu"
location="component://content/widget/content/DataResourceMenus.xml"/>
@@ -271,7 +271,7 @@
<container style="widget-container">
<link text="${uiLabelMap.CommonCreateNew}
${uiLabelMap.ContentWebSite}" target="EditWebSite" style="buttontext"/>
</container>
- <label style="h1"
text="${uiLabelMap.${titleProperty}} ${uiLabelMap.CommonFor}:
${webSite.siteName} [${webSite.webSiteId}]
${uiLabelMap.${extraFunctionName}}"/>
+ <label style="h1"
text="${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}:
${webSite.siteName} [${webSite.webSiteId}] ${${extraFunctionName}}"/>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
Modified:
ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml?rev=816728&r1=816727&r2=816728&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml
(original)
+++ ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml Fri
Sep 18 17:48:15 2009
@@ -25,6 +25,7 @@
<set field="headerItem" value="DataResource"/>
<set field="tabButtonItem" value="findDataResource"/>
<set field="titleProperty" value="PageTitleFindDataResource"/>
+ <set field="labelTitleProperty"
value="PageTitleFindDataResource"/>
<set field="viewIndex"
from-field="requestParameters.VIEW_INDEX" type="Integer"/>
<set field="viewSize" from-field="requestParameters.VIEW_SIZE"
type="Integer" default-value="30"/>
</actions>
@@ -171,6 +172,7 @@
<section>
<actions>
<set field="titleProperty" value="PageTitleEditDataResource"/>
+ <set field="labelTitleProperty"
value="PageTitleEditDataResource"/>
<set field="headerItem" value="DataResource"/>
<set field="tabButtonItem" value="editDataResource"/>
<set field="dataResourceId"
from-field="parameters.dataResourceId"/>
@@ -184,7 +186,7 @@
<container style="screenlet">
<container style="screenlet-title-bar">
<container style="h3">
- <label
text="${uiLabelMap.PageTitleEditDataResource}"/>
+ <label
text="${uiLabelMap.ContentContentsAssociatedToDataResource}"/>
</container>
</container>
<container style="screenlet-body">
@@ -204,7 +206,7 @@
<container style="screenlet">
<container style="screenlet-title-bar">
<container style="h3">
- <label
text="${uiLabelMap.ContentContentsAssociatedToDataResource}"/>
+ <label
text="${uiLabelMap.PageTitleEditDataResource}"/>
</container>
</container>
<container style="screenlet-body">
@@ -242,6 +244,7 @@
<section>
<actions>
<set field="titleProperty"
value="PageTitleUploadImageDataResource"/>
+ <set field="labelTitleProperty"
value="PageTitleUploadImageDataResource"/>
<set field="headerItem" value="DataResource"/>
<set field="tabButtonItem" value="uploadImage"/>
<entity-one entity-name="DataResource"
value-field="currentValue">
@@ -277,6 +280,7 @@
<section>
<actions>
<set field="titleProperty"
value="PageTitleAddDataResourceText"/>
+ <set field="labelTitleProperty"
value="PageTitleAddDataResourceText"/>
<set field="headerItem" value="DataResource"/>
<set field="tabButtonItem" value="adddataresourcetext"/>
</actions>
@@ -293,6 +297,7 @@
<section>
<actions>
<set field="titleProperty"
value="PageTitleAddDataResourceUrl"/>
+ <set field="labelTitleProperty"
value="PageTitleAddDataResourceUrl"/>
<set field="headerItem" value="DataResource"/>
<set field="tabButtonItem" value="adddataresourceurl"/>
</actions>
@@ -310,6 +315,7 @@
<section>
<actions>
<set field="titleProperty"
value="PageTitleAddDataResourceUpload"/>
+ <set field="labelTitleProperty"
value="PageTitleAddDataResourceUpload"/>
<set field="headerItem" value="DataResource"/>
<set field="tabButtonItem" value="adddataresourceupload"/>
</actions>
@@ -326,6 +332,7 @@
<section>
<actions>
<set field="titleProperty"
value="PageTitleEditDataResourceText"/>
+ <set field="labelTitleProperty"
value="PageTitleEditDataResourceText"/>
<set field="headerItem" value="DataResource"/>
<set field="tabButtonItem" value="editdataresourcetext"/>
</actions>
@@ -342,6 +349,7 @@
<section>
<actions>
<set field="titleProperty"
value="PageTitleEditDataResourceUrl"/>
+ <set field="labelTitleProperty"
value="PageTitleEditDataResourceUrl"/>
<set field="headerItem" value="DataResource"/>
<set field="tabButtonItem" value="editdataresourceurl"/>
</actions>
@@ -358,6 +366,7 @@
<section>
<actions>
<set field="titleProperty"
value="PageTitleEditDataResourceUpload"/>
+ <set field="labelTitleProperty"
value="PageTitleEditDataResourceUpload"/>
<set field="headerItem" value="DataResource"/>
<set field="tabButtonItem" value="editdataresourceupload"/>
</actions>
@@ -374,6 +383,7 @@
<section>
<actions>
<set field="titleProperty"
value="PageTitleEditElectronicText"/>
+ <set field="labelTitleProperty"
value="PageTitleEditElectronicText"/>
<set field="headerItem" value="DataResource"/>
<set field="tabButtonItem" value="editElectronicText"/>
<entity-one entity-name="DataResource"
value-field="currentValue"/>
@@ -404,6 +414,7 @@
<section>
<actions>
<set field="titleProperty"
value="PageTitleEditDataResourceAttribute"/>
+ <set field="labelTitleProperty"
value="PageTitleEditDataResourceAttribute"/>
<set field="headerItem" value="DataResource"/>
<set field="tabButtonItem" value="editDataResourceAttribute"/>
<entity-one entity-name="DataResource"
value-field="currentValue">
@@ -427,6 +438,7 @@
<section>
<actions>
<set field="titleProperty"
value="PageTitleEditDataResourceRole"/>
+ <set field="labelTitleProperty"
value="PageTitleEditDataResourceRole"/>
<set field="headerItem" value="DataResource"/>
<set field="tabButtonItem" value="editDataResourceRole"/>
<entity-one entity-name="DataResource"
value-field="currentValue">
@@ -450,6 +462,7 @@
<section>
<actions>
<set field="titleProperty"
value="PageTitleEditDataResourceProductFeatures"/>
+ <set field="labelTitleProperty"
value="PageTitleEditDataResourceProductFeatures"/>
<set field="headerItem" value="DataResource"/>
<set field="tabButtonItem"
value="editDataResourceProductFeatures"/>
<entity-one entity-name="DataResource"
value-field="currentValue">
@@ -473,6 +486,7 @@
<section>
<actions>
<set field="titleProperty" value="PageTitleEditHtmlText"/>
+ <set field="labelTitleProperty" value="PageTitleEditHtmlText"/>
<set field="headerItem" value="DataResource"/>
<set field="tabButtonItem" value="editHtmlText"/>
<entity-one entity-name="DataResource"
value-field="currentValue"/>
