Commit 4c1b0609 authored by Asier Lostalé's avatar Asier Lostalé
Browse files

fixes FR-46363: removes "agile ERP" from openbravo logo

Implements:
 * Replace backoffice's login page's Openbravo logo with a new one removing the "agile ERP"
 * Replace backoffice's "powered by Openbravo" logo that appears on the top right part with one removing the "agile ERP"
 * Unify the "powered by Openbravo" logo that appears on the top right part displaying the same logo for community and professional instances
 * Remove forge logo from login page and the possibility to display it
 * Replace the link to the IT service to https://www.openbravo.com/services/support-maintenance in new instances (after install.source)
parents 60751f1a cbbd1999
......@@ -11,7 +11,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
* All portions are Copyright (C) 2017-2018 Openbravo SLU
* All portions are Copyright (C) 2017-2021 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
......@@ -167,19 +167,13 @@ OB.Layout.initialize = function() {
imageType: 'normal',
imageWidth: '130',
imageHeight: '32',
src: OB.Application.contextUrl + 'utility/GetOpenbravoLogo.png',
src: OB.Application.contextUrl + 'web/images/PoweredByOpenbravo.svg',
getInnerHTML: function() {
var html = this.Super('getInnerHTML', arguments);
if (!OB.Application.isActiveInstance) {
return (
'<a href="http://www.openbravo.com/product/erp/professional/" target="_new">' +
html +
'</a>'
);
} else {
return html;
}
return (
'<a href="https://www.openbravo.com" target="_new">' + html + '</a>'
);
}
});
OB.TestRegistry.register(
......
......@@ -11,7 +11,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
* All portions are Copyright (C) 2017-2018 Openbravo SLU
* All portions are Copyright (C) 2017-2021 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
......@@ -399,7 +399,7 @@ button.ButtonLink_disabled table.Button .Button_right, table.ButtonLink_disabled
.Login_LogForm {
background: url(../../Default/Login/LoginBox-bg.png) repeat-x scroll left bottom transparent;
left: 170px;
left: 162px;
position: absolute;
top: 10px;
border: 3px solid #B4B4B4;
......@@ -444,9 +444,7 @@ button.ButtonLink_disabled table.Button .Button_right, table.ButtonLink_disabled
margin-top: 10px;
}
.Login_TopLogos_Container_Support_Forge,
.Login_TopLogos_Container_Support,
.Login_TopLogos_Container_Forge {
.Login_TopLogos_Container_Support {
position: relative;
padding-top: 290px;
text-align: center;
......@@ -460,36 +458,10 @@ button.ButtonLink_disabled table.Button .Button_right, table.ButtonLink_disabled
width: 100%;
}
.Login_TopLogos_Container_Support_Forge .Login_TopLogos_ForgeLogo_Container {
left: -90px;
}
.Login_TopLogos_Container_Support_Forge .Login_TopLogos_SupportLogo_Container {
left: 356px;
}
.Login_TopLogos_Container_Support .Login_TopLogos_ForgeLogo_Container {
display: none;
}
.Login_TopLogos_Container_Support .Login_TopLogos_SupportLogo_Container {
left: 616px;
}
.Login_TopLogos_Container_Forge .Login_TopLogos_ForgeLogo_Container {
left: -90px;
}
.Login_TopLogos_Container_Forge .Login_TopLogos_SupportLogo_Container {
display: none;
}
.Login_TopLogos_Container_None .Login_TopLogos_ForgeLogo_Container {
display: none;
}
.Login_TopLogos_Container_None .Login_TopLogos_SupportLogo_Container {
display: none;
}
......@@ -509,27 +481,12 @@ button.ButtonLink_disabled table.Button .Button_right, table.ButtonLink_disabled
text-align: center;
}
.Login_TopLogos_ForgeLogo_Container {
width: 260px;
position: relative;
float: left;
}
.Login_TopLogos_ForgeLogo_Text {
text-align: center;
margin-bottom: 5px;
}
.Login_TopLogos_ForgeLogo_Logo_Container {
text-align: center;
}
.Login_BottomLogos_Container {
position: relative;
clear: left;
padding-top: 10px;
left: 250px; /*~RTL right: 250px; */
left: 255px; /*~RTL right: 255px; */
width: fit-content;
}
.Login_BottomLogos_Openbravo_Logo_Container {
......@@ -541,7 +498,6 @@ button.ButtonLink_disabled table.Button .Button_right, table.ButtonLink_disabled
position: relative;
clear: left;
padding-top: 5px;
padding-left: 50px; /*~RTL padding-right: 60px; */
background-color: white;
}
......@@ -550,7 +506,6 @@ button.ButtonLink_disabled table.Button .Button_right, table.ButtonLink_disabled
color: #afafaf;
font-size: .9em;
line-height: 0.9em;
width: 14em;
text-align: center;
}
......@@ -635,7 +590,7 @@ button.ButtonLink_disabled table.Button .Button_right, table.ButtonLink_disabled
.Login_Logo_Openbravo {
width: 260px;
height: 70px;
background: url(../../../../images/OpenbravoWithVesion_Logo.png) no-repeat center center;
background: url(../../../../images/openbravoLogo.svg) no-repeat center center;
}
.Login_Logo_Company {
......@@ -649,9 +604,3 @@ button.ButtonLink_disabled table.Button .Button_right, table.ButtonLink_disabled
height: 55px;
background: url(../../../../../utility/ShowImageLogo?logo=youritservicelogin) no-repeat center center;
}
.Login_Logo_Forge {
width: 225px;
height: 55px;
background: url(../../../../images/OBForge.png) no-repeat center center;
}
\ No newline at end of file
......@@ -119,7 +119,7 @@
</column>
<column name="SUPPORT_CONTACT" primaryKey="false" required="false" type="NVARCHAR" size="200" autoIncrement="false">
<default/>
<onCreateDefault><![CDATA['www.your-it-service.com']]></onCreateDefault>
<onCreateDefault><![CDATA['https://www.openbravo.com/services/support-maintenance']]></onCreateDefault>
</column>
<column name="SYSTEM_STATUS" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false">
<default/>
......@@ -165,10 +165,6 @@
<default/>
<onCreateDefault/>
</column>
<column name="SHOWFORGELOGO" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
<default><![CDATA[Y]]></default>
<onCreateDefault><![CDATA['Y']]></onCreateDefault>
</column>
<column name="YOURCOMPANYURL" primaryKey="false" required="false" type="NVARCHAR" size="200" autoIncrement="false">
<default/>
<onCreateDefault/>
......@@ -200,7 +196,6 @@
<check name="AD_SYSTEM_INFO_CHANGE_PURPOSE"><![CDATA[CHANGE_INSTANCE_PURPOSE IN ('Y', 'N')]]></check>
<check name="AD_SYSTEM_INFO_CUSTOMIZATI_CHK"><![CDATA[CUSTOMIZATION_ALLOWED IN ('Y', 'N')]]></check>
<check name="AD_SYSTEM_INFO_SHOW_COMMBRAND"><![CDATA[SHOW_COMMUNITY_BRANDING IN ('Y', 'N')]]></check>
<check name="AD_SYSTEM_INFO_SHOWFORGE"><![CDATA[SHOWFORGELOGO IN ('Y', 'N')]]></check>
<check name="AD_SYSTEMINFO_USAGEAUDITENAB"><![CDATA[ISUSAGEAUDITENABLED IN ('Y', 'N')]]></check>
</table>
</database>
......@@ -15,7 +15,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
* All portions are Copyright (C) 2008-2012 Openbravo SLU
* All portions are Copyright (C) 2008-2021 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************/
......@@ -98,17 +98,6 @@ BEGIN
where name = indTempName;
end if;
if :old.showForgeLogo='Y' and :new.showForgeLogo='N' then
select count(*)
into exist
from ad_system
where instance_Key is null;
if exist != 0 then
RAISE_APPLICATION_ERROR(-20000,'@ShowForgeLogoCommunity@');
end if;
end if;
END AD_SYSTEM_INFO_TRG2
]]></body>
</trigger>
......
......@@ -348882,46 +348882,6 @@ There is an example image on the Login folder of the Default skin.]]></HELP>
<!--949DC5303EC3DFA5E040A8C0BD06242B--> <IS_CHILD_PROPERTY_IN_PARENT><![CDATA[Y]]></IS_CHILD_PROPERTY_IN_PARENT>
<!--949DC5303EC3DFA5E040A8C0BD06242B--></AD_COLUMN>
 
<!--949E626A5896C713E040A8C0BD062033--><AD_COLUMN>
<!--949E626A5896C713E040A8C0BD062033--> <AD_COLUMN_ID><![CDATA[949E626A5896C713E040A8C0BD062033]]></AD_COLUMN_ID>
<!--949E626A5896C713E040A8C0BD062033--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--949E626A5896C713E040A8C0BD062033--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--949E626A5896C713E040A8C0BD062033--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--949E626A5896C713E040A8C0BD062033--> <NAME><![CDATA[Show Forge Logo in Login]]></NAME>
<!--949E626A5896C713E040A8C0BD062033--> <DESCRIPTION><![CDATA[Show Openbravo Forge Logo in Login.]]></DESCRIPTION>
<!--949E626A5896C713E040A8C0BD062033--> <HELP><![CDATA[Show Openbravo Forge Logo in Login window.]]></HELP>
<!--949E626A5896C713E040A8C0BD062033--> <COLUMNNAME><![CDATA[ShowForgeLogo]]></COLUMNNAME>
<!--949E626A5896C713E040A8C0BD062033--> <AD_TABLE_ID><![CDATA[1005400005]]></AD_TABLE_ID>
<!--949E626A5896C713E040A8C0BD062033--> <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
<!--949E626A5896C713E040A8C0BD062033--> <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
<!--949E626A5896C713E040A8C0BD062033--> <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
<!--949E626A5896C713E040A8C0BD062033--> <ISKEY><![CDATA[N]]></ISKEY>
<!--949E626A5896C713E040A8C0BD062033--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--949E626A5896C713E040A8C0BD062033--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
<!--949E626A5896C713E040A8C0BD062033--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
<!--949E626A5896C713E040A8C0BD062033--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
<!--949E626A5896C713E040A8C0BD062033--> <SEQNO><![CDATA[460]]></SEQNO>
<!--949E626A5896C713E040A8C0BD062033--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
<!--949E626A5896C713E040A8C0BD062033--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
<!--949E626A5896C713E040A8C0BD062033--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
<!--949E626A5896C713E040A8C0BD062033--> <AD_ELEMENT_ID><![CDATA[949E69B5A9C14B28E040A8C0BD062024]]></AD_ELEMENT_ID>
<!--949E626A5896C713E040A8C0BD062033--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
<!--949E626A5896C713E040A8C0BD062033--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
<!--949E626A5896C713E040A8C0BD062033--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
<!--949E626A5896C713E040A8C0BD062033--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
<!--949E626A5896C713E040A8C0BD062033--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--949E626A5896C713E040A8C0BD062033--> <POSITION><![CDATA[45]]></POSITION>
<!--949E626A5896C713E040A8C0BD062033--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
<!--949E626A5896C713E040A8C0BD062033--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
<!--949E626A5896C713E040A8C0BD062033--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
<!--949E626A5896C713E040A8C0BD062033--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
<!--949E626A5896C713E040A8C0BD062033--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
<!--949E626A5896C713E040A8C0BD062033--> <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
<!--949E626A5896C713E040A8C0BD062033--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
<!--949E626A5896C713E040A8C0BD062033--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
<!--949E626A5896C713E040A8C0BD062033--> <IS_CHILD_PROPERTY_IN_PARENT><![CDATA[Y]]></IS_CHILD_PROPERTY_IN_PARENT>
<!--949E626A5896C713E040A8C0BD062033--></AD_COLUMN>
<!--94B2AA0F857B4CF6ACC55807904C64CF--><AD_COLUMN>
<!--94B2AA0F857B4CF6ACC55807904C64CF--> <AD_COLUMN_ID><![CDATA[94B2AA0F857B4CF6ACC55807904C64CF]]></AD_COLUMN_ID>
<!--94B2AA0F857B4CF6ACC55807904C64CF--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
......@@ -31591,20 +31591,6 @@ There is an example image on the Login folder of the Default skin.]]></HELP>
<!--949DE0539399B12AE040A8C0BD0626B6--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
<!--949DE0539399B12AE040A8C0BD0626B6--></AD_ELEMENT>
 
<!--949E69B5A9C14B28E040A8C0BD062024--><AD_ELEMENT>
<!--949E69B5A9C14B28E040A8C0BD062024--> <AD_ELEMENT_ID><![CDATA[949E69B5A9C14B28E040A8C0BD062024]]></AD_ELEMENT_ID>
<!--949E69B5A9C14B28E040A8C0BD062024--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--949E69B5A9C14B28E040A8C0BD062024--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--949E69B5A9C14B28E040A8C0BD062024--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--949E69B5A9C14B28E040A8C0BD062024--> <COLUMNNAME><![CDATA[ShowForgeLogo]]></COLUMNNAME>
<!--949E69B5A9C14B28E040A8C0BD062024--> <NAME><![CDATA[Show Forge Logo in Login]]></NAME>
<!--949E69B5A9C14B28E040A8C0BD062024--> <PRINTNAME><![CDATA[Show Forge Logo in Login]]></PRINTNAME>
<!--949E69B5A9C14B28E040A8C0BD062024--> <DESCRIPTION><![CDATA[Show Openbravo Forge Logo in Login.]]></DESCRIPTION>
<!--949E69B5A9C14B28E040A8C0BD062024--> <HELP><![CDATA[Show Openbravo Forge Logo in Login window.]]></HELP>
<!--949E69B5A9C14B28E040A8C0BD062024--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--949E69B5A9C14B28E040A8C0BD062024--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
<!--949E69B5A9C14B28E040A8C0BD062024--></AD_ELEMENT>
<!--94C41428B8280680E040007F01001805--><AD_ELEMENT>
<!--94C41428B8280680E040007F01001805--> <AD_ELEMENT_ID><![CDATA[94C41428B8280680E040007F01001805]]></AD_ELEMENT_ID>
<!--94C41428B8280680E040007F01001805--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
......@@ -186761,7 +186761,7 @@ Service Type means that the Order Line has a product of Service Type.]]></HELP>
<!--154ED7B694C24AC0BD7AE5288247B411--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--154ED7B694C24AC0BD7AE5288247B411--> <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
<!--154ED7B694C24AC0BD7AE5288247B411--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
<!--154ED7B694C24AC0BD7AE5288247B411--> <SEQNO><![CDATA[250]]></SEQNO>
<!--154ED7B694C24AC0BD7AE5288247B411--> <SEQNO><![CDATA[260]]></SEQNO>
<!--154ED7B694C24AC0BD7AE5288247B411--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--154ED7B694C24AC0BD7AE5288247B411--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--154ED7B694C24AC0BD7AE5288247B411--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
......@@ -231681,7 +231681,7 @@ Advanced features are only granted to the automatic roles defined as advanced.]]
<!--6257780C408D48048C202839877A9F1A--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--6257780C408D48048C202839877A9F1A--> <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
<!--6257780C408D48048C202839877A9F1A--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
<!--6257780C408D48048C202839877A9F1A--> <SEQNO><![CDATA[240]]></SEQNO>
<!--6257780C408D48048C202839877A9F1A--> <SEQNO><![CDATA[250]]></SEQNO>
<!--6257780C408D48048C202839877A9F1A--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--6257780C408D48048C202839877A9F1A--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--6257780C408D48048C202839877A9F1A--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
......@@ -241449,9 +241449,9 @@ The fact of using a given product type does not mean a different accounting. All
<!--755560EC7ABE1758E040007F01010B34--> <AD_COLUMN_ID><![CDATA[7555569CC84A010FE040007F01010B4D]]></AD_COLUMN_ID>
<!--755560EC7ABE1758E040007F01010B34--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
<!--755560EC7ABE1758E040007F01010B34--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--755560EC7ABE1758E040007F01010B34--> <DISPLAYLENGTH><![CDATA[50]]></DISPLAYLENGTH>
<!--755560EC7ABE1758E040007F01010B34--> <DISPLAYLENGTH><![CDATA[100]]></DISPLAYLENGTH>
<!--755560EC7ABE1758E040007F01010B34--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
<!--755560EC7ABE1758E040007F01010B34--> <SEQNO><![CDATA[230]]></SEQNO>
<!--755560EC7ABE1758E040007F01010B34--> <SEQNO><![CDATA[240]]></SEQNO>
<!--755560EC7ABE1758E040007F01010B34--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--755560EC7ABE1758E040007F01010B34--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--755560EC7ABE1758E040007F01010B34--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
......@@ -264167,7 +264167,7 @@ There is an example image on the Login folder of the Default skin.]]></HELP>
<!--949DCBDF29120A0CE040A8C0BD062427--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--949DCBDF29120A0CE040A8C0BD062427--> <DISPLAYLENGTH><![CDATA[200]]></DISPLAYLENGTH>
<!--949DCBDF29120A0CE040A8C0BD062427--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
<!--949DCBDF29120A0CE040A8C0BD062427--> <SEQNO><![CDATA[210]]></SEQNO>
<!--949DCBDF29120A0CE040A8C0BD062427--> <SEQNO><![CDATA[230]]></SEQNO>
<!--949DCBDF29120A0CE040A8C0BD062427--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--949DCBDF29120A0CE040A8C0BD062427--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--949DCBDF29120A0CE040A8C0BD062427--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
......@@ -264181,35 +264181,6 @@ There is an example image on the Login folder of the Default skin.]]></HELP>
<!--949DCBDF29120A0CE040A8C0BD062427--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
<!--949DCBDF29120A0CE040A8C0BD062427--></AD_FIELD>
 
<!--949E69B5A9C84B28E040A8C0BD062024--><AD_FIELD>
<!--949E69B5A9C84B28E040A8C0BD062024--> <AD_FIELD_ID><![CDATA[949E69B5A9C84B28E040A8C0BD062024]]></AD_FIELD_ID>
<!--949E69B5A9C84B28E040A8C0BD062024--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--949E69B5A9C84B28E040A8C0BD062024--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--949E69B5A9C84B28E040A8C0BD062024--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--949E69B5A9C84B28E040A8C0BD062024--> <NAME><![CDATA[Show Forge Logo in Login]]></NAME>
<!--949E69B5A9C84B28E040A8C0BD062024--> <DESCRIPTION><![CDATA[Show Openbravo Forge Logo in Login.]]></DESCRIPTION>
<!--949E69B5A9C84B28E040A8C0BD062024--> <HELP><![CDATA[Show Openbravo Forge Logo in Login window.]]></HELP>
<!--949E69B5A9C84B28E040A8C0BD062024--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--949E69B5A9C84B28E040A8C0BD062024--> <AD_TAB_ID><![CDATA[8652BB9E40664869A5132CEB8A907B9B]]></AD_TAB_ID>
<!--949E69B5A9C84B28E040A8C0BD062024--> <AD_COLUMN_ID><![CDATA[949E626A5896C713E040A8C0BD062033]]></AD_COLUMN_ID>
<!--949E69B5A9C84B28E040A8C0BD062024--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
<!--949E69B5A9C84B28E040A8C0BD062024--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--949E69B5A9C84B28E040A8C0BD062024--> <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
<!--949E69B5A9C84B28E040A8C0BD062024--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
<!--949E69B5A9C84B28E040A8C0BD062024--> <SEQNO><![CDATA[270]]></SEQNO>
<!--949E69B5A9C84B28E040A8C0BD062024--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--949E69B5A9C84B28E040A8C0BD062024--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--949E69B5A9C84B28E040A8C0BD062024--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
<!--949E69B5A9C84B28E040A8C0BD062024--> <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
<!--949E69B5A9C84B28E040A8C0BD062024--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
<!--949E69B5A9C84B28E040A8C0BD062024--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--949E69B5A9C84B28E040A8C0BD062024--> <GRID_SEQNO><![CDATA[260]]></GRID_SEQNO>
<!--949E69B5A9C84B28E040A8C0BD062024--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
<!--949E69B5A9C84B28E040A8C0BD062024--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
<!--949E69B5A9C84B28E040A8C0BD062024--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
<!--949E69B5A9C84B28E040A8C0BD062024--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
<!--949E69B5A9C84B28E040A8C0BD062024--></AD_FIELD>
<!--94ADAF303B6647E4AE14601D5322423A--><AD_FIELD>
<!--94ADAF303B6647E4AE14601D5322423A--> <AD_FIELD_ID><![CDATA[94ADAF303B6647E4AE14601D5322423A]]></AD_FIELD_ID>
<!--94ADAF303B6647E4AE14601D5322423A--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
......@@ -267470,7 +267441,7 @@ By disabling this option standard beats will be sent to HeartBeat server, but no
<!--9B47A5ACA52848FE913E570498056B53--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--9B47A5ACA52848FE913E570498056B53--> <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
<!--9B47A5ACA52848FE913E570498056B53--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
<!--9B47A5ACA52848FE913E570498056B53--> <SEQNO><![CDATA[260]]></SEQNO>
<!--9B47A5ACA52848FE913E570498056B53--> <SEQNO><![CDATA[220]]></SEQNO>
<!--9B47A5ACA52848FE913E570498056B53--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--9B47A5ACA52848FE913E570498056B53--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--9B47A5ACA52848FE913E570498056B53--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
......@@ -269167,7 +269138,7 @@ Exception: The alert has been acknowledged but not action is going to be made to
<!--9EC91606F52948D2BB833DA494E65BBD--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--9EC91606F52948D2BB833DA494E65BBD--> <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
<!--9EC91606F52948D2BB833DA494E65BBD--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
<!--9EC91606F52948D2BB833DA494E65BBD--> <SEQNO><![CDATA[220]]></SEQNO>
<!--9EC91606F52948D2BB833DA494E65BBD--> <SEQNO><![CDATA[270]]></SEQNO>
<!--9EC91606F52948D2BB833DA494E65BBD--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
<!--9EC91606F52948D2BB833DA494E65BBD--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--9EC91606F52948D2BB833DA494E65BBD--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
......@@ -20659,18 +20659,6 @@ You can upgrade the license of your instance by contacting Openbravo sales staff
<!--6437716367E749CA9C8E8FADA041DF83--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
<!--6437716367E749CA9C8E8FADA041DF83--></AD_MESSAGE>
 
<!--643C242A10AE4A4495EA6D82B99C1F86--><AD_MESSAGE>
<!--643C242A10AE4A4495EA6D82B99C1F86--> <AD_MESSAGE_ID><![CDATA[643C242A10AE4A4495EA6D82B99C1F86]]></AD_MESSAGE_ID>
<!--643C242A10AE4A4495EA6D82B99C1F86--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--643C242A10AE4A4495EA6D82B99C1F86--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--643C242A10AE4A4495EA6D82B99C1F86--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--643C242A10AE4A4495EA6D82B99C1F86--> <VALUE><![CDATA[ShowForgeLogoCommunity]]></VALUE>
<!--643C242A10AE4A4495EA6D82B99C1F86--> <MSGTEXT><![CDATA[Forge Logo cannot be hidden in Community Instances.]]></MSGTEXT>
<!--643C242A10AE4A4495EA6D82B99C1F86--> <MSGTYPE><![CDATA[E]]></MSGTYPE>
<!--643C242A10AE4A4495EA6D82B99C1F86--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--643C242A10AE4A4495EA6D82B99C1F86--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
<!--643C242A10AE4A4495EA6D82B99C1F86--></AD_MESSAGE>
<!--6464673990AB4DB2A9CFD6860D839518--><AD_MESSAGE>
<!--6464673990AB4DB2A9CFD6860D839518--> <AD_MESSAGE_ID><![CDATA[6464673990AB4DB2A9CFD6860D839518]]></AD_MESSAGE_ID>
<!--6464673990AB4DB2A9CFD6860D839518--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
......@@ -3658,19 +3658,6 @@
<!--893D5EA2377748B69FE201A7E50B692C--> <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
<!--893D5EA2377748B69FE201A7E50B692C--></AD_MODEL_OBJECT>
<!--8993A79B45F8457CB56FC27F084FF5C6--><AD_MODEL_OBJECT>
<!--8993A79B45F8457CB56FC27F084FF5C6--> <AD_MODEL_OBJECT_ID><![CDATA[8993A79B45F8457CB56FC27F084FF5C6]]></AD_MODEL_OBJECT_ID>
<!--8993A79B45F8457CB56FC27F084FF5C6--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--8993A79B45F8457CB56FC27F084FF5C6--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--8993A79B45F8457CB56FC27F084FF5C6--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--8993A79B45F8457CB56FC27F084FF5C6--> <ACTION><![CDATA[M]]></ACTION>
<!--8993A79B45F8457CB56FC27F084FF5C6--> <CLASSNAME><![CDATA[org.openbravo.erpCommon.obps.GetOpenbravoLogo]]></CLASSNAME>
<!--8993A79B45F8457CB56FC27F084FF5C6--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
<!--8993A79B45F8457CB56FC27F084FF5C6--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--8993A79B45F8457CB56FC27F084FF5C6--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
<!--8993A79B45F8457CB56FC27F084FF5C6--> <NAME><![CDATA[GetOpenbravoLogo]]></NAME>
<!--8993A79B45F8457CB56FC27F084FF5C6--></AD_MODEL_OBJECT>
<!--89D3D9EC0AAC4BA4AC8B3AA400B138BA--><AD_MODEL_OBJECT>
<!--89D3D9EC0AAC4BA4AC8B3AA400B138BA--> <AD_MODEL_OBJECT_ID><![CDATA[89D3D9EC0AAC4BA4AC8B3AA400B138BA]]></AD_MODEL_OBJECT_ID>
<!--89D3D9EC0AAC4BA4AC8B3AA400B138BA--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
......@@ -3695,19 +3682,6 @@
<!--89D878C0E07C471F98D0F6D02C9B7C5B--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
<!--89D878C0E07C471F98D0F6D02C9B7C5B--></AD_MODEL_OBJECT>
<!--8A935F84A79B45F8457CB91B09764786--><AD_MODEL_OBJECT>
<!--8A935F84A79B45F8457CB91B09764786--> <AD_MODEL_OBJECT_ID><![CDATA[8A935F84A79B45F8457CB91B09764786]]></AD_MODEL_OBJECT_ID>
<!--8A935F84A79B45F8457CB91B09764786--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--8A935F84A79B45F8457CB91B09764786--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--8A935F84A79B45F8457CB91B09764786--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--8A935F84A79B45F8457CB91B09764786--> <ACTION><![CDATA[M]]></ACTION>
<!--8A935F84A79B45F8457CB91B09764786--> <CLASSNAME><![CDATA[org.openbravo.erpCommon.obps.GetOpenbravoLogoGen]]></CLASSNAME>
<!--8A935F84A79B45F8457CB91B09764786--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
<!--8A935F84A79B45F8457CB91B09764786--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--8A935F84A79B45F8457CB91B09764786--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
<!--8A935F84A79B45F8457CB91B09764786--> <NAME><![CDATA[GetOpenbravoLogoGen]]></NAME>
<!--8A935F84A79B45F8457CB91B09764786--></AD_MODEL_OBJECT>
<!--8B7776CB913C4AA691B099647862D191--><AD_MODEL_OBJECT>
<!--8B7776CB913C4AA691B099647862D191--> <AD_MODEL_OBJECT_ID><![CDATA[8B7776CB913C4AA691B099647862D191]]></AD_MODEL_OBJECT_ID>
<!--8B7776CB913C4AA691B099647862D191--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
......
......@@ -2200,26 +2200,6 @@
<!--33A86B8C20B541B89FDEA5176D4394F5--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
<!--33A86B8C20B541B89FDEA5176D4394F5--></AD_MODEL_OBJECT_MAPPING>
<!--372045A027A74A08B6EBE5761AE7F061--><AD_MODEL_OBJECT_MAPPING>
<!--372045A027A74A08B6EBE5761AE7F061--> <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[372045A027A74A08B6EBE5761AE7F061]]></AD_MODEL_OBJECT_MAPPING_ID>
<!--372045A027A74A08B6EBE5761AE7F061--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--372045A027A74A08B6EBE5761AE7F061--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--372045A027A74A08B6EBE5761AE7F061--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--372045A027A74A08B6EBE5761AE7F061--> <AD_MODEL_OBJECT_ID><![CDATA[8993A79B45F8457CB56FC27F084FF5C6]]></AD_MODEL_OBJECT_ID>
<!--372045A027A74A08B6EBE5761AE7F061--> <MAPPINGNAME><![CDATA[/utility/GetOpenbravoLogo.png]]></MAPPINGNAME>
<!--372045A027A74A08B6EBE5761AE7F061--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
<!--372045A027A74A08B6EBE5761AE7F061--></AD_MODEL_OBJECT_MAPPING>
<!--38247A747684E7CA774A08A08B6EBE55--><AD_MODEL_OBJECT_MAPPING>
<!--38247A747684E7CA774A08A08B6EBE55--> <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[38247A747684E7CA774A08A08B6EBE55]]></AD_MODEL_OBJECT_MAPPING_ID>
<!--38247A747684E7CA774A08A08B6EBE55--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--38247A747684E7CA774A08A08B6EBE55--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--38247A747684E7CA774A08A08B6EBE55--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--38247A747684E7CA774A08A08B6EBE55--> <AD_MODEL_OBJECT_ID><![CDATA[8A935F84A79B45F8457CB91B09764786]]></AD_MODEL_OBJECT_ID>
<!--38247A747684E7CA774A08A08B6EBE55--> <MAPPINGNAME><![CDATA[/utility/GetOpenbravoLogoGen.png]]></MAPPINGNAME>
<!--38247A747684E7CA774A08A08B6EBE55--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
<!--38247A747684E7CA774A08A08B6EBE55--></AD_MODEL_OBJECT_MAPPING>
<!--399A972965894C07A288101047E72935--><AD_MODEL_OBJECT_MAPPING>
<!--399A972965894C07A288101047E72935--> <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[399A972965894C07A288101047E72935]]></AD_MODEL_OBJECT_MAPPING_ID>
<!--399A972965894C07A288101047E72935--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
......
......@@ -18396,17 +18396,6 @@
<!--952E92753AFEAF7EE040A8C02101519C--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--952E92753AFEAF7EE040A8C02101519C--></AD_TEXTINTERFACES>
 
<!--952E92753B01AF7EE040A8C02101519C--><AD_TEXTINTERFACES>
<!--952E92753B01AF7EE040A8C02101519C--> <AD_TEXTINTERFACES_ID><![CDATA[952E92753B01AF7EE040A8C02101519C]]></AD_TEXTINTERFACES_ID>
<!--952E92753B01AF7EE040A8C02101519C--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--952E92753B01AF7EE040A8C02101519C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--952E92753B01AF7EE040A8C02101519C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--952E92753B01AF7EE040A8C02101519C--> <TEXT><![CDATA[Project hosted at:]]></TEXT>
<!--952E92753B01AF7EE040A8C02101519C--> <FILENAME><![CDATA[/org/openbravo/erpCommon/security/Login.html]]></FILENAME>
<!--952E92753B01AF7EE040A8C02101519C--> <ISUSED><![CDATA[Y]]></ISUSED>
<!--952E92753B01AF7EE040A8C02101519C--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--952E92753B01AF7EE040A8C02101519C--></AD_TEXTINTERFACES>
<!--95A3ABD12DA47D55E040007F01014897--><AD_TEXTINTERFACES>
<!--95A3ABD12DA47D55E040007F01014897--> <AD_TEXTINTERFACES_ID><![CDATA[95A3ABD12DA47D55E040007F01014897]]></AD_TEXTINTERFACES_ID>
<!--95A3ABD12DA47D55E040007F01014897--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
/*
*************************************************************************
* The contents of this file are subject to the Openbravo Public License
* Version 1.1 (the "License"), being the Mozilla Public License
* Version 1.1 with a permitted attribution clause; you may not use this
* file except in compliance with the License. You may obtain a copy of
* the License at http://www.openbravo.com/legal/license.html
* Software distributed under the License is distributed on an "AS IS"
* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
* License for the specific language governing rights and limitations
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
* All portions are Copyright (C) 2009-2011 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
*/
package org.openbravo.erpCommon.obps;
import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.openbravo.base.HttpBaseServlet;
import org.openbravo.dal.core.OBContext;
import org.openbravo.utils.FileUtility;
/**
* Servlet which returns the openbravo logo image with version number. Depending on instance
* activation status either the ops image or the normal powered by openbravo image is returned.
*
* @author huehner
*
*/
public class GetOpenbravoLogo extends HttpBaseServlet {
private static final long serialVersionUID = 1L;
@Override
public void doPost(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException {
String communityLogo = "PoweredByOpenbravo.png";
String opsLogo = "PoweredByOpenbravoOPS.png";
// get instance active status from db
boolean active = false;
OBContext.setAdminMode();
try {
active = ActivationKey.getInstance().isActive();
log4j.debug("GetOpsLogo: activated: " + active);
} finally {
OBContext.restorePreviousMode();
}
String activeLogo;
if (active) {
activeLogo = opsLogo;
} else {
activeLogo = communityLogo;
}
FileUtility f = new FileUtility(this.globalParameters.prefix + "web/images", activeLogo, false,
true);
response.setContentType("image/png");
// mark response as cache-forever
response.addHeader("Expires", "Sun, 17 Jan 2038 19:14:07 GMT");
response.addHeader("Cache-Control", "public");
f.dumpFile(response.getOutputStream());
response.getOutputStream().flush();
response.getOutputStream().close();
}
}
/*
*************************************************************************
* The contents of this file are subject to the Openbravo Public License
* Version 1.1 (the "License"), being the Mozilla Public License
* Version 1.1 with a permitted attribution clause; you may not use this
* file except in compliance with the License. You may obtain a copy of
* the License at http://www.openbravo.com/legal/license.html
* Software distributed under the License is distributed on an "AS IS"
* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the