Author: mor
Date: Sat May 10 06:50:59 2008
New Revision: 655087
URL: http://svn.apache.org/viewvc?rev=655087&view=rev
Log:
continuing cleanups in HR for issue OFBIZ-1486, patch from Parimal Gain
Modified:
ofbiz/trunk/applications/humanres/webapp/humanres/includes/appheader.ftl
ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml
ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml
ofbiz/trunk/applications/humanres/widget/Menus.xml
ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml
Modified:
ofbiz/trunk/applications/humanres/webapp/humanres/includes/appheader.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/webapp/humanres/includes/appheader.ftl?rev=655087&r1=655086&r2=655087&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/webapp/humanres/includes/appheader.ftl
(original)
+++ ofbiz/trunk/applications/humanres/webapp/humanres/includes/appheader.ftl
Sat May 10 06:50:59 2008
@@ -1,43 +0,0 @@
-<#--
-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.
--->
-
-<#assign selected = page.headerItem?default("void")>
-
-<div id="app-navigation">
- <h2>${uiLabelMap.HumanResManagerApplication}</h2>
- <ul>
- <li<#if selected == "main"> class="selected"</#if>><a
href="<@ofbizUrl>main</@ofbizUrl>">${uiLabelMap.CommonMain}</a></li>
- <li<#if selected == "EmplPosition"> class="selected"</#if>><a
href="<@ofbizUrl>findEmplPositions</@ofbizUrl>">${uiLabelMap.HumanResEmployeePosition}</a></li>
- <li<#if selected == "Employment"> class="selected"</#if>><a
href="<@ofbizUrl>findEmployments</@ofbizUrl>">${uiLabelMap.HumanResEmployment}</a></li>
- <li<#if selected == "PayGrade"> class="selected"</#if>><a
href="<@ofbizUrl>findPayGrades</@ofbizUrl>">${uiLabelMap.HumanResPayGrade}</a></li>
- <li<#if selected == "TerminationReason"> class="selected"</#if>><a
href="<@ofbizUrl>findTerminationReasons</@ofbizUrl>">${uiLabelMap.HumanResTerminationReason}</a></li>
- <li<#if selected == "UnemploymentClaim"> class="selected"</#if>><a
href="<@ofbizUrl>findUnemploymentClaims</@ofbizUrl>">${uiLabelMap.HumanResUnemploymentClaim}</a></li>
- <li<#if selected == "EmploymentApp"> class="selected"</#if>><a
href="<@ofbizUrl>findEmploymentApps</@ofbizUrl>">${uiLabelMap.HumanResEmploymentApp}</a></li>
- <li<#if selected == "PartySkills"> class="selected"</#if>><a
href="<@ofbizUrl>ListPartySkills</@ofbizUrl>">${uiLabelMap.HumanResListPartySkill}</a></li>
- <li<#if selected == "SkillType"> class="selected"</#if>><a
href="<@ofbizUrl>findSkillTypes</@ofbizUrl>">${uiLabelMap.HumanResSkillType}</a></li>
- <li<#if selected == "Employee"> class="selected"</#if>><a
href="<@ofbizUrl>findEmployees</@ofbizUrl>">${uiLabelMap.HumanResEmployee}</a></li>
- <li<#if selected == "ResponsibilityType"> class="selected"</#if>><a
href="<@ofbizUrl>FindResponsibilityType</@ofbizUrl>">${uiLabelMap.HumanResResponsibilityType}</a></li>
- <#if userLogin?has_content>
- <li class="opposed"><a
href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li>
- <#else>
- <li class="opposed"><a
href="<@ofbizUrl>${checkLoginUrl?if_exists}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li>
- </#if>
- </ul>
- <br class="clear"/>
-</div>
Modified: ofbiz/trunk/applications/humanres/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/CommonScreens.xml?rev=655087&r1=655086&r2=655087&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/CommonScreens.xml Sat May 10
06:50:59 2008
@@ -36,7 +36,8 @@
<set field="activeApp" value="humanres" global="true"/>
<set field="layoutSettings.javaScripts[]"
value="/partymgr/static/partymgr.js" global="true"/>
<set field="layoutSettings.styleSheets[]"
value="/partymgr/static/partymgr.css" global="true"/>
- <set field="appheaderTemplate"
value="component://humanres/webapp/humanres/includes/appheader.ftl"
global="true"/>
+ <set field="applicationMenuName" value="HumanResAppBar"
global="true"/>
+ <set field="applicationMenuLocation"
value="component://humanres/widget/Menus.xml" global="true"/>
</actions>
<widgets>
<include-screen name="GlobalDecorator"
location="component://common/widget/CommonScreens.xml"/>
Modified: ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml?rev=655087&r1=655086&r2=655087&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/EmplPositionScreens.xml Sat May 10
06:50:59 2008
@@ -105,7 +105,7 @@
<section>
<widgets>
<container>
- <link
target="EditEmplPositionFulfillments"
text="${uiLabelMap.HumanResNewEmplPositionFulfillment}" style="buttontext"/>
+ <link
target="EditEmplPositionFulfillments?emplPositionId=${emplPositionId}"
text="${uiLabelMap.HumanResNewEmplPositionFulfillment}" style="buttontext"/>
</container>
<include-form
name="ListEmplPositionFulfillments"
location="component://humanres/widget/forms/EmplPositionForms.xml"/>
</widgets>
@@ -151,7 +151,7 @@
<section>
<widgets>
<container>
- <link
target="EditEmplPositionResponsibility"
text="${uiLabelMap.HumanResNewEmplPositionResponsibility}" style="buttontext"/>
+ <link
target="EditEmplPositionResponsibilities?emplPositionId=${emplPositionId}"
text="${uiLabelMap.HumanResNewEmplPositionResponsibility}" style="buttontext"/>
</container>
<include-form
name="ListEmplPositionResponsibilities"
location="component://humanres/widget/forms/EmplPositionForms.xml"/>
</widgets>
Modified: ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml?rev=655087&r1=655086&r2=655087&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/EmploymentScreens.xml Sat May 10
06:50:59 2008
@@ -561,6 +561,7 @@
<section>
<actions>
<set field="titleProperty" value="PartyCreateNewEmployee"/>
+ <set field="headerItem" value="Employee"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
Modified: ofbiz/trunk/applications/humanres/widget/Menus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/Menus.xml?rev=655087&r1=655086&r2=655087&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/Menus.xml Sat May 10 06:50:59 2008
@@ -20,6 +20,28 @@
<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd";>
+ <menu name="HumanResAppBar" default-menu-item-name="main"
id="app-navigation" type="simple"
title="${uiLabelMap.HumanResManagerApplication}"
+ default-selected-style="selected" menu-container-style="button-bar
tab-bar" selected-menuitem-context-field-name="headerItem">
+ <menu-item name="main" title="${uiLabelMap.CommonMain}"><link
target="main"/></menu-item>
+ <menu-item name="EmplPosition"
title="${uiLabelMap.HumanResEmployeePosition}"><link
target="findEmplPositions"/></menu-item>
+ <menu-item name="Employment"
title="${uiLabelMap.HumanResEmployment}"><link
target="findEmployments"/></menu-item>
+ <menu-item name="PayGrade"
title="${uiLabelMap.HumanResPayGrade}"><link
target="findPayGrades"/></menu-item>
+ <menu-item name="TerminationReason"
title="${uiLabelMap.HumanResTerminationReason}"><link
target="findTerminationReasons"/></menu-item>
+ <menu-item name="UnemploymentClaim"
title="${uiLabelMap.HumanResUnemploymentClaim}"><link
target="findUnemploymentClaims"/></menu-item>
+ <menu-item name="EmploymentApp"
title="${uiLabelMap.HumanResEmploymentApp}"><link
target="findEmploymentApps"/></menu-item>
+ <menu-item name="PartySkills"
title="${uiLabelMap.HumanResListPartySkill}"><link
target="ListPartySkills"/></menu-item>
+ <menu-item name="SkillType"
title="${uiLabelMap.HumanResSkillType}"><link
target="findSkillTypes"/></menu-item>
+ <menu-item name="Employee"
title="${uiLabelMap.HumanResEmployee}"><link
target="findEmployees"/></menu-item>
+ <menu-item name="ResponsibilityType"
title="${uiLabelMap.HumanResResponsibilityType}"><link
target="FindResponsibilityType"/></menu-item>
+ <menu-item name="Logout" title="${uiLabelMap.CommonLogout}"
align-style="col-right" selected-style="selected">
+ <condition><not><if-empty
field-name="userLogin"/></not></condition>
+ <link target="logout"/>
+ </menu-item>
+ <menu-item name="Login" title="${uiLabelMap.CommonLogin}"
align-style="col-right" selected-style="selected">
+ <condition><if-empty field-name="userLogin"/></condition>
+ <link target="${checkLoginUrl}"/>
+ </menu-item>
+ </menu>
<menu name="EmploymentBar" default-menu-item-name="EditPartyBenefit"
default-selected-style="selected"
type="simple" menu-container-style="button-bar tab-bar">
<menu-item name="EditPartyBenefit"
title="${uiLabelMap.HumanResEditPartyBenefit}">
Modified: ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml?rev=655087&r1=655086&r2=655087&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/PartyAbilityScreens.xml Sat May 10
06:50:59 2008
@@ -357,7 +357,7 @@
<section>
<actions>
<set field="titleProperty"
value="PageTitleEditResponsibilityType"/>
- <set field="tabButtonItem" value="EditResponsibilityType"/>
+ <set field="headerItem" value="EditResponsibilityType"/>
<set field="responsibilityTypeId"
from-field="parameters.responsibilityTypeId"/>
<entity-one entity-name="ResponsibilityType"
value-name="responsibilityType"/>
</actions>
