OFBiz › OFBiz - Commits

svn commit: r1653481 - in /ofbiz/trunk/framework/webtools: config/ data/helpdata/ webapp/webtools/ webapp/webtools/WEB-INF/ widget/

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
jleroux@apache.org
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r1653481 - in /ofbiz/trunk/framework/webtools: config/ data/helpdata/ webapp/webtools/ webapp/webtools/WEB-INF/ widget/

jleroux@apache.org
Author: jleroux
Date: Wed Jan 21 11:27:16 2015
New Revision: 1653481

URL: http://svn.apache.org/r1653481
Log:
A slightly modified patch from Pierre Smits for "Remove Portal Management code from Framework/WebTools." https://issues.apache.org/jira/browse/OFBIZ-5817

Remove code related to Portal Management functionality from WebTools after equivalent code in MyPortal has been committed.

jleroux: I just removed also the FindPortalPage entry in Webtools main.ftl

Removed:
    ofbiz/trunk/framework/webtools/widget/PortalAdmForms.xml
    ofbiz/trunk/framework/webtools/widget/PortalAdmScreens.xml
Modified:
    ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
    ofbiz/trunk/framework/webtools/data/helpdata/HELP_WEBTOOLS_main.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

Modified: ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml?rev=1653481&r1=1653480&r2=1653481&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml (original)
+++ ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml Wed Jan 21 11:27:16 2015
@@ -565,16 +565,6 @@
         <value xml:lang="zh">查找任务</value>
         <value xml:lang="zh-TW">尋找任務</value>
     </property>
-    <property key="PageTitleFindPortalPage">
-        <value xml:lang="en">Find Portal page</value>
-        <value xml:lang="fr">Rech. page portail</value>
-        <value xml:lang="it">Ricerca pagine portale</value>
-        <value xml:lang="ja">ポータルページを検索</value>
-        <value xml:lang="pt">Encontrar a página do Portal</value>
-        <value xml:lang="vi">Tìm trang Cổng thông tin</value>
-        <value xml:lang="zh">查找门户页面</value>
-        <value xml:lang="zh-TW">查詢入口網頁</value>
-    </property>
     <property key="PageTitleFindUtilCache">
         <value xml:lang="de">Cache Wartungsseite</value>
         <value xml:lang="en">Cache Maintenance Page</value>
@@ -801,14 +791,6 @@
         <value xml:lang="zh">调整调试级别</value>
         <value xml:lang="zh-TW">調整偵錯級別</value>
     </property>
-    <property key="WebtoolsAdminPortalPage">
-        <value xml:lang="en">Portal page Admin.</value>
-        <value xml:lang="fr">Admin. Page portail</value>
-        <value xml:lang="ja">ポータルページの管理</value>
-        <value xml:lang="vi">Quản trị Cổng thông tin</value>
-        <value xml:lang="zh">门户页面管理</value>
-        <value xml:lang="zh-TW">入口網頁面管理</value>
-    </property>
     <property key="WebtoolsAdministration">
         <value xml:lang="de">Administration</value>
         <value xml:lang="en">Administration</value>

Modified: ofbiz/trunk/framework/webtools/data/helpdata/HELP_WEBTOOLS_main.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/data/helpdata/HELP_WEBTOOLS_main.xml?rev=1653481&r1=1653480&r2=1653481&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/data/helpdata/HELP_WEBTOOLS_main.xml (original)
+++ ofbiz/trunk/framework/webtools/data/helpdata/HELP_WEBTOOLS_main.xml Wed Jan 21 11:27:16 2015
@@ -44,8 +44,5 @@ License.
       <listitem>
         <para>The <link xl:href="">Configuration</link> section is used to set parameters for the OFBiz system.</para>
       </listitem>
-      <listitem>
-        <para>The <link xl:href="">Portal Page Admin.</link> section is used to browse and edit all Portal Pages defined in the system.</para>
-      </listitem>
     </itemizedlist>
 </section>

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=1653481&r1=1653480&r2=1653481&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml Wed Jan 21 11:27:16 2015
@@ -541,37 +541,6 @@ 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="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>
-
     <!-- Geo Management -->
     <request-map uri="FindGeo"><security https="true" auth="true"/><response name="success" type="view" value="FindGeo" save-home-view="true"/></request-map>
     <request-map uri="EditGeo"><security https="true" auth="true"/><response name="success" type="view" value="EditGeo"/></request-map>
@@ -701,11 +670,6 @@ 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"/>
-
     <!-- Geo Management -->
     <view-map name="FindGeo" type="screen" page="component://webtools/widget/GeoManagementScreens.xml#FindGeo"/>
     <view-map name="EditGeo" type="screen" page="component://webtools/widget/GeoManagementScreens.xml#EditGeo"/>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl?rev=1653481&r1=1653480&r2=1653481&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl Wed Jan 21 11:27:16 2015
@@ -96,7 +96,6 @@ under the License.
         </#if>
         <li><h3>${uiLabelMap.WebtoolsMiscSetupTools}</h3></li>
         <#if security.hasPermission("PORTALPAGE_ADMIN", session)>
-          <li><a href="<@ofbizUrl>FindPortalPage</@ofbizUrl>">${uiLabelMap.WebtoolsAdminPortalPage}</a></li>
           <li><a href="<@ofbizUrl>FindGeo</@ofbizUrl>">${uiLabelMap.WebtoolsGeoManagement}</a></li>
           <li><a href="<@ofbizUrl>WebtoolsLayoutDemo</@ofbizUrl>">${uiLabelMap.WebtoolsLayoutDemo}</a></li>
         </#if>

Modified: ofbiz/trunk/framework/webtools/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/Menus.xml?rev=1653481&r1=1653480&r2=1653481&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/Menus.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/Menus.xml Wed Jan 21 11:27:16 2015
@@ -47,10 +47,6 @@ under the License.
         </menu-item>
         <menu-item name="geoManagement" title="${uiLabelMap.WebtoolsGeoManagement}">
             <link target="FindGeo"/>
-        </menu-item>        
-        <menu-item name="portalAdmin" title="${uiLabelMap.WebtoolsAdminPortalPage}">
-            <condition><if-has-permission permission="PORTALPAGE_ADMIN"/></condition>
-            <link target="FindPortalPage"/>
         </menu-item>
         <menu-item name="security" title="${uiLabelMap.CommonSecurity}">
             <condition>
@@ -203,22 +199,6 @@ 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>
-
     <menu name="StatsTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
           selected-menuitem-context-field-name="tabButtonItem">
         <menu-item name="stats" title="${uiLabelMap.WebtoolsStatistics}">


Free forum by Nabble Edit this page