Author: buscob
Date: Sun Oct 17 09:46:52 2010
New Revision: 1023447
URL: http://svn.apache.org/viewvc?rev=1023447&view=rev
Log:
ManagePortalPages screen improvements.
The PortalPage list is now collapsible. The form to create a new portalPage has
been moved to a dedicated screen.
This allows to have a less crowded screen and the portalPage being configured
can be seen almost at full screen.
Modified:
ofbiz/trunk/framework/common/config/CommonUiLabels.xml
ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml
ofbiz/trunk/framework/common/widget/PortalPageForms.xml
ofbiz/trunk/framework/common/widget/PortalPageScreens.xml
Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=1023447&r1=1023446&r2=1023447&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Sun Oct 17 09:46:52
2010
@@ -4413,6 +4413,10 @@
<value
xml:lang="th">à¸à¸£à¸§à¸à¸ªà¸à¸à¸£à¸«à¸±à¸ªà¸à¹à¸²à¸à¹à¸«à¸¡à¹</value>
<value xml:lang="zh">æ°å¯ç éªè¯</value>
</property>
+ <property key="CommonNewPortalPage">
+ <value xml:lang="en">New Portal Page</value>
+ <value xml:lang="it">Nuova pagina portale</value>
+ </property>
<property key="CommonNewSelection">
<value xml:lang="ar">إختÙار جدÙد</value>
<value xml:lang="de">Neue Auswahl</value>
Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml?rev=1023447&r1=1023446&r2=1023447&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml
(original)
+++ ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml Sun
Oct 17 09:46:52 2010
@@ -61,6 +61,11 @@ under the License.
<event type="simple" invoke="copyIfRequiredSystemPage"
path="component://common/script/org/ofbiz/common/PortalPageMethods.xml"/>
<response name="success" type="view" value="ManagePortalPages"/>
</request-map>
+ <request-map uri="NewPortalPage">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="NewPortalPage"/>
+ <response name="error" type="request" value="main"/>
+ </request-map>
<request-map uri="addPortlet">
<security https="true" auth="true"/>
<response name="success" type="view" value="addPortlet"
save-last-view="true"/>
@@ -168,6 +173,7 @@ under the License.
<view-map name="showPortletMainDecorator" type="screen"
page="component://common/widget/PortalPageScreens.xml#showPortletMainDecorator"/>
<view-map name="showPortletSimpleDecorator" type="screen"
page="component://common/widget/PortalPageScreens.xml#showPortletSimpleDecorator"/>
<view-map name="ManagePortalPages" type="screen"
page="component://common/widget/PortalPageScreens.xml#ManagePortalPages"/>
+ <view-map name="NewPortalPage" type="screen"
page="component://common/widget/PortalPageScreens.xml#NewPortalPage"/>
<view-map name="addPortlet" type="screen"
page="component://common/widget/PortalPageScreens.xml#AddPortlet"/>
<view-map name="editPortalPortletAttributes" type="screen"
page="component://common/widget/PortalPageScreens.xml#EditPortalPortletAttributes"/>
<view-map name="editPortalPageColumnWidth" type="screen"
page="component://common/widget/PortalPageScreens.xml#EditPortalPageColumnWidth"/>
Modified: ofbiz/trunk/framework/common/widget/PortalPageForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageForms.xml?rev=1023447&r1=1023446&r2=1023447&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/PortalPageForms.xml (original)
+++ ofbiz/trunk/framework/common/widget/PortalPageForms.xml Sun Oct 17 09:46:52
2010
@@ -97,8 +97,8 @@ under the License.
<form name="NewPortalPage" type="single" target="createPortalPage">
<field name="parentPortalPageId"><hidden
value="${parameters.parentPortalPageId}"/></field>
<field name="sequenceNum"><hidden
value="${parameters.portalPagesSize+1}"/></field>
- <field name="portalPageName" position="1"><text/></field>
- <field name="description" position="2"><text/></field>
+ <field name="portalPageName"><text/></field>
+ <field name="description"><text/></field>
<field name="createButton"><submit button-type="button"/></field>
</form>
Modified: ofbiz/trunk/framework/common/widget/PortalPageScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageScreens.xml?rev=1023447&r1=1023446&r2=1023447&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/PortalPageScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/PortalPageScreens.xml Sun Oct 17
09:46:52 2010
@@ -98,46 +98,20 @@ under the License.
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="no-clear">
- <screenlet
title="${uiLabelMap.CommonPortalPagesForApplication}:
${parameters.parentPortalPageId}">
- <include-form name="ListPortalPages"
location="component://common/widget/PortalPageForms.xml"/>
- </screenlet>
- <section>
- <condition>
- <and>
- <not><if-empty
field="portalPage"/></not>
- <not><if-empty
field="parameters.editAttributes"/></not>
- </and>
- </condition>
- <actions>
- <property-map resource="CommonUiLabels"
map-name="uiLabelMap"/>
- <set field="originalPortalPageId"
from-field="parameters.originalPortalPageId"/>
- <entity-one entity-name="PortalPortlet"
value-field="portalPortlet"/>
- </actions>
- <widgets>
- <screenlet
title="${uiLabelMap.CommonEditPortletAttributes}: ${portalPortlet.portletName}">
- <include-form
name="${portalPortlet.editFormName}"
location="${portalPortlet.editFormLocation}"/>
- </screenlet>
- </widgets>
- <fail-widgets>
- <screenlet
title="${uiLabelMap.CommonPortalNewPage}">
- <include-form name="NewPortalPage"
location="component://common/widget/PortalPageForms.xml"/>
- </screenlet>
- </fail-widgets>
- </section>
- <section>
- <condition>
- <not><if-empty field="portalPage"/></not>
- </condition>
- <widgets>
- <container id="portalContainerId">
- <screenlet
title="${uiLabelMap.CommonPortalEditPage}: ${portalPage.portalPageName}
[${portalPage.portalPageId}]">
- <include-portal-page
id="${portalPage.portalPageId}" conf-mode="true"/>
- </screenlet>
- </container>
- </widgets>
- </section>
- </container>
+ <screenlet id="PortalPagesList"
title="${uiLabelMap.CommonPortalPagesForApplication}:
${parameters.parentPortalPageId}" collapsible="true">
+ <container style="button-bar"><link
target="NewPortalPage" text="${uiLabelMap.CommonNewPortalPage}"
style="buttontext create"/></container>
+ <include-form name="ListPortalPages"
location="component://common/widget/PortalPageForms.xml"/>
+ </screenlet>
+ <section>
+ <condition>
+ <not><if-empty field="portalPage"/></not>
+ </condition>
+ <widgets>
+ <screenlet
title="${uiLabelMap.CommonPortalEditPage}: ${portalPage.portalPageName}
[${portalPage.portalPageId}]">
+ <include-portal-page
id="${portalPage.portalPageId}" conf-mode="true"/>
+ </screenlet>
+ </widgets>
+ </section>
</decorator-section>
</decorator-screen>
</widgets>
@@ -247,4 +221,22 @@ under the License.
</widgets>
</section>
</screen>
+ <screen name="NewPortalPage">
+ <section>
+ <widgets>
+ <decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <container style="button-bar">
+ <link target="ManagePortalPages"
text="${uiLabelMap.CommonBack}" style="buttontext">
+ <parameter param-name="parentPortalPageId"
from-field="parameters.parentPortalPageId"/>
+ </link>
+ </container>
+ <screenlet title="${uiLabelMap.CommonPortalNewPage}">
+ <include-form name="NewPortalPage"
location="component://common/widget/PortalPageForms.xml"/>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
</screens>
