OFBiz › OFBiz - Commits

svn commit: r883769 - in /ofbiz/trunk/applications: content/widget/SurveyScreens.xml content/widget/forum/ForumScreens.xml humanres/widget/CommonScreens.xml humanres/widget/EmplLeaveScreens.xml humanres/widget/PartySkillScreens.xml

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

buscob

svn commit: r883769 - in /ofbiz/trunk/applications: content/widget/SurveyScreens.xml content/widget/forum/ForumScreens.xml humanres/widget/CommonScreens.xml humanres/widget/EmplLeaveScreens.xml humanres/widget/PartySkillScreens.xml

Author: buscob
Date: Tue Nov 24 16:30:31 2009
New Revision: 883769

URL: http://svn.apache.org/viewvc?rev=883769&view=rev
Log:
Content and Humanres component
Moved TabBar Menus from the "body" decorator-section to the "pre-body" decorator section.
This makes better the rendering of themes such as Dropping Crumbs.

Removed several redundant <section><widget> tags also

Modified:
ofbiz/trunk/applications/content/widget/SurveyScreens.xml
ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml
ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml
ofbiz/trunk/applications/humanres/widget/PartySkillScreens.xml

Modified: ofbiz/trunk/applications/content/widget/SurveyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/SurveyScreens.xml?rev=883769&r1=883768&r2=883769&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/SurveyScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/SurveyScreens.xml Tue Nov 24 16:30:31 2009
@@ -65,20 +65,26 @@
</actions>
<widgets>
<decorator-screen name="main-decorator" location="component://content/widget/CommonScreens.xml">
+ <decorator-section name="pre-body">
+ <section>
+ <condition>
+ <and>
+ <if-has-permission permission="CONTENTMGR" action="_VIEW"/>
+ <not><if-empty field="surveyId"/></not>
+ </and>
+ </condition>
+ <widgets>
+ <include-menu name="SurveyTabBar" location="component://content/widget/SurveyMenus.xml"/>
+ <container><link text="${uiLabelMap.ContentSurveyCreate}" target="EditSurvey" style="buttontext"/></container>
+ </widgets>
+ </section>
+ </decorator-section>
<decorator-section name="body">
<section>
<condition>
<if-has-permission permission="CONTENTMGR" action="_VIEW"/>
</condition>
<widgets>
- <section>
- <condition><not><if-empty field="surveyId"/></not></condition>
- <widgets>
- <include-menu name="SurveyTabBar" location="component://content/widget/SurveyMenus.xml"/>
- <container><link text="${uiLabelMap.ContentSurveyCreate}" target="EditSurvey" style="buttontext"/></container>
- </widgets>
- </section>
-
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>

Modified: ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml?rev=883769&r1=883768&r2=883769&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/forum/ForumScreens.xml Tue Nov 24 16:30:31 2009
@@ -30,20 +30,25 @@
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="pre-body">
+ <section>
+ <condition>
+ <and>
+ <if-has-permission permission="CONTENTMGR" action="_VIEW"/>
+ <not><if-empty field="tabBar"/></not>
+ </and>
+ </condition>
+ <widgets>
+ <include-menu name="${tabBar}" location="component://content/widget/forum/ForumMenus.xml"/>
+ </widgets>
+ </section>
+ </decorator-section>
<decorator-section name="body">
<section>
<condition>
<if-has-permission permission="CONTENTMGR" action="_VIEW"/>
</condition>
<widgets>
- <section>
- <condition>
- <not><if-empty field="tabBar"/></not>
- </condition>
- <widgets>
- <include-menu name="${tabBar}" location="component://content/widget/forum/ForumMenus.xml"/>
- </widgets>
- </section>
<container style="h1"><label text="${pageTitle}"/></container>
<decorator-section-include name="body"/>
</widgets>

Modified: ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/CommonScreens.xml?rev=883769&r1=883768&r2=883769&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/CommonScreens.xml Tue Nov 24 16:30:31 2009
@@ -107,6 +107,19 @@
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="pre-body">
+ <section>
+ <condition>
+ <and>
+ <if-has-permission permission="HUMANRES" action="_VIEW"/>
+ <not><if-empty field="emplPosition"/></not>
+ </and>
+ </condition>
+ <widgets>
+ <include-menu name="EmplPostionBar" location="component://humanres/widget/HumanresMenus.xml"/>
+ </widgets>
+ </section>
+ </decorator-section>
<decorator-section name="body">
<section>

@@ -114,14 +127,6 @@
<if-has-permission permission="HUMANRES" action="_VIEW"/>
</condition>
<widgets>
- <section>
- <condition>
- <not><if-empty field="emplPosition"/></not>
- </condition>
- <widgets>
- <include-menu name="EmplPostionBar" location="component://humanres/widget/HumanresMenus.xml"/>
- </widgets>
- </section>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
@@ -352,14 +357,10 @@
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="pre-body">
+ <include-menu name="GlobalHRSettingMenus" location="component://humanres/widget/HumanresMenus.xml"/>
+ </decorator-section>
<decorator-section name="body">
- <section>
- <widgets>
- <container>
- <include-menu name="GlobalHRSettingMenus" location="component://humanres/widget/HumanresMenus.xml"/>
- </container>
- </widgets>
- </section>
<decorator-section-include name="body"/>
</decorator-section>
</decorator-screen>
@@ -374,17 +375,11 @@
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="pre-body">
+ <include-menu name="RecruitmentTypeMenu" location="component://humanres/widget/HumanresMenus.xml"/>
+ </decorator-section>
<decorator-section name="body">
- <section>
- <widgets>
- <section>
- <widgets>
- <include-menu name="RecruitmentTypeMenu" location="component://humanres/widget/HumanresMenus.xml"/>
- </widgets>
- </section>
- <decorator-section-include name="body"/>
- </widgets>
- </section>
+ <decorator-section-include name="body"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -399,14 +394,10 @@
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="pre-body">
+ <include-menu name="TrainingTypeMenu" location="component://humanres/widget/HumanresMenus.xml"/>
+ </decorator-section>
<decorator-section name="body">
- <section>
- <widgets>
- <container>
- <include-menu name="TrainingTypeMenu" location="component://humanres/widget/HumanresMenus.xml"/>
- </container>
- </widgets>
- </section>
<decorator-section-include name="body"/>
</decorator-section>
</decorator-screen>

Modified: ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml?rev=883769&r1=883768&r2=883769&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/EmplLeaveScreens.xml Tue Nov 24 16:30:31 2009
@@ -36,8 +36,10 @@
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
+ <decorator-section name="pre-body">
<include-menu name="EmplLeaveTabBar" location="component://humanres/widget/HumanresMenus.xml"/>
+ </decorator-section>
+ <decorator-section name="body">
<section>
<condition>
<if-has-permission permission="HUMANRES" action="_VIEW"/>
@@ -81,8 +83,10 @@
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
+ <decorator-section name="pre-body">
<include-menu name="EmplLeaveTabBar" location="component://humanres/widget/HumanresMenus.xml"/>
+ </decorator-section>
+ <decorator-section name="body">
<section>
<condition>
<if-has-permission permission="HUMANRES" action="_VIEW"/>

Modified: ofbiz/trunk/applications/humanres/widget/PartySkillScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PartySkillScreens.xml?rev=883769&r1=883768&r2=883769&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/PartySkillScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/PartySkillScreens.xml Tue Nov 24 16:30:31 2009
@@ -24,7 +24,7 @@
<section>
<actions>
<set field="titleProperty" value="HumanResFindPartySkill"/>
- <set field="headerItem" value="PartySkills"/>
+ <set field="headerItem" value="EmplSkills"/>
<set field="partyId" from-field="parameters.partyId"/>
<set field="partySkillsCtx" from-field="parameters"/>
</actions>