svn commit: r805012 [11/11] - in /ofbiz/branches/executionconte
Locked
svn commit: r805012 [11/11] - in /ofbiz/branches/executionconte
 
|
Modified: ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy Mon Aug 17 15:42:56 2009 @@ -46,7 +46,7 @@ if (timesheets) { timesheet = timesheets[0]; } else { - result = dispatcher.runSync("createProjectTimesheet", ["userLogin" : parameters.userLogin, "partyId" : partyId]); + result = dispatcher.runSync("createProjectTimesheet", ["userLogin" : parameters.userLogin, "partyId" : partyId]); if (result && result.timesheetId) { timesheet = delegator.findByPrimaryKey("Timesheet", ["timesheetId" : result.timesheetId]); } Modified: ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListCurrentProjects.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListCurrentProjects.groovy?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListCurrentProjects.groovy (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListCurrentProjects.groovy Mon Aug 17 15:42:56 2009 @@ -28,13 +28,13 @@ projects = []; allProjects.each { project -> result = dispatcher.runSync("getProject", ["userLogin" : parameters.userLogin, "projectId" : project.workEffortId]); - if (result.projectInfo) { - resultAssign = delegator.findByAnd("WorkEffortPartyAssignment", ["partyId" : parameters.userLogin.partyId, "workEffortId" : project.workEffortId]) - if (security.hasEntityPermission("PROJECTMGR", "_ADMIN", session) - || ((security.hasEntityPermission("PROJECTMGR", "_ROLE_ADMIN", session) || security.hasEntityPermission("PROJECTMGR", "_ROLE_VIEW", session)) && resultAssign)) { - projects.add(result.projectInfo); - } - } + if (result.projectInfo) { + resultAssign = delegator.findByAnd("WorkEffortPartyAssignment", ["partyId" : parameters.userLogin.partyId, "workEffortId" : project.workEffortId]) + if (security.hasEntityPermission("PROJECTMGR", "_ADMIN", session) + || ((security.hasEntityPermission("PROJECTMGR", "_ROLE_ADMIN", session) || security.hasEntityPermission("PROJECTMGR", "_ROLE_VIEW", session)) && resultAssign)) { + projects.add(result.projectInfo); + } + } } if (projects) { context.projects = projects; Modified: ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ProjectIsBillable.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ProjectIsBillable.groovy?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ProjectIsBillable.groovy (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ProjectIsBillable.groovy Mon Aug 17 15:42:56 2009 @@ -25,17 +25,17 @@ toPartyId = null; fromPartyId = null; projectMembers.each {member -> - if (member.roleTypeId.equals("INTERNAL_ORGANIZATIO")) { - fromPartyId = member.partyId; - } - if (member.roleTypeId.equals("CLIENT_BILLING")) { - toPartyId = member.partyId; - } - if (fromPartyId && toPartyId && fromPartyId.equals(toPartyId)) { - context.isBillable = false; - } else if (!toPartyId || !fromPartyId){ + if (member.roleTypeId.equals("INTERNAL_ORGANIZATIO")) { + fromPartyId = member.partyId; + } + if (member.roleTypeId.equals("CLIENT_BILLING")) { + toPartyId = member.partyId; + } + if (fromPartyId && toPartyId && fromPartyId.equals(toPartyId)) { context.isBillable = false; - } else { - context.isBillable = true; - } + } else if (!toPartyId || !fromPartyId){ + context.isBillable = false; + } else { + context.isBillable = true; + } } Modified: ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getLastRequestAssignment.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getLastRequestAssignment.groovy?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getLastRequestAssignment.groovy (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getLastRequestAssignment.groovy Mon Aug 17 15:42:56 2009 @@ -24,16 +24,16 @@ custRequestList = delegator.findByAnd("CustRequest", ["fromPartyId" : fromPartyId], ["-createdDate"]); if (custRequestList) { - custReqTaskList = custRequestList.get(0).getRelated("CustRequestWorkEffort"); - if (custReqTaskList) { + custReqTaskList = custRequestList.get(0).getRelated("CustRequestWorkEffort"); + if (custReqTaskList) { custReqTask = custReqTaskList.get(0).getRelatedOne("WorkEffort"); // phase projectChildWorkEffort = custReqTask.getRelatedOne("ParentWorkEffort"); // phase name - if (projectChildWorkEffort) { - partyList = custReqTask.getRelated("WorkEffortPartyAssignment"); - if (partyList) { - context.childWorkEffortId = projectChildWorkEffort.workEffortId; - context.partyId= partyList.get(0).partyId; - } - } - } + if (projectChildWorkEffort) { + partyList = custReqTask.getRelated("WorkEffortPartyAssignment"); + if (partyList) { + context.childWorkEffortId = projectChildWorkEffort.workEffortId; + context.partyId= partyList.get(0).partyId; + } + } + } } \ No newline at end of file Modified: ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl Mon Aug 17 15:42:56 2009 @@ -47,15 +47,15 @@ </td> <td align="right" valign="top" width="15%"> <#if note.internalNote?if_exists == "N"> - <div>${uiLabelMap.ProjectMgrPrintableNote}</div> - <#if project?has_content> + <div>${uiLabelMap.ProjectMgrPrintableNote}</div> + <#if project?has_content> <a href="<@ofbizUrl>updateProjectNote?workEffortId=${project.workEffortId?if_exists}¬eId=${note.noteId}&internalNote=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNotesPrivate}</a> <#else> <a href="<@ofbizUrl>updateTaskNoteSummary?workEffortId=${task.workEffortId?if_exists}¬eId=${note.noteId}&internalNote=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNotesPrivate}</a> </#if> </#if> <#if note.internalNote?if_exists == "Y"> - <div>${uiLabelMap.OrderNotPrintableNote}</div> + <div>${uiLabelMap.OrderNotPrintableNote}</div> <#if project?has_content> <a href="<@ofbizUrl>updateProjectNote?workEffortId=${project.workEffortId?if_exists}¬eId=${note.noteId}&internalNote=N</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNotesPublic}</a> <#else> @@ -111,8 +111,8 @@ <select name="internalNote" size="1"><option value=""></option><option value="Y" selected>${uiLabelMap.CommonYes}</option><option value="N">${uiLabelMap.CommonNo}</option></select></td> </tr> <tr> - <td/><td><i>${uiLabelMap.OrderInternalNoteMessage}</i></td> - </tr> + <td/><td><i>${uiLabelMap.OrderInternalNoteMessage}</i></td> + </tr> </table> <#if project?has_content> <a href="javascript:document.createnoteform.submit()" class="buttontext">${uiLabelMap.CommonSave}</a> Modified: ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl Mon Aug 17 15:42:56 2009 @@ -23,8 +23,8 @@ </ul> <br class="clear"/> </div> - <table class="basic-table hover-bar" cellspacing="0" > - <tr class="header-row"> + <table class="basic-table hover-bar" cellspacing="0" > + <tr class="header-row"> <td> ${uiLabelMap.CommonNbr} </td> @@ -34,9 +34,9 @@ <td> </td> </tr> - <#list custRequestItems as custRequestItemList> - <#if custRequestItemList.custRequestItemSeqId?has_content> - <tr class="header-row"> + <#list custRequestItems as custRequestItemList> + <#if custRequestItemList.custRequestItemSeqId?has_content> + <tr class="header-row"> <td> </td> <td colspan="2"> @@ -44,7 +44,7 @@ <td> </td> </tr> - <tr> + <tr> <td> <a href="<@ofbizUrl>requestitem?custRequestId=${custRequestItemList.custRequestId}&custRequestItemSeqId=${custRequestItemList.custRequestItemSeqId}</@ofbizUrl>" class="linktext">${custRequestItemList.custRequestItemSeqId}</a> </td> @@ -70,29 +70,29 @@ ${uiLabelMap.CommonDate} </td> </tr> - <#list custRequestItemNoteViews as custRequestItemNoteViewList> - <#if custRequestItemNoteViewList.custRequestItemSeqId == custRequestItemList.custRequestItemSeqId> - <#if row?has_content> - <#assign row=""> - <#else> - <#assign row="alternate-row"> - </#if> - <tr class="${row}"> - <td> - </td> - <td> - ${custRequestItemNoteViewList.noteId} - </td> - <td > - ${custRequestItemNoteViewList.noteInfo} - </td> - <td> - ${custRequestItemNoteViewList.noteDateTime.toString().substring(0,10)} - </td> - </tr> - </#if> - </#list> - </#if> - </#list> - </table> + <#list custRequestItemNoteViews as custRequestItemNoteViewList> + <#if custRequestItemNoteViewList.custRequestItemSeqId == custRequestItemList.custRequestItemSeqId> + <#if row?has_content> + <#assign row=""> + <#else> + <#assign row="alternate-row"> + </#if> + <tr class="${row}"> + <td> + </td> + <td> + ${custRequestItemNoteViewList.noteId} + </td> + <td > + ${custRequestItemNoteViewList.noteInfo} + </td> + <td> + ${custRequestItemNoteViewList.noteDateTime.toString().substring(0,10)} + </td> + </tr> + </#if> + </#list> + </#if> + </#list> + </table> </div> \ No newline at end of file Modified: ofbiz/branches/executioncontext20090812/specialpurpose/shark/src/org/enhydra/shark/ThreadedToolAgentManager.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/shark/src/org/enhydra/shark/ThreadedToolAgentManager.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/shark/src/org/enhydra/shark/ThreadedToolAgentManager.java (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/shark/src/org/enhydra/shark/ThreadedToolAgentManager.java Mon Aug 17 15:42:56 2009 @@ -187,7 +187,7 @@ XMLUtil.getPackage(app).getId(), ((isProcessApp)? cOwn.get("Id").toValue() : null), applicationId - ); + ); SharkUtilities.commitMappingTransaction(t); } catch (RootException e) { SharkUtilities.rollbackMappingTransaction(t,e); Modified: ofbiz/branches/executioncontext20090812/specialpurpose/shark/src/org/ofbiz/shark/container/SharkContainer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/shark/src/org/ofbiz/shark/container/SharkContainer.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/shark/src/org/ofbiz/shark/container/SharkContainer.java (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/shark/src/org/ofbiz/shark/container/SharkContainer.java Mon Aug 17 15:42:56 2009 @@ -142,7 +142,7 @@ if (iiopHost != null && iiopHost.value != null && iiopHost.value.length() > 0) { if (iiopPort != null && iiopPort.value != null && iiopPort.value.length() > 0) { try { - p = Runtime.getRuntime().exec( java_home + "\\" + "bin\\tnameserv" + p = Runtime.getRuntime().exec(java_home + "\\" + "bin\\tnameserv" + " -ORBInitialPort " + iiopPort.value); Thread.sleep(5000); Modified: ofbiz/branches/executioncontext20090812/specialpurpose/shark/src/org/ofbiz/shark/instance/EntityPersistentMgr.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/shark/src/org/ofbiz/shark/instance/EntityPersistentMgr.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/shark/src/org/ofbiz/shark/instance/EntityPersistentMgr.java (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/shark/src/org/ofbiz/shark/instance/EntityPersistentMgr.java Mon Aug 17 15:42:56 2009 @@ -1045,7 +1045,7 @@ ProcessId = (String)st.nextElement(); strtoc = new StringTokenizer(ProcessId, "\'"); ProcessId = strtoc.nextToken(); - } else if ( element.equals("ActivityStates")) + } else if (element.equals("ActivityStates")) { st.nextElement(); st.nextElement(); Modified: ofbiz/branches/executioncontext20090812/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityApplicationMap.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityApplicationMap.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityApplicationMap.java (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityApplicationMap.java Mon Aug 17 15:42:56 2009 @@ -144,14 +144,14 @@ } public boolean equalsByKeys(ApplicationMap applicationMap) { - if (applicationMap == null ) return false; + if (applicationMap == null) return false; if ((applicationMap.getPackageId() != null && this.getPackageId() != null)) if (!(applicationMap.getPackageId().equals(this.getPackageId()))) return false; if ((applicationMap.getProcessDefinitionId() != null && this.getProcessDefinitionId() != null)) - if ( !(applicationMap.getProcessDefinitionId().equals(this.getProcessDefinitionId()))) + if (!(applicationMap.getProcessDefinitionId().equals(this.getProcessDefinitionId()))) return false; if ((applicationMap.getApplicationDefinitionId() != null && this.getApplicationDefinitionId() != null)) Modified: ofbiz/branches/executioncontext20090812/specialpurpose/webpos/webapp/webpos/manager/PaidOutAndIn.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/webpos/webapp/webpos/manager/PaidOutAndIn.ftl?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/webpos/webapp/webpos/manager/PaidOutAndIn.ftl (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/webpos/webapp/webpos/manager/PaidOutAndIn.ftl Mon Aug 17 15:42:56 2009 @@ -40,13 +40,13 @@ <option value="${reason.enumId}">${reason.get("description", locale)?default(reason.enumId)}</option> </#list> </#if> - </select> + </select> </td> </tr> <tr> - <td><b>${uiLabelMap.WebPosManagerPaidOutAndIndReasonComment}</b></td> - <td><input type="text" name="reasonCommentInOut" id="reasonCommentInOut" value="${parameters.reasonCommentInOut?default("")}"/></td> - </tr> + <td><b>${uiLabelMap.WebPosManagerPaidOutAndIndReasonComment}</b></td> + <td><input type="text" name="reasonCommentInOut" id="reasonCommentInOut" value="${parameters.reasonCommentInOut?default("")}"/></td> + </tr> <tr> <td colspan="2""> </td> </tr> Modified: ofbiz/branches/executioncontext20090812/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityImpl.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityImpl.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityImpl.java (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityImpl.java Mon Aug 17 15:42:56 2009 @@ -720,7 +720,7 @@ throw new WfException(e.getMessage(), e); } if (Debug.verboseOn()) { - Debug.logVerbose("[WfActivity.setLimitService]: Set limit service (" + limitService + " ) to run at " + startTime, module); + Debug.logVerbose("[WfActivity.setLimitService]: Set limit service (" + limitService + ") to run at " + startTime, module); } } Modified: ofbiz/branches/executioncontext20090812/specialpurpose/workflow/webapp/workflow/workflow/workflowMonitor.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/specialpurpose/workflow/webapp/workflow/workflow/workflowMonitor.ftl?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/specialpurpose/workflow/webapp/workflow/workflow/workflowMonitor.ftl (original) +++ ofbiz/branches/executioncontext20090812/specialpurpose/workflow/webapp/workflow/workflow/workflowMonitor.ftl Mon Aug 17 15:42:56 2009 @@ -70,7 +70,7 @@ </tr> <#list activities as step> <#assign assignments = step.getRelated("WorkEffortPartyAssignment")> - <#assign assignments = EntityUtil.filterByDate(assignments)> + <#assign assignments = EntityUtil.filterByDate(assignments)> <tr> <#-- TODO: add external login ID to external links --> <td class="button-col"><a href="/workeffort/control/activity?workEffortId=${step.workEffortId}" target="workeffort">${step.workflowActivityId}</a></td> Modified: ofbiz/branches/executioncontext20090812/themes/bizznesstime/data/BizznessTimeThemeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/themes/bizznesstime/data/BizznessTimeThemeData.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/themes/bizznesstime/data/BizznessTimeThemeData.xml (original) +++ ofbiz/branches/executioncontext20090812/themes/bizznesstime/data/BizznessTimeThemeData.xml Mon Aug 17 15:42:56 2009 @@ -20,6 +20,7 @@ <entity-engine-xml> <VisualTheme visualThemeId="BIZZNESS_TIME" visualThemeSetId="BACKOFFICE" description="It's bizzness, it's bizzness time. I couldn't have said it better myself. This theme gets down"/> + <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_NAME" resourceValue="BIZZNESS_TIME" sequenceId="01"/> <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/bizznesstime/css/style.css" sequenceId="01"/> <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/bizznesstime/js/application.js" sequenceId="01"/> <VisualThemeResource visualThemeId="BIZZNESS_TIME" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/> Modified: ofbiz/branches/executioncontext20090812/themes/bizznesstime/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/themes/bizznesstime/includes/header.ftl?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/themes/bizznesstime/includes/header.ftl (original) +++ ofbiz/branches/executioncontext20090812/themes/bizznesstime/includes/header.ftl Mon Aug 17 15:42:56 2009 @@ -126,8 +126,8 @@ <span><a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></span> <#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists> <#include "component://common/webcommon/includes/helplink.ftl" /> - <#if helpContent?has_content || (parameters.portalPageId?exists && helpTopic == "MYPORTAL_showPortalPage")> - <span><a href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></span> + <#if helpContent?has_content || helpTopic == "navigateHelp" || (parameters.portalPageId?exists && helpTopic == "MYPORTAL_showPortalP")> + <span><a href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></span> <#else> <span><a href="${helpUrlPrefix}${helpUrlTopic}${helpUrlSuffix}" target="_blank">${uiLabelMap.CommonHelp}</a></span> </#if> Modified: ofbiz/branches/executioncontext20090812/themes/flatgrey/data/FlatGreyThemeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/themes/flatgrey/data/FlatGreyThemeData.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/themes/flatgrey/data/FlatGreyThemeData.xml (original) +++ ofbiz/branches/executioncontext20090812/themes/flatgrey/data/FlatGreyThemeData.xml Mon Aug 17 15:42:56 2009 @@ -20,6 +20,7 @@ <entity-engine-xml> <VisualTheme visualThemeId="FLAT_GREY" visualThemeSetId="BACKOFFICE" description="Flat Grey - Old OFBiz Standard Floating Layout"/> + <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_NAME" resourceValue="FLAT_GREY" sequenceId="01"/> <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/flatgrey/maincss.css" sequenceId="01"/> <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_RTL_STYLESHEET" resourceValue="/flatgrey/mainrtl.css" sequenceId="01"/> <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/> Modified: ofbiz/branches/executioncontext20090812/themes/flatgrey/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/themes/flatgrey/includes/header.ftl?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/themes/flatgrey/includes/header.ftl (original) +++ ofbiz/branches/executioncontext20090812/themes/flatgrey/includes/header.ftl Mon Aug 17 15:42:56 2009 @@ -182,8 +182,8 @@ </#if> <#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists> <#include "component://common/webcommon/includes/helplink.ftl" /> - <#if helpContent?has_content || (parameters.portalPageId?exists && helpTopic == "MYPORTAL_showPortalPage")> - <li><a href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></li> + <#if helpContent?has_content || helpTopic == "navigateHelp" || (parameters.portalPageId?exists && helpTopic == "MYPORTAL_showPortalP")> + <li><a href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></li> <#else> <li><a href="${helpUrlPrefix}${helpUrlTopic}${helpUrlSuffix}" target="_blank">${uiLabelMap.CommonHelp}</a></li> </#if> Modified: ofbiz/branches/executioncontext20090812/themes/multiflex/includes/header.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/themes/multiflex/includes/header.ftl?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/themes/multiflex/includes/header.ftl (original) +++ ofbiz/branches/executioncontext20090812/themes/multiflex/includes/header.ftl Mon Aug 17 15:42:56 2009 @@ -119,7 +119,7 @@ </#if> </div> - </div> + </div> <!-- Breadcrumbs --> <div class="header-breadcrumbs"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |