You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2011/10/17 12:58:48 UTC
svn commit: r1185102 - in /ofbiz/trunk: applications/commonext/widget/
applications/party/widget/partymgr/ framework/common/config/
themes/bizznesstime/includes/ themes/bizznesstime/webapp/bizznesstime/css/
themes/bluelight/includes/ themes/droppingcru...
Author: hansbak
Date: Mon Oct 17 10:58:47 2011
New Revision: 1185102
URL: http://svn.apache.org/viewvc?rev=1185102&view=rev
Log:
update the backend top left logo by specifying a url in the current accounting company partygroup or uploading a logon in partycontent. the logo will also show in the partyprofile. All themes are updated. Contribution of Antwebsystems employee 'Nop'
Modified:
ofbiz/trunk/applications/commonext/widget/CommonScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml
ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml
ofbiz/trunk/framework/common/config/CommonUiLabels.xml
ofbiz/trunk/themes/bizznesstime/includes/header.ftl
ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css
ofbiz/trunk/themes/bluelight/includes/header.ftl
ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl
ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css
ofbiz/trunk/themes/flatgrey/includes/header.ftl
ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css
ofbiz/trunk/themes/tomahawk/includes/header.ftl
ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css
Modified: ofbiz/trunk/applications/commonext/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/CommonScreens.xml?rev=1185102&r1=1185101&r2=1185102&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/commonext/widget/CommonScreens.xml Mon Oct 17 10:58:47 2011
@@ -59,6 +59,17 @@ under the License.
<entity-one entity-name="PartyAcctgPrefAndGroup" value-field="orgParty">
<field-map field-name="partyId" from-field="defaultOrganizationPartyId"/>
</entity-one>
+ <entity-one value-field="orgPartyLogoMap" entity-name="PartyGroup">
+ <field-map field-name="partyId" from-field="defaultOrganizationPartyId"/>
+ </entity-one>
+ <entity-and list="orgPartyContentMap" entity-name="PartyContent">
+ <field-map field-name="partyId" from-field="defaultOrganizationPartyId"/>
+ <field-map field-name="partyContentTypeId" value="LGOIMGURL"/>
+ <order-by field-name="-fromDate"/>
+ </entity-and>
+ <set field="orgContentId" from-field="orgPartyContentMap[0].contentId"/>
+ <set field="orgPartyContent" value="${groovy: orgContentId!=null?"stream?contentId=" + orgContentId : ""}"/>
+ <set field="layoutSettings.organizationLogoLinkUrl" from-field="orgPartyContent" default-value="${orgPartyLogoMap.logoImageUrl}" global="true"/>
<set field="defaultOrganizationPartyCurrencyUomId" from-field="orgParty.baseCurrencyUomId" default-value="${defaultCurrencyUomId}" global="true"/>
<set field="defaultOrganizationPartyGroupName" from-field="orgParty.groupName" global="true"/>
<set field="dropdown.hiddenFieldList" from-field="hiddenFields" global="true"/>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml?rev=1185102&r1=1185101&r2=1185102&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml Mon Oct 17 10:58:47 2011
@@ -134,6 +134,7 @@ under the License.
<form name="ViewPartyGroup" type="single" default-map-name="lookupGroup">
<auto-fields-entity entity-name="PartyGroup" default-field-type="display"/>
+ <field name="logo" use-when="organizationLogoLinkURL!=null" title="${uiLabelMap.CommonOrganizationLogo}"><image alternate="${uiLabelMap.CommonOrganizationLogo}" value="${organizationLogoLinkURL}"/></field>
<field name="partyTypeId"><ignored/></field>
<field name="comments"><ignored/></field>
<field name="logoImageUrl"><ignored/></field>
@@ -141,6 +142,20 @@ under the License.
<field name="preferredCurrencyUomId" title="${uiLabelMap.CommonCurrency}"><display-entity entity-name="Uom" key-field-name="uomId" description="${description}"/></field>
<field name="externalId"><display/></field>
<field name="statusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
+ <sort-order>
+ <sort-field name="logo"/>
+ <sort-field name="partyId"/>
+ <sort-field name="groupName"/>
+ <sort-field name="groupNameLocal"/>
+ <sort-field name="officeSiteName"/>
+ <sort-field name="annualRevenue"/>
+ <sort-field name="numEmployees"/>
+ <sort-field name="tickerSymbol"/>
+ <sort-field name="description"/>
+ <sort-field name="preferredCurrencyUomId"/>
+ <sort-field name="externalId"/>
+ <sort-field name="statusId"/>
+ </sort-order>
</form>
<form name="ViewPartyPerson" type="single" default-map-name="lookupPerson">
Modified: ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml?rev=1185102&r1=1185101&r2=1185102&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml Mon Oct 17 10:58:47 2011
@@ -25,6 +25,7 @@
<actions>
<property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
<set field="parameters.partyId" from-field="parameters.partyId" default-value="${userLogin.partyId}"/>
+ <set field="organizationLogoLinkURL" from-field="layoutSettings.organizationLogoLinkUrl"/>
<entity-and entity-name="PartyNameHistory" list="partyNameHistoryList">
<field-map field-name="partyId" from-field="parameters.partyId"/>
<order-by field-name="-changeDate"/>
Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=1185102&r1=1185101&r2=1185102&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Mon Oct 17 10:58:47 2011
@@ -5981,6 +5981,10 @@
<value xml:lang="zh_CN">订å</value>
<value xml:lang="zh_TW">è¨å®</value>
</property>
+ <property key="CommonOrganizationLogo">
+ <value xml:lang="en">Organization Logo</value>
+ <value xml:lang="th">à¹à¸¥à¹à¸à¹à¸à¸à¸à¹à¸à¸£</value>
+ </property>
<property key="CommonOther">
<value xml:lang="ar">أخرÙ</value>
<value xml:lang="de">Andere</value>
Modified: ofbiz/trunk/themes/bizznesstime/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/includes/header.ftl?rev=1185102&r1=1185101&r2=1185102&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/includes/header.ftl (original)
+++ ofbiz/trunk/themes/bizznesstime/includes/header.ftl Mon Oct 17 10:58:47 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/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css?rev=1185102&r1=1185101&r2=1185102&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css (original)
+++ ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css Mon Oct 17 10:58:47 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/trunk/themes/bluelight/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/includes/header.ftl?rev=1185102&r1=1185101&r2=1185102&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/includes/header.ftl (original)
+++ ofbiz/trunk/themes/bluelight/includes/header.ftl Mon Oct 17 10:58:47 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/trunk/themes/droppingcrumbs/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl?rev=1185102&r1=1185101&r2=1185102&view=diff
==============================================================================
--- ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl (original)
+++ ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl Mon Oct 17 10:58:47 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/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css?rev=1185102&r1=1185101&r2=1185102&view=diff
==============================================================================
--- ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css (original)
+++ ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css Mon Oct 17 10:58:47 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/trunk/themes/flatgrey/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/includes/header.ftl?rev=1185102&r1=1185101&r2=1185102&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/includes/header.ftl (original)
+++ ofbiz/trunk/themes/flatgrey/includes/header.ftl Mon Oct 17 10:58:47 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/trunk/themes/flatgrey/webapp/flatgrey/maincss.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css?rev=1185102&r1=1185101&r2=1185102&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css (original)
+++ ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css Mon Oct 17 10:58:47 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/trunk/themes/tomahawk/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/includes/header.ftl?rev=1185102&r1=1185101&r2=1185102&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/includes/header.ftl (original)
+++ ofbiz/trunk/themes/tomahawk/includes/header.ftl Mon Oct 17 10:58:47 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/trunk/themes/tomahawk/webapp/tomahawk/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css?rev=1185102&r1=1185101&r2=1185102&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css (original)
+++ ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css Mon Oct 17 10:58:47 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;