svn commit: r731263 - in /ofbiz/trunk/applications/content: config/ContentUiLabels.xml webapp/content/WEB-INF/controller.xml webapp/content/website/WebSiteForms.xml widget/CommonScreens.xml widget/WebSiteScreens.xml widget/content/ContentMenus.xml

[hansbak-2]

Author: hansbak
Date: Sun Jan  4 06:55:18 2009
New Revision: 731263

URL: http://svn.apache.org/viewvc?rev=731263&view=rev
Log:
add aliaslist to website screens

Modified:
    ofbiz/trunk/applications/content/config/ContentUiLabels.xml
    ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml
    ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml
    ofbiz/trunk/applications/content/widget/CommonScreens.xml
    ofbiz/trunk/applications/content/widget/WebSiteScreens.xml
    ofbiz/trunk/applications/content/widget/content/ContentMenus.xml

Modified: ofbiz/trunk/applications/content/config/ContentUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentUiLabels.xml?rev=731263&r1=731262&r2=731263&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/config/ContentUiLabels.xml (original)
+++ ofbiz/trunk/applications/content/config/ContentUiLabels.xml Sun Jan  4 06:55:18 2009
@@ -686,6 +686,9 @@
         <value xml:lang="en">Path Alias</value>
         <value xml:lang="fr">Alias de chemin d'accès</value>
     </property>
+    <property key="ContentPathAliasList">
+        <value xml:lang="en">Path Alias list</value>
+    </property>
     <property key="ContentQueryLine">
         <value xml:lang="ar">أدخل متغيرات المسألة</value>
         <value xml:lang="de">Geben Sie die Suchparamter an</value>

Modified: ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml?rev=731263&r1=731262&r2=731263&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml Sun Jan  4 06:55:18 2009
@@ -242,6 +242,12 @@
         <response name="error" type="view" value="EditWebSiteParties"/>
     </request-map>
 
+    <!-- ================ WebSite alias Requests ================= -->
+    <request-map uri="WebSiteAliases">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="WebSiteAliases"/>
+    </request-map>
+
     <!-- ================ WebSite CMS Requests ================= -->
     <request-map uri="WebSiteCms">
         <security https="true" auth="true"/>
@@ -1672,6 +1678,7 @@
     
     <view-map name="FindWebSite" page="component://content/widget/WebSiteScreens.xml#FindWebSite" type="screen"/>
     <view-map name="EditWebSite" page="component://content/widget/WebSiteScreens.xml#EditWebSite" type="screen"/>
+    <view-map name="WebSiteAliases" page="component://content/widget/WebSiteScreens.xml#WebSiteAliases" type="screen"/>
     <view-map name="WebSiteContent" page="component://content/widget/WebSiteScreens.xml#WebSiteContent" type="screen"/>
     <view-map name="WebSiteCMS" page="component://content/widget/WebSiteScreens.xml#WebSiteCMS" type="screen"/>
     <view-map name="WebSiteCMSContent" page="component://content/widget/WebSiteScreens.xml#WebSiteCMSContent" type="screen"/>

Modified: ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml?rev=731263&r1=731262&r2=731263&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml Sun Jan  4 06:55:18 2009
@@ -56,7 +56,19 @@
         <field name="siteName" title="${uiLabelMap.CommonName}"><display/></field>
         <field name="httpHost"><display/></field>
     </form>
-
+    
+    <form name="WebSitePathAlias" target="" title="" type="list" list-name="aliases" paginate-target="WebSiteAliases" paginate="true"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <field name="pathAlias"><display/></field>
+        <field name="pathAliasTo"><display/></field>
+        <field name="mapKey"><display/></field>
+        <field name="contentId">
+            <display-entity entity-name="Content" description="${contentName}">
+                <sub-hyperlink target="EditContent?contentId=${contentId}" description=" [${contentId}]"/>
+            </display-entity>
+        </field>
+    </form>
+    
     <!-- WebSite Content Forms -->
     <form name="ListWebSiteContent" type="list" list-name="webSiteContent" target="UpdateWebSiteContent"
         paginate-target="ListWebSiteContent" paginate="true" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">

Modified: ofbiz/trunk/applications/content/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/CommonScreens.xml?rev=731263&r1=731262&r2=731263&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/CommonScreens.xml Sun Jan  4 06:55:18 2009
@@ -239,6 +239,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}}"/>
                                 <decorator-section-include name="body"/>
                             </widgets>
                             <fail-widgets>

Modified: ofbiz/trunk/applications/content/widget/WebSiteScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/WebSiteScreens.xml?rev=731263&r1=731262&r2=731263&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/WebSiteScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/WebSiteScreens.xml Sun Jan  4 06:55:18 2009
@@ -109,7 +109,6 @@
                 <set field="labelTitleProperty" value="PageTitleEditWebSiteContent"/>
                 <set field="webSiteId" from-field="parameters.webSiteId"/>
                 <entity-one entity-name="WebSite" value-name="webSite"/>
-                
                 <entity-and entity-name="WebSiteContent" list-name="webSiteContent">
                     <field-map field-name="webSiteId" env-name="webSiteId"/>
                 </entity-and>                
@@ -317,24 +316,13 @@
             </actions>
             <widgets>
                 <container id="cmscontent">
-                    <container style="screenlet">
-                        <container style="screenlet-title-bar">
-                            <container style="h3">
-                                <label text="${uiLabelMap.PageTitleWebSiteCMSContent}"/>
-                            </container>
-                        </container>
-                        <container style="screenlet-body">
-                            <section>
-                                <widgets>    
-                                    <platform-specific>
-                                        <html>
-                                            <html-template location="component://content/webapp/content/website/WebSiteCMSContent.ftl"/>
-                                       </html>
-                                    </platform-specific>
-                                </widgets>
-                            </section>
-                        </container>
-                   </container>
+                    <screenlet title="${uiLabelMap.PageTitleWebSiteCMSContent}">
+                        <platform-specific>
+                            <html>
+                                <html-template location="component://content/webapp/content/website/WebSiteCMSContent.ftl"/>
+                            </html>
+                        </platform-specific>
+                    </screenlet>
                </container>
             </widgets>
         </section>
@@ -405,4 +393,26 @@
             </widgets>
         </section>
     </screen>
+    <screen name="WebSiteAliases">
+        <section>
+            <actions>
+                <set field="titleProperty" value="ContentPathAlias"/>
+                <set field="webSiteId" from-field="parameters.webSiteId"/>
+                <entity-one entity-name="WebSite" value-name="webSite"/>
+                <set field="tabButtonItem" value="PathAlias"/>
+                <entity-and entity-name="WebSitePathAlias" list-name="aliases">
+                    <field-map field-name="webSiteId" env-name="parameters.webSiteId"/>
+                </entity-and>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonWebSiteDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <screenlet title="${uiLabelMap.ContentPathAliasList}" navigation-form-name="WebSitePathAlias">
+                            <include-form name="WebSitePathAlias" location="component://content/webapp/content/website/WebSiteForms.xml"/>
+                        </screenlet>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
 </screens>
\ No newline at end of file

Modified: ofbiz/trunk/applications/content/widget/content/ContentMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentMenus.xml?rev=731263&r1=731262&r2=731263&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentMenus.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/ContentMenus.xml Sun Jan  4 06:55:18 2009
@@ -122,6 +122,9 @@
         <menu-item name="ListWebSiteContent" title="${uiLabelMap.ContentContent}">
             <link target="ListWebSiteContent?webSiteId=${parameters.webSiteId}"/>
         </menu-item>
+        <menu-item name="PathAlias" title="${uiLabelMap.ContentPathAlias}">
+            <link target="WebSiteAliases?webSiteId=${parameters.webSiteId}"/>
+        </menu-item>
         <menu-item name="EditWebSiteParties" title="${uiLabelMap.PartyParties}">
             <link target="EditWebSiteParties?webSiteId=${parameters.webSiteId}"/>
         </menu-item>