svn commit: r942406 - in /ofbiz/trunk: framework/common/config/ framework/webtools/config/ framework/webtools/data/ framework/webtools/webapp/webt
Locked
svn commit: r942406 - in /ofbiz/trunk: framework/common/config/ framework/webtools/config/ framework/webtools/data/ framework/webtools/webapp/webt
 
|
Author: erwan
Date: Sat May 8 15:52:31 2010 New Revision: 942406 URL: http://svn.apache.org/viewvc?rev=942406&view=rev Log: Following a discussion on dev list, moving portal administration to webtools instead of myPortal (http://ofbiz.135035.n4.nabble.com/erwan-contributions-td2122600.html#a2122600) Added: ofbiz/trunk/framework/webtools/widget/PortalAdmForms.xml (with props) ofbiz/trunk/framework/webtools/widget/PortalAdmScreens.xml (with props) Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml ofbiz/trunk/framework/webtools/data/WebtoolsSecurityData.xml ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl ofbiz/trunk/framework/webtools/widget/Menus.xml ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=942406&r1=942405&r2=942406&view=diff ============================================================================== --- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original) +++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Sat May 8 15:52:31 2010 @@ -261,6 +261,10 @@ <value xml:lang="zh">æ°å»º</value> <value xml:lang="zh_CN">æ·»å æ°ç</value> </property> + <property key="CommonAddPortletToPage"> + <value xml:lang="en">Add a portlet to portal page</value> + <value xml:lang="fr">Ajouter une portlet à la page</value> + </property> <property key="CommonAddProblem"> <value xml:lang="ar">Ù Ø´Ù٠أثÙاء اÙإضاÙØ©</value> <value xml:lang="de">Problem hinzufügen</value> Modified: ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml?rev=942406&r1=942405&r2=942406&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml (original) +++ ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml Sat May 8 15:52:31 2010 @@ -304,6 +304,10 @@ <value xml:lang="th">à¸à¹à¸à¸«à¸²à¸à¸²à¸</value> <value xml:lang="zh">æ¥æ¾ä»»å¡</value> </property> + <property key="PageTitleFindPortalPage"> + <value xml:lang="en">Find Portal page</value> + <value xml:lang="fr">Rech. page portail</value> + </property> <property key="PageTitleFindUtilCache"> <value xml:lang="de">Cache Wartungsseite</value> <value xml:lang="en">Cache Maintenance Page</value> @@ -464,6 +468,10 @@ <value xml:lang="th">à¸à¸¹à¹à¸à¸¹à¹à¸¥à¸£à¸°à¸à¸</value> <value xml:lang="zh">管ç</value> </property> + <property key="WebtoolsAdminPortalPage"> + <value xml:lang="en">Portal page Admin.</value> + <value xml:lang="fr">Admin. Page portail</value> + </property> <property key="WebtoolsAll"> <value xml:lang="de">Alle</value> <value xml:lang="en">All</value> Modified: ofbiz/trunk/framework/webtools/data/WebtoolsSecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/data/WebtoolsSecurityData.xml?rev=942406&r1=942405&r2=942406&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/data/WebtoolsSecurityData.xml (original) +++ ofbiz/trunk/framework/webtools/data/WebtoolsSecurityData.xml Sat May 8 15:52:31 2010 @@ -58,6 +58,11 @@ under the License. <SecurityGroupPermission groupId="FLEXADMIN" permissionId="PERIOD_MAINT"/> <SecurityGroupPermission groupId="BIZADMIN" permissionId="PERIOD_MAINT"/> + <!-- PortalPage Maintenance security --> + <SecurityPermission description="All Portal Page Maintenance pages." permissionId="PORTALPAGE_MAINT"/> + <SecurityGroupPermission groupId="FULLADMIN" permissionId="PORTALPAGE_MAINT"/> + <SecurityGroupPermission groupId="FLEXADMIN" permissionId="PORTALPAGE_MAINT"/> + <!-- Enum & Status Maintenance security --> <SecurityPermission description="Use the Enum and Status Maintenance pages." permissionId="ENUM_STATUS_MAINT"/> <SecurityGroupPermission groupId="FULLADMIN" permissionId="ENUM_STATUS_MAINT"/> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml?rev=942406&r1=942405&r2=942406&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml Sat May 8 15:52:31 2010 @@ -519,6 +519,101 @@ under the License. <response name="success" type="view" value="findTemporalExpression"/> </request-map> + <!-- PortalPage administration --> + <request-map uri="FindPortalPage"> + <security https="true" auth="true"/> + <response name="success" type="view" value="FindPortalPage"/> + </request-map> + <request-map uri="EditPortalPage"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditPortalPage"/> + </request-map> + <request-map uri="ManagePortalPagesAdm"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditPortalPage"/> + </request-map> + <request-map uri="DuplicatePortalPage"> + <security https="true" auth="true"/> + <event type="simple" invoke="duplicatePortalPage" path="component://common/script/org/ofbiz/common/PortalPageMethods.xml"/> + <response name="success" type="view" value="EditPortalPage"/> + </request-map> + <request-map uri="NewPortalPage"> + <security https="true" auth="true"/> + <response name="success" type="view" value="CreatePortalPage"/> + </request-map> + <request-map uri="createPortalPageAdm"> + <security https="true" auth="true"/> + <event type="service" invoke="createPortalPage"/> + <response name="success" type="view" value="EditPortalPage"/> + <response name="error" type="view" value="CreatePortalPage"/> + </request-map> + <request-map uri="updatePortalPageAdm"> + <security https="true" auth="true"/> + <event type="service" invoke="updatePortalPage"/> + <response name="success" type="view" value="EditPortalPage"/> + <response name="error" type="view" value="EditPortalPage"/> + </request-map> + + <!-- PortalPage detail administration, copy from portal-controller with response target change to EditPortalPage--> + <request-map uri="addPortalPageColumnAdm"> + <security https="true" auth="true"/> + <event type="service" invoke="addPortalPageColumn"/> + <response name="success" type="view" value="EditPortalPage"/> + <response name="error" type="view" value="EditPortalPage"/> + </request-map> + <request-map uri="deletePortalPageColumnAdm"> + <security https="true" auth="true"/> + <event type="service" invoke="deletePortalPageColumn"/> + <response name="success" type="view" value="EditPortalPage"/> + <response name="error" type="view" value="EditPortalPage"/> + </request-map> + <request-map uri="AddPortletAdm"> + <security https="true" auth="true"/> + <response name="success" type="view" value="AddPortletAdm"/> + </request-map> + <request-map uri="updatePortalPageColumnAdm"> + <security https="true" auth="true"/> + <event type="service" invoke="updatePortalPageColumn"/> + <response name="success" type="view" value="EditPortalPage"/> + <response name="error" type="view" value="EditPortalPage"/> + </request-map> + <request-map uri="movePortletToPortalPageAdm"> + <security https="true" auth="true"/> + <event type="service" invoke="movePortletToPortalPage"/> + <response name="success" type="view" value="EditPortalPage"/> + <response name="error" type="view" value="EditPortalPage"/> + </request-map> + <request-map uri="deletePortalPagePortletAdm"> + <security https="true" auth="true"/> + <event type="service" invoke="deletePortalPagePortlet"/> + <response name="success" type="view" value="EditPortalPage"/> + <response name="error" type="view" value="EditPortalPage"/> + </request-map> + <request-map uri="updatePortalPagePortletSeqAdm"> + <security https="true" auth="true"/> + <event type="service" invoke="updatePortalPagePortletSeq"/> + <response name="success" type="view" value="EditPortalPage"/> + <response name="error" type="view" value="EditPortalPage"/> + </request-map> + <request-map uri="updatePortalPagePortletAdm"> + <security https="true" auth="true"/> + <event type="service" invoke="updatePortalPagePortlet"/> + <response name="success" type="view" value="EditPortalPage"/> + <response name="error" type="view" value="EditPortalPage"/> + </request-map> + <request-map uri="createPortalPagePortletAdm"> + <security https="true" auth="true"/> + <event type="service" invoke="createPortalPagePortlet"/> + <response name="success" type="view" value="EditPortalPage"/> + <response name="error" type="view" value="EditPortalPage"/> + </request-map> + <request-map uri="setPortalPortletAttributesAdm"> + <security https="true" auth="true"/> + <event type="simple" invoke="setPortalPortletAttributes" path="component://common/script/org/ofbiz/common/PortalPageMethods.xml"/> + <response name="success" type="view" value="EditPortalPage"/> + <response name="error" type="view" value="EditPortalPage"/> + </request-map> + <!-- end of request mappings --> <!-- View Mappings --> @@ -606,5 +701,11 @@ under the License. <view-map name="editTemporalExpression" type="screen" page="component://webtools/widget/TempExprScreens.xml#EditTemporalExpression"/> <view-map name="findTemporalExpression" type="screen" page="component://webtools/widget/TempExprScreens.xml#FindTemporalExpression"/> + <!-- PortalPage administration --> + <view-map name="FindPortalPage" type="screen" page="component://webtools/widget/PortalAdmScreens.xml#FindPortalPage"/> + <view-map name="CreatePortalPage" type="screen" page="component://webtools/widget/PortalAdmScreens.xml#CreatePortalPage"/> + <view-map name="EditPortalPage" type="screen" page="component://webtools/widget/PortalAdmScreens.xml#EditPortalPage"/> + <view-map name="AddPortletAdm" type="screen" page="component://webtools/widget/PortalAdmScreens.xml#AddPortletAdm"/> + <!-- end of view mappings --> </site-conf> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl?rev=942406&r1=942405&r2=942406&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl Sat May 8 15:52:31 2010 @@ -95,6 +95,9 @@ under the License. <li><a href="<@ofbizUrl>viewdatafile</@ofbizUrl>">${uiLabelMap.WebtoolsWorkWithDataFiles}</a></li> </#if> <li><h3>${uiLabelMap.WebtoolsMiscSetupTools}</h3></li> + <#if security.hasPermission("PORTALPAGE_MAINT", session)> + <li><a href="<@ofbizUrl>FindPortalPage</@ofbizUrl>">${uiLabelMap.WebtoolsAdminPortalPage}</a></li> + </#if> <#if security.hasPermission("ENUM_STATUS_MAINT", session)> <#-- <li><a href="<@ofbizUrl>EditEnumerationTypes</@ofbizUrl>">Edit Enumerations</a></li> Modified: ofbiz/trunk/framework/webtools/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/Menus.xml?rev=942406&r1=942405&r2=942406&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/Menus.xml (original) +++ ofbiz/trunk/framework/webtools/widget/Menus.xml Sat May 8 15:52:31 2010 @@ -45,6 +45,10 @@ under the License. <menu-item name="configuration" title="${uiLabelMap.WebtoolsConfiguration}"> <link target="myCertificates"/> </menu-item> + <menu-item name="portalAdmin" title="${uiLabelMap.WebtoolsAdminPortalPage}"> + <condition><if-has-permission permission="PORTALPAGE_MAINT"/></condition> + <link target="FindPortalPage"/> + </menu-item> <menu-item name="tests" title="Tests"> <link target="selenium"/> </menu-item> @@ -184,4 +188,19 @@ under the License. </menu-item> </menu> + <menu name="PortalPageAdmin"> + <menu-item name="duplicate" title="${uiLabelMap.CommonDuplicate}"> + <link target="DuplicatePortalPage"> + <parameter param-name="portalPageId" from-field="parameters.portalPageId"/> + </link> + </menu-item> + <menu-item name="new" title="${uiLabelMap.CommonNew}"> + <link target="NewPortalPage"/> + </menu-item> + <menu-item name="refresh" title="${uiLabelMap.CommonRefresh}"> + <link target="EditPortalPage"> + <parameter param-name="portalPageId" from-field="parameters.portalPageId"/> + </link> + </menu-item> + </menu> </menus> Added: ofbiz/trunk/framework/webtools/widget/PortalAdmForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/PortalAdmForms.xml?rev=942406&view=auto ============================================================================== --- ofbiz/trunk/framework/webtools/widget/PortalAdmForms.xml (added) +++ ofbiz/trunk/framework/webtools/widget/PortalAdmForms.xml Sat May 8 15:52:31 2010 @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> + + <form name="FindPortalPages" type="single" target="FindPortalPage" default-entity-name="PortalPage"> + <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> + <field name="portalPageIdSearch" position="1" title="${uiLabelMap.CommonId}"><text-find/></field> + <field name="originalPortalPageId" position="2"><text-find/></field> + <field name="portalPageName" title="${uiLabelMap.CommonName}"><text-find/></field> + <field name="parentPortalPageIdSearch" position="2" title="${uiLabelMap.FormFieldTitle_parentPortalPageId}"><text-find/></field> + <field name="description"><text-find/></field> + <field name="securityGroupId" position="2" title="${uiLabelMap.PartySecurityGroupId}"><text-find/></field> + <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> + </form> + + <form name="ListPortalPages" type="list" list-name="pagesList" paginate-target="FindPortalPage" separate-columns="true" + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> + <field name="portalPageId" title="${uiLabelMap.CommonEdit}"> + <hyperlink description="${portalPageId}" target="EditPortalPage"> + <parameter param-name="portalPageId"/> + </hyperlink> + </field> + <field name="portalPageName" use-when="ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonName}" sort-field="true"><display/></field> + <field name="portalPageName" use-when="!ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonName}" id-name="portalPageName" widget-style="tabletext" sort-field="true"> + <display> + <in-place-editor url="updatePortalPage" cancel-control="button" saving-text="Updating..." text-between-controls=" "> + <simple-editor/> + <field-map field-name="portalPageId" from-field="portalPageId"/> + </in-place-editor> + </display> + </field> + <field name="description" use-when="ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonDescription}" widget-style="tabletext" sort-field="true"><display/></field> + <field name="description" use-when="!ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonDescription}" id-name="portalDescription" widget-style="tabletext" sort-field="true"> + <display> + <in-place-editor url="updatePortalPage" cancel-control="button" saving-text="Updating..." text-between-controls=" "> + <simple-editor/> + <field-map field-name="portalPageId" from-field="portalPageId"/> + </in-place-editor> + </display> + </field> + <field name="sequenceNum"><display/></field> + <field name="originalPortalPageId"><display/></field> + <field name="ownerUserLoginId"><display/></field> + <field name="deleteLink" use-when="originalPortalPageId!=null" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" > + <hyperlink target="deletePortalPage" description="${uiLabelMap.CommonRevertPortalPage}"> + <parameter param-name="portalPageId"/> + <parameter param-name="parentPortalPageId" from-field="parameters.parentPortalPageId"/> + </hyperlink> + </field> + </form> + + <form name="EditPortalPage" type="single" target="${targetPortalPage}" default-map-name="portalPage"> + <field name="portalPageId" use-when="!"${portalPage.portalPageId}".equals("")" position="1"><display/></field> + <field name="portalPageId" use-when=""${portalPage.portalPageId}".equals("")" position="1"><text/></field> + <field name="originalPortalPageId" position="2"><text/></field> + <field name="ownerUserLoginId" ><lookup target-form-name="LookupUserLoginAndPartyDetails"/></field> + <field name="parentPortalPageId" position="2"><text/></field> + <field name="portalPageName"><text/></field> + <field name="description" position="2"><text size="60"/></field> + <field name="sequenceNum"><text/></field> + <field name="saveButton" position="2"><submit button-type="button"/></field> + </form> + +</forms> Propchange: ofbiz/trunk/framework/webtools/widget/PortalAdmForms.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/framework/webtools/widget/PortalAdmForms.xml ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/framework/webtools/widget/PortalAdmForms.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: ofbiz/trunk/framework/webtools/widget/PortalAdmScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/PortalAdmScreens.xml?rev=942406&view=auto ============================================================================== --- ofbiz/trunk/framework/webtools/widget/PortalAdmScreens.xml (added) +++ ofbiz/trunk/framework/webtools/widget/PortalAdmScreens.xml Sat May 8 15:52:31 2010 @@ -0,0 +1,189 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> + + + <!-- list all PortalPage in a tabular format --> + <screen name="FindPortalPage"> + <section> + <actions> + <set field="headerItem" value="portalAdmin"/> + <set field="titleProperty" value="PageTitleFindPortalPage"/> + <set field="inputFields" from-field="parameters"/> + <set field="inputFields.portalPageId" from-field="parameters.portalPageIdSearch"/> + <set field="inputFields.portalPageId_op" from-field="parameters.portalPageIdSearch_op"/> + <set field="inputFields.portalPageId_ic" from-field="parameters.portalPageIdSearch_ic"/> + <set field="inputFields.parentPortalPageId" from-field="parameters.parentPortalPageIdSearch"/> + <set field="inputFields.parentPortalPageId_op" from-field="parameters.parentPortalPageIdSearch_op"/> + <set field="inputFields.parentPortalPageId_ic" from-field="parameters.parentPortalPageIdSearch_ic"/> + <service service-name="performFind" result-map="result" > + <field-map field-name="entityName" value="PortalPage"/> + <field-map field-name="orderBy" from-field="parameters.sortField"/> + </service> + <set field="pagesList" from-field="result.listIt"/> + </actions> + <widgets> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <section> + <condition> + <if-has-permission permission="PORTALPAGE" action="_MAINT"/> + </condition> + <widgets> + <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-section name="search-options"> + <include-form name="FindPortalPages" location="component://webtools/widget/PortalAdmForms.xml"/> + </decorator-section> + <decorator-section name="search-results"> + <include-form name="ListPortalPages" location="component://webtools/widget/PortalAdmForms.xml"/> + </decorator-section> + </decorator-screen> + </widgets> + <fail-widgets> + <label style="h3">${uiLabelMap.PortalPageViewPermissionError}</label> + </fail-widgets> + </section> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + + <screen name="CreatePortalPage"> + <section> + <actions> + <set field="targetPortalPage" value="createPortalPageAdm"/> + </actions> + <widgets> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <section> + <actions> + <set field="portalPage.portalPageId" value=""/> + <set field="editPortalPageId" value="Y"/> + </actions> + <widgets><include-form name="EditPortalPage" location="component://webtools/widget/PortalAdmForms.xml"/></widgets> + </section> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + + <screen name="EditPortalPage"> + <section> + <actions> + <set field="headerItem" value="PortalPageAdminItem"/> + <entity-one entity-name="PortalPage" value-field="portalPage"/> + <set field="Adm" value="Adm"/> + </actions> + <widgets> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <container style="no-clear"> + <section> + <condition> + <not><if-empty field="portalPage"/></not> + </condition> + <actions><set field="targetPortalPage" value="updatePortalPageAdm"/></actions> + <widgets> + <screenlet title="${uiLabelMap.CommonPortalEditPage}" navigation-menu-name="PortalPageAdmin"> + <include-menu name="PortalPageAdmin" location="component://webtools/widget/Menus.xml"/> + <include-form name="EditPortalPage" location="component://webtools/widget/PortalAdmForms.xml"/> + </screenlet> + </widgets> + </section> + <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> + </section> + <section> + <condition> + <not><if-empty field="portalPage"/></not> + </condition> + <actions> + <set field="portalPages[]" from-field="portalPage"/> + <entity-condition entity-name="PortalPageColumn" list="portalPageColumnList"> + <condition-expr field-name="portalPageId" from-field="parameters.portalPageId"/> + <order-by field-name="columnSeqId"/> + </entity-condition> + <entity-condition entity-name="PortalPagePortletView" list="portalPagePortletViewList"> + <condition-expr field-name="portalPageId" from-field="parameters.portalPageId"/> + <order-by field-name="+columnSeqId"/> + <order-by field-name="+sequenceNum"/> + </entity-condition> + </actions> + <widgets> + <container id="portalContainerId"> + <screenlet title="${uiLabelMap.CommonPortalEditPage}: ${portalPage.portalPageName} [${portalPage.portalPageId}]"> + <link target="addPortalPageColumnAdm" style="buttontext" text="${uiLabelMap.CommonAddColumn}"> + <parameter param-name="portalPageId" from-field="portalPage.portalPageId"/> + </link> + <platform-specific><html><html-template location="component://common/webcommon/portal/editPortalPage.ftl"/></html></platform-specific> + </screenlet> + </container> + </widgets> + </section> + </container> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + + <screen name="AddPortletAdm"> + <section> + <actions> + <set field="originalPortalPageId" from-field="parameters.originalPortalPageId"/> + <set field="portalPageId" from-field="parameters.portalPageId"/> + <script location="component://common/webcommon/WEB-INF/actions/includes/ListPortalPortlets.groovy"/> + <entity-one value-field="portalPage" entity-name="PortalPage" use-cache="true"/> + <set field="Adm" value="Adm"/> + </actions> + <widgets> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="body"> + <screenlet title="${uiLabelMap.CommonAddPortletToPage}: ${portalPage.portalPageName} [${portalPageId}]"> + <include-form name="PortletCategoryAndPortlet" location="component://common/widget/PortalPageForms.xml"/> + </screenlet> + <platform-specific><html><html-template location="component://common/webcommon/portal/listPortalPortlets.ftl"/></html></platform-specific> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + +</screens> Propchange: ofbiz/trunk/framework/webtools/widget/PortalAdmScreens.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/framework/webtools/widget/PortalAdmScreens.xml ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/framework/webtools/widget/PortalAdmScreens.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml?rev=942406&r1=942405&r2=942406&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml Sat May 8 15:52:31 2010 @@ -39,14 +39,6 @@ <value xml:lang="en">Seq.</value> <value xml:lang="fr">Seq.</value> </property> - <property key="MyPortalAddPortletToPage"> - <value xml:lang="en">Add a portlet to portal page</value> - <value xml:lang="fr">Ajouter une portlet à la page</value> - </property> - <property key="MyPropalAdminPortalPage"> - <value xml:lang="en">Portal page Admin.</value> - <value xml:lang="fr">Admin. Page portail</value> - </property> <property key="MyPortalAppBar"> <value xml:lang="en">My Page App Bar</value> <value xml:lang="fr">Menu des applications</value> Modified: ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml?rev=942406&r1=942405&r2=942406&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml Sat May 8 15:52:31 2010 @@ -56,101 +56,6 @@ <response name="success" type="view" value="reloadCaptchaCode"/> </request-map> - <!-- PortalPage administration --> - <request-map uri="FindPortalPage"> - <security https="true" auth="true"/> - <response name="success" type="view" value="FindPortalPage"/> - </request-map> - <request-map uri="EditPortalPage"> - <security https="true" auth="true"/> - <response name="success" type="view" value="EditPortalPage"/> - </request-map> - <request-map uri="ManagePortalPagesAdm"> - <security https="true" auth="true"/> - <response name="success" type="view" value="EditPortalPage"/> - </request-map> - <request-map uri="DuplicatePortalPage"> - <security https="true" auth="true"/> - <event type="simple" invoke="duplicatePortalPage" path="component://common/script/org/ofbiz/common/PortalPageMethods.xml"/> - <response name="success" type="view" value="EditPortalPage"/> - </request-map> - <request-map uri="NewPortalPage"> - <security https="true" auth="true"/> - <response name="success" type="view" value="CreatePortalPage"/> - </request-map> - <request-map uri="createPortalPageAdm"> - <security https="true" auth="true"/> - <event type="service" invoke="createPortalPage"/> - <response name="success" type="view" value="EditPortalPage"/> - <response name="error" type="view" value="CreatePortalPage"/> - </request-map> - <request-map uri="updatePortalPageAdm"> - <security https="true" auth="true"/> - <event type="service" invoke="updatePortalPage"/> - <response name="success" type="view" value="EditPortalPage"/> - <response name="error" type="view" value="EditPortalPage"/> - </request-map> - - <!-- PortalPage detail administration, copy from portal-controller with response target change to EditPortalPage--> - <request-map uri="addPortalPageColumnAdm"> - <security https="true" auth="true"/> - <event type="service" invoke="addPortalPageColumn"/> - <response name="success" type="view" value="EditPortalPage"/> - <response name="error" type="view" value="EditPortalPage"/> - </request-map> - <request-map uri="deletePortalPageColumnAdm"> - <security https="true" auth="true"/> - <event type="service" invoke="deletePortalPageColumn"/> - <response name="success" type="view" value="EditPortalPage"/> - <response name="error" type="view" value="EditPortalPage"/> - </request-map> - <request-map uri="AddPortletAdm"> - <security https="true" auth="true"/> - <response name="success" type="view" value="AddPortletAdm"/> - </request-map> - <request-map uri="updatePortalPageColumnAdm"> - <security https="true" auth="true"/> - <event type="service" invoke="updatePortalPageColumn"/> - <response name="success" type="view" value="EditPortalPage"/> - <response name="error" type="view" value="EditPortalPage"/> - </request-map> - <request-map uri="movePortletToPortalPageAdm"> - <security https="true" auth="true"/> - <event type="service" invoke="movePortletToPortalPage"/> - <response name="success" type="view" value="EditPortalPage"/> - <response name="error" type="view" value="EditPortalPage"/> - </request-map> - <request-map uri="deletePortalPagePortletAdm"> - <security https="true" auth="true"/> - <event type="service" invoke="deletePortalPagePortlet"/> - <response name="success" type="view" value="EditPortalPage"/> - <response name="error" type="view" value="EditPortalPage"/> - </request-map> - <request-map uri="updatePortalPagePortletSeqAdm"> - <security https="true" auth="true"/> - <event type="service" invoke="updatePortalPagePortletSeq"/> - <response name="success" type="view" value="EditPortalPage"/> - <response name="error" type="view" value="EditPortalPage"/> - </request-map> - <request-map uri="updatePortalPagePortletAdm"> - <security https="true" auth="true"/> - <event type="service" invoke="updatePortalPagePortlet"/> - <response name="success" type="view" value="EditPortalPage"/> - <response name="error" type="view" value="EditPortalPage"/> - </request-map> - <request-map uri="createPortalPagePortletAdm"> - <security https="true" auth="true"/> - <event type="service" invoke="createPortalPagePortlet"/> - <response name="success" type="view" value="EditPortalPage"/> - <response name="error" type="view" value="EditPortalPage"/> - </request-map> - <request-map uri="setPortalPortletAttributesAdm"> - <security https="true" auth="true"/> - <event type="simple" invoke="setPortalPortletAttributes" path="component://common/script/org/ofbiz/common/PortalPageMethods.xml"/> - <response name="success" type="view" value="EditPortalPage"/> - <response name="error" type="view" value="EditPortalPage"/> - </request-map> - <request-map uri="LookupUserLoginAndPartyDetails"> <security https="true" auth="true"/> <response name="success" type="view" value="LookupUserLoginAndPartyDetails"/> @@ -161,10 +66,6 @@ <view-map name="newRegisterLogin" type="screen" page="component://myportal/widget/CommonScreens.xml#newRegisterLogin"/> <view-map name="reloadCaptchaImage" type="screen" page="component://myportal/widget/CommonScreens.xml#reloadCaptchaImage"/> <view-map name="reloadCaptchaCode" type="screen" page="component://myportal/widget/CommonScreens.xml#reloadCaptchaCode"/> - <view-map name="FindPortalPage" type="screen" page="component://myportal/widget/MyPortalScreens.xml#FindPortalPage"/> - <view-map name="CreatePortalPage" type="screen" page="component://myportal/widget/MyPortalScreens.xml#CreatePortalPage"/> - <view-map name="EditPortalPage" type="screen" page="component://myportal/widget/MyPortalScreens.xml#EditPortalPage"/> - <view-map name="AddPortletAdm" type="screen" page="component://myportal/widget/MyPortalScreens.xml#AddPortletAdm"/> <view-map name="LookupUserLoginAndPartyDetails" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupUserLoginAndPartyDetails"/> Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml?rev=942406&r1=942405&r2=942406&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml Sat May 8 15:52:31 2010 @@ -43,63 +43,4 @@ under the License. <field name="captchaCode"><hidden value="${parameters.ID_KEY}"/></field> </form> - <form name="FindPortalPages" type="single" target="FindPortalPage" default-entity-name="PortalPage"> - <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="portalPageIdSearch" position="1" title="${uiLabelMap.CommonId}"><text-find/></field> - <field name="originalPortalPageId" position="2"><text-find/></field> - <field name="portalPageName" title="${uiLabelMap.CommonName}"><text-find/></field> - <field name="parentPortalPageIdSearch" position="2" title="${uiLabelMap.FormFieldTitle_parentPortalPageId}"><text-find/></field> - <field name="description"><text-find/></field> - <field name="securityGroupId" position="2" title="${uiLabelMap.PartySecurityGroupId}"><text-find/></field> - <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> - </form> - - <form name="ListPortalPages" type="list" list-name="pagesList" paginate-target="FindPortalPage" separate-columns="true" - odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> - <field name="portalPageId" title="${uiLabelMap.CommonEdit}"> - <hyperlink description="${portalPageId}" target="EditPortalPage"> - <parameter param-name="portalPageId"/> - </hyperlink> - </field> - <field name="portalPageName" use-when="ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonName}" sort-field="true"><display/></field> - <field name="portalPageName" use-when="!ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonName}" id-name="portalPageName" widget-style="tabletext" sort-field="true"> - <display> - <in-place-editor url="updatePortalPage" cancel-control="button" saving-text="Updating..." text-between-controls=" "> - <simple-editor/> - <field-map field-name="portalPageId" from-field="portalPageId"/> - </in-place-editor> - </display> - </field> - <field name="description" use-when="ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonDescription}" widget-style="tabletext" sort-field="true"><display/></field> - <field name="description" use-when="!ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonDescription}" id-name="portalDescription" widget-style="tabletext" sort-field="true"> - <display> - <in-place-editor url="updatePortalPage" cancel-control="button" saving-text="Updating..." text-between-controls=" "> - <simple-editor/> - <field-map field-name="portalPageId" from-field="portalPageId"/> - </in-place-editor> - </display> - </field> - <field name="sequenceNum"><display/></field> - <field name="originalPortalPageId"><display/></field> - <field name="ownerUserLoginId"><display/></field> - <field name="deleteLink" use-when="originalPortalPageId!=null" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" > - <hyperlink target="deletePortalPage" description="${uiLabelMap.CommonRevertPortalPage}"> - <parameter param-name="portalPageId"/> - <parameter param-name="parentPortalPageId" from-field="parameters.parentPortalPageId"/> - </hyperlink> - </field> - </form> - - <form name="EditPortalPage" type="single" target="${targetPortalPage}" default-map-name="portalPage"> - <field name="portalPageId" use-when="!"${portalPage.portalPageId}".equals("")" position="1"><display/></field> - <field name="portalPageId" use-when=""${portalPage.portalPageId}".equals("")" position="1"><text/></field> - <field name="originalPortalPageId" position="2"><text/></field> - <field name="ownerUserLoginId" ><lookup target-form-name="LookupUserLoginAndPartyDetails"/></field> - <field name="parentPortalPageId" position="2"><text/></field> - <field name="portalPageName"><text/></field> - <field name="description" position="2"><text size="60"/></field> - <field name="sequenceNum"><text/></field> - <field name="saveButton" position="2"><submit button-type="button"/></field> - </form> - </forms> Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml?rev=942406&r1=942405&r2=942406&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml (original) +++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml Sat May 8 15:52:31 2010 @@ -28,25 +28,6 @@ under the License. <parameter param-name="parentPortalPageId" from-field="parameters.parentPortalPageId"/> </link> </menu-item> - <menu-item name="PortalPageAdminItem" title="${uiLabelMap.MyPropalAdminPortalPage}" align-style="opposed"> - <condition><if-has-permission permission="MYPORTALBASE" action="_ADMIN"/> </condition> - <link target="FindPortalPage"/> - </menu-item> </menu> - <menu name="CopyNewPortalPage"> - <menu-item name="duplicate" title="${uiLabelMap.CommonDuplicate}"> - <link target="DuplicatePortalPage"> - <parameter param-name="portalPageId" from-field="parameters.portalPageId"/> - </link> - </menu-item> - <menu-item name="new" title="${uiLabelMap.CommonNew}"> - <link target="NewPortalPage"/> - </menu-item> - <menu-item name="refresh" title="${uiLabelMap.MyPortalRefresh}"> - <link target="EditPortalPage"> - <parameter param-name="portalPageId" from-field="parameters.portalPageId"/> - </link> - </menu-item> - </menu> </menus> \ No newline at end of file Modified: ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl?rev=942406&r1=942405&r2=942406&view=diff ============================================================================== --- ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl (original) +++ ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl Sat May 8 15:52:31 2010 @@ -40,10 +40,10 @@ under the License. </#if> </#if> -<#if parameters.portalPageId?exists && !appModelMenu.getModelMenuItemByName(headerItem)?exists && userLogin?exists> +<#if parameters.portalPageId?has_content && !appModelMenu.getModelMenuItemByName(headerItem)?exists && userLogin?exists> <#assign findMap = Static["org.ofbiz.base.util.UtilMisc"].toMap("portalPageId", parameters.portalPageId)> <#assign portalPage = delegator.findByPrimaryKeyCache("PortalPage", findMap)> - <#if portalPage?exists> + <#if portalPage?has_content> <div class="breadcrumbs-sep"> ${portalPage.portalPageName?if_exists} </div> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |