You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by sa...@apache.org on 2011/10/20 19:33:40 UTC
svn commit: r1186950 [4/4] - in /ofbiz/branches/jackrabbit20100709: ./
applications/accounting/ applications/accounting/config/
applications/accounting/data/
applications/accounting/script/org/ofbiz/accounting/payment/
applications/accounting/script/or...
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/controller.xml Thu Oct 20 17:33:36 2011
@@ -597,13 +597,6 @@
<response name="success" type="view" value="listResourcesTask"/>
<response name="error" type="view" value="listResourcesTask"/>
</request-map>
- <request-map uri="createnewlogin"><security https="true" auth="true"/><response name="success" type="view" value="createnewlogin"/></request-map>
- <request-map uri="createUserLogin">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="createUserLogin"/>
- <response name="success" type="view" value="viewprofile"/>
- <response name="error" type="view" value="createnewlogin"/>
- </request-map>
<request-map uri="EditPartyRates"><security https="true" auth="true"/><response name="success" type="view" value="EditPartyRates"/></request-map>
<request-map uri="createPartyRate">
<security https="true" auth="true"/>
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml Thu Oct 20 17:33:36 2011
@@ -1293,7 +1293,7 @@
<set field="roleData.roleTypeId" value="SCRUM_MEMBER"/>
<set field="roleData.userLogin" from-field="sysUserLogin"/>
<call-service service-name="createPartyRole" in-map-name="roleData">
- <default-message>Successfully created.</default-message>
+ <default-message resource="CommonUiLabels" property="CommonSuccessfullyCreated"/>
</call-service>
</if-empty>
</simple-method>
@@ -2790,7 +2790,7 @@
<set field="update.currentStatusId" value="STS_COMPLETED"/>
<set field="update.webSiteId" from-field="parameters.webSiteId"/>
<call-service service-name="updateWorkEffort" in-map-name="update">
- <default-message>Successfully</default-message>
+ <default-message resource="CommonUiLabels" property="CommonSuccessfullyCreated"/>
</call-service>
<else>
<set field="create.workEffortId" from-field="parameters.workEffortId"/>
Modified: ofbiz/branches/jackrabbit20100709/themes/bizznesstime/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/themes/bizznesstime/includes/header.ftl?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/themes/bizznesstime/includes/header.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/themes/bizznesstime/includes/header.ftl Thu Oct 20 17:33:36 2011
@@ -100,13 +100,23 @@ under the License.
</#list>
</#if>
</head>
+<#if layoutSettings.headerImageLinkUrl?exists>
+ <#assign logoLinkURL = "${layoutSettings.headerImageLinkUrl}">
+<#else>
+ <#assign logoLinkURL = "${layoutSettings.commonHeaderImageLinkUrl}">
+</#if>
+<#assign organizationLogoLinkURL = "${layoutSettings.organizationLogoLinkUrl?if_exists}">
<body>
<div id="wrap">
<div id="wait-spinner" style="display:none">
<div id="wait-spinner-image"></div>
</div>
<div id="header">
- <div id="logo"></div>
+ <#if organizationLogoLinkURL?has_content>
+ <div id="org-logo-area"><a href="<@o...@ofbizUrl>"><img alt="${layoutSettings.companyName}" src="<@o...@ofbizContentUrl>" height="43px"></a></div>
+ <#else>
+ <div id="logo"></div>
+ </#if>
<div id="shelf"></div>
<div id="controls">
<span id="prefBtn">
Modified: ofbiz/branches/jackrabbit20100709/themes/bizznesstime/webapp/bizznesstime/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/themes/bizznesstime/webapp/bizznesstime/css/style.css?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/themes/bizznesstime/webapp/bizznesstime/css/style.css (original)
+++ ofbiz/branches/jackrabbit20100709/themes/bizznesstime/webapp/bizznesstime/css/style.css Thu Oct 20 17:33:36 2011
@@ -231,6 +231,16 @@ body > #wrap {height: auto; min-height:
background:url(../images/logo.gif) top left no-repeat;
}
+#org-logo-area {
+ background:transparent;
+ height:43px;
+ left:5px;
+ position:absolute;
+ top:2px;
+ width:238px;
+ z-index:8000;
+}
+
#shelf {
background:transparent url(../images/shelf.jpg) no-repeat left top;
height:119px;
Modified: ofbiz/branches/jackrabbit20100709/themes/bluelight/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/themes/bluelight/includes/header.ftl?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/themes/bluelight/includes/header.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/themes/bluelight/includes/header.ftl Thu Oct 20 17:33:36 2011
@@ -86,6 +86,7 @@ under the License.
<#else>
<#assign logoLinkURL = "${layoutSettings.commonHeaderImageLinkUrl}">
</#if>
+<#assign organizationLogoLinkURL = "${layoutSettings.organizationLogoLinkUrl?if_exists}">
<#if person?has_content>
<#assign userName = person.firstName?if_exists + " " + person.middleName?if_exists + " " + person.lastName?if_exists>
@@ -116,11 +117,13 @@ under the License.
<div id="masthead">
<ul>
<#if (userPreferences.COMPACT_HEADER)?default("N") == "Y">
- <li class="logo-area">
<#if shortcutIcon?has_content>
- <a href="<@o...@ofbizUrl>"><img src="<@o...@ofbizContentUrl>" height="16px" width="16px" alt="" /></a>
- </#if>
- </li>
+ <#if organizationLogoLinkURL?has_content>
+ <li><a href="<@o...@ofbizUrl>"><img alt="${layoutSettings.companyName}" src="<@o...@ofbizContentUrl>" height="16px" width="16px"></a></li>
+ <#else>
+ <li class="logo-area"><a href="<@o...@ofbizUrl>"><img src="<@o...@ofbizContentUrl>" height="16px" width="16px" alt="" /></a></li>
+ </#if>
+ </#if>
<#else>
<#if layoutSettings.headerImageUrl?exists>
<#assign headerImageUrl = layoutSettings.headerImageUrl>
@@ -130,7 +133,11 @@ under the License.
<#assign headerImageUrl = layoutSettings.VT_HDR_IMAGE_URL.get(0)>
</#if>
<#if headerImageUrl?exists>
- <li class="logo-area"><a href="<@o...@ofbizUrl>"><img alt="${layoutSettings.companyName}" src="<@o...@ofbizContentUrl>"/></a></li>
+ <#if organizationLogoLinkURL?has_content>
+ <li><a href="<@o...@ofbizUrl>"><img alt="${layoutSettings.companyName}" src="<@o...@ofbizContentUrl>"></a></li>
+ <#else>
+ <li class="logo-area"><a href="<@o...@ofbizUrl>"><img alt="${layoutSettings.companyName}" src="<@o...@ofbizContentUrl>"/></a></li>
+ </#if>
</#if>
<#if layoutSettings.middleTopMessage1?has_content && layoutSettings.middleTopMessage1 != " ">
<li>
Modified: ofbiz/branches/jackrabbit20100709/themes/droppingcrumbs/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/themes/droppingcrumbs/includes/header.ftl?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/themes/droppingcrumbs/includes/header.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/themes/droppingcrumbs/includes/header.ftl Thu Oct 20 17:33:36 2011
@@ -86,6 +86,7 @@ under the License.
<#else>
<#assign logoLinkURL = "${layoutSettings.commonHeaderImageLinkUrl}">
</#if>
+<#assign organizationLogoLinkURL = "${layoutSettings.organizationLogoLinkUrl?if_exists}">
<#if person?has_content>
<#assign userName = person.firstName?if_exists + " " + person.middleName?if_exists + " " + person.lastName?if_exists>
@@ -118,7 +119,12 @@ under the License.
<#if (userPreferences.COMPACT_HEADER)?default("N") == "Y">
<li>
<#if shortcutIcon?has_content>
- <a href="<@o...@ofbizUrl>"><img src="<@o...@ofbizContentUrl>" height="16px" width="16px" alt="" /></a>
+ <#if organizationLogoLinkURL?has_content>
+ <a href="<@o...@ofbizUrl>"><img src="<@o...@ofbizContentUrl>" height="16px" width="16px" alt="" ></a></li>
+ <#else>
+ <a href="<@o...@ofbizUrl>"><img src="<@o...@ofbizContentUrl>" height="16px" width="16px" alt="" /></a>
+ </#if>
+
</#if>
</li>
<#else>
@@ -130,7 +136,11 @@ under the License.
<#assign headerImageUrl = layoutSettings.VT_HDR_IMAGE_URL.get(0)>
</#if>
<#if headerImageUrl?exists>
- <li id="logo-area"><a href="<@o...@ofbizUrl>" title="${layoutSettings.companyName}"><span> </span></a></li>
+ <#if organizationLogoLinkURL?has_content>
+ <li id="org-logo-area"><a href="<@o...@ofbizUrl>"><img alt="${layoutSettings.companyName}" src="<@o...@ofbizContentUrl>"></a></li>
+ <#else>
+ <li id="logo-area"><a href="<@o...@ofbizUrl>" title="${layoutSettings.companyName}"><span> </span></a></li>
+ </#if>
</#if>
<#if layoutSettings.middleTopMessage1?has_content && layoutSettings.middleTopMessage1 != " ">
<li>
Modified: ofbiz/branches/jackrabbit20100709/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css (original)
+++ ofbiz/branches/jackrabbit20100709/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css Thu Oct 20 17:33:36 2011
@@ -939,6 +939,20 @@ width:260px;
height:50px;
}
+#org-logo-area {
+width:260px;
+height:50px;
+}
+
+#org-logo-area a{
+display:block;
+height:100%;
+}
+
+#org-logo-area img{
+height:50px;
+}
+
#masthead {
background: url(/droppingcrumbs/images/header_top_bg.gif) repeat-x;
font-weight: bold;
Modified: ofbiz/branches/jackrabbit20100709/themes/flatgrey/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/themes/flatgrey/includes/header.ftl?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/themes/flatgrey/includes/header.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/themes/flatgrey/includes/header.ftl Thu Oct 20 17:33:36 2011
@@ -83,6 +83,7 @@ under the License.
<#else>
<#assign logoLinkURL = "${layoutSettings.commonHeaderImageLinkUrl}">
</#if>
+<#assign organizationLogoLinkURL = "${layoutSettings.organizationLogoLinkUrl?if_exists}">
<body>
<div id="wait-spinner" style="display:none">
<div id="wait-spinner-image"></div>
@@ -103,7 +104,11 @@ under the License.
<#assign headerImageUrl = layoutSettings.VT_HDR_IMAGE_URL.get(0)>
</#if>
<#if headerImageUrl?exists>
- <li class="logo-area"><a href="<@o...@ofbizUrl>"><img alt="${layoutSettings.companyName}" src="<@o...@ofbizContentUrl>"/></a></li>
+ <#if organizationLogoLinkURL?has_content>
+ <li class="org-logo-area"><a href="<@o...@ofbizUrl>"><img alt="${layoutSettings.companyName}" src="<@o...@ofbizContentUrl>"></a></li>
+ <#else>
+ <li class="logo-area"><a href="<@o...@ofbizUrl>"><img alt="${layoutSettings.companyName}" src="<@o...@ofbizContentUrl>"/></a></li>
+ </#if>
</#if>
<#if userLogin?exists>
<#if layoutSettings.topLines?has_content>
Modified: ofbiz/branches/jackrabbit20100709/themes/flatgrey/webapp/flatgrey/maincss.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/themes/flatgrey/webapp/flatgrey/maincss.css?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/themes/flatgrey/webapp/flatgrey/maincss.css (original)
+++ ofbiz/branches/jackrabbit20100709/themes/flatgrey/webapp/flatgrey/maincss.css Thu Oct 20 17:33:36 2011
@@ -277,6 +277,15 @@ font-weight: normal;
padding: 0.1em 0.8em;
}
+#masthead ul .org-logo-area {
+padding: 0.1em 0.8em;
+}
+
+#masthead ul .org-logo-area img{
+width: 50px;
+height: 22px;
+}
+
#masthead ul a:focus {
text-decoration: underline;
}
Modified: ofbiz/branches/jackrabbit20100709/themes/tomahawk/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/themes/tomahawk/includes/header.ftl?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/themes/tomahawk/includes/header.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/themes/tomahawk/includes/header.ftl Thu Oct 20 17:33:36 2011
@@ -86,6 +86,7 @@ under the License.
<#else>
<#assign logoLinkURL = "${layoutSettings.commonHeaderImageLinkUrl}">
</#if>
+<#assign organizationLogoLinkURL = "${layoutSettings.organizationLogoLinkUrl?if_exists}">
<body>
<div id="wait-spinner" style="display:none">
@@ -108,7 +109,11 @@ under the License.
<#assign headerImageUrl = layoutSettings.VT_HDR_IMAGE_URL.get(0)>
</#if>
<#if headerImageUrl?exists>
- <li id="logo-area"><a href="<@o...@ofbizUrl>" title="${layoutSettings.companyName}"></a></li>
+ <#if organizationLogoLinkURL?has_content>
+ <li id="org-logo-area"><a href="<@o...@ofbizUrl>"><img alt="${layoutSettings.companyName}" src="<@o...@ofbizContentUrl>"></a></li>
+ <#else>
+ <li id="logo-area"><a href="<@o...@ofbizUrl>" title="${layoutSettings.companyName}"></a></li>
+ </#if>
</#if>
<#if layoutSettings.middleTopMessage1?has_content && layoutSettings.middleTopMessage1 != " ">
<li class="last-system-msg">
Modified: ofbiz/branches/jackrabbit20100709/themes/tomahawk/webapp/tomahawk/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/themes/tomahawk/webapp/tomahawk/css/style.css?rev=1186950&r1=1186949&r2=1186950&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/themes/tomahawk/webapp/tomahawk/css/style.css (original)
+++ ofbiz/branches/jackrabbit20100709/themes/tomahawk/webapp/tomahawk/css/style.css Thu Oct 20 17:33:36 2011
@@ -956,6 +956,20 @@ display:block;
height:100%;
}
+#org-logo-area {
+width:385px;
+height:50px;
+}
+
+#org-logo-area a{
+display:block;
+height:100%;
+}
+
+#org-logo-area img{
+height:50px;
+}
+
#masthead {
background: url(../images/header_top_bg.gif) repeat-x;
font-weight: bold;