svn commit: r731258 - in /ofbiz/trunk/applications/cont
Locked
 
|
Author: hansbak
Date: Sun Jan 4 05:38:40 2009 New Revision: 731258 URL: http://svn.apache.org/viewvc?rev=731258&view=rev Log: replaced website ftl menu with menu widget and moved decorator to commonscreens Removed: ofbiz/trunk/applications/content/webapp/content/website/WebSiteTabBar.ftl Modified: 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/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/CommonScreens.xml?rev=731258&r1=731257&r2=731258&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/CommonScreens.xml Sun Jan 4 05:38:40 2009 @@ -222,6 +222,35 @@ </section> </screen> + <screen name="CommonWebSiteDecorator"> + <section> + <actions> + <set field="headerItem" value="websites"/> + </actions> + <widgets> + <decorator-screen name="main-decorator" location="component://content/widget/CommonScreens.xml"> + <decorator-section name="body"> + <section> + <condition> + <if-has-permission permission="CONTENTMGR" action="_VIEW"/> + </condition> + <widgets> + <include-menu name="website" location="component://content/widget/content/ContentMenus.xml"/> + <container style="widget-container"> + <link text="${uiLabelMap.CommonCreateNew} ${uiLabelMap.ContentWebSite}" target="EditWebSite" style="buttontext"/> + </container> + <decorator-section-include name="body"/> + </widgets> + <fail-widgets> + <label style="h3">${uiLabelMap.ContentViewPermissionError}</label> + </fail-widgets> + </section> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="commonLayoutDecorator"> <section> <actions> Modified: ofbiz/trunk/applications/content/widget/WebSiteScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/WebSiteScreens.xml?rev=731258&r1=731257&r2=731258&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/WebSiteScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/WebSiteScreens.xml Sun Jan 4 05:38:40 2009 @@ -65,35 +65,6 @@ </section> </screen> - <screen name="CommonWebSiteDecorator"> - <section> - <actions> - <set field="headerItem" value="websites"/> - </actions> - <widgets> - <decorator-screen name="main-decorator" location="component://content/widget/CommonScreens.xml"> - <decorator-section name="body"> - <section> - <condition> - <if-has-permission permission="CONTENTMGR" action="_VIEW"/> - </condition> - <widgets> - <platform-specific><html><html-template location="component://content/webapp/content/website/WebSiteTabBar.ftl"/></html></platform-specific> - <container style="widget-container"> - <link text="${uiLabelMap.CommonCreateNew} ${uiLabelMap.ContentWebSite}" target="EditWebSite" style="buttontext"/> - </container> - <decorator-section-include name="body"/> - </widgets> - <fail-widgets> - <label style="h3">${uiLabelMap.ContentViewPermissionError}</label> - </fail-widgets> - </section> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="EditWebSite"> <section> <actions> @@ -104,7 +75,7 @@ <entity-one entity-name="WebSite" value-name="webSite"/> </actions> <widgets> - <decorator-screen name="CommonWebSiteDecorator"> + <decorator-screen name="CommonWebSiteDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <section> <widgets> @@ -144,7 +115,7 @@ </entity-and> </actions> <widgets> - <decorator-screen name="CommonWebSiteDecorator"> + <decorator-screen name="CommonWebSiteDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <section> <widgets> @@ -210,7 +181,7 @@ <script location="component://content/webapp/content/WEB-INF/actions/website/EditWebSiteParties.groovy"/> </actions> <widgets> - <decorator-screen name="CommonWebSiteDecorator"> + <decorator-screen name="CommonWebSiteDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <section> <widgets> @@ -239,7 +210,7 @@ <script location="component://content/webapp/content/WEB-INF/actions/website/WebSitePublishPoint.groovy"/> </actions> <widgets> - <decorator-screen name="CommonWebSiteDecorator"> + <decorator-screen name="CommonWebSiteDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <section> <condition> Modified: ofbiz/trunk/applications/content/widget/content/ContentMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentMenus.xml?rev=731258&r1=731257&r2=731258&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/content/ContentMenus.xml (original) +++ ofbiz/trunk/applications/content/widget/content/ContentMenus.xml Sun Jan 4 05:38:40 2009 @@ -112,5 +112,21 @@ <link target="EditContentAssoc?contentId=${parameters.contentId}"/> </menu-item> </menu> - + + <menu name="website" menu-container-style="button-bar tab-bar" default-selected-style="selected" default-menu-item-name="content" default-permission-operation="CONTENT_ADMIN" + default-permission-entity-action="_ADMIN" default-associated-content-id="${userLogin.userLoginId}" selected-menuitem-context-field-name="tabButtonItem" + title="" type="simple"> + <menu-item name="EditWebSite" title="${uiLabelMap.ContentWebSite}"> + <link target="EditWebSite?webSiteId=${parameters.webSiteId}"/> + </menu-item> + <menu-item name="ListWebSiteContent" title="${uiLabelMap.ContentContent}"> + <link target="ListWebSiteContent?webSiteId=${parameters.webSiteId}"/> + </menu-item> + <menu-item name="EditWebSiteParties" title="${uiLabelMap.PartyParties}"> + <link target="EditWebSiteParties?webSiteId=${parameters.webSiteId}"/> + </menu-item> + <menu-item name="WebSiteCMS" title="${uiLabelMap.ContentCMS}"> + <link target="WebSiteCms?webSiteId=${parameters.webSiteId}"/> + </menu-item> + </menu> </menus> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |