Index: branches/RC/core/install/install_schema.sql
===================================================================
diff -u -N -r11593 -r11599
--- branches/RC/core/install/install_schema.sql (.../install_schema.sql) (revision 11593)
+++ branches/RC/core/install/install_schema.sql (.../install_schema.sql) (revision 11599)
@@ -180,10 +180,11 @@
LanguageId int(11) NOT NULL default '0',
LastChanged int(10) unsigned NOT NULL default '0',
LastChangeIP varchar(15) NOT NULL default '',
- Module VARCHAR(30) NOT NULL DEFAULT 'In-Portal',
+ Module varchar(30) NOT NULL default 'In-Portal',
PRIMARY KEY (PhraseId),
+ UNIQUE KEY LanguageId_2 (LanguageId,Phrase),
KEY LanguageId (LanguageId),
- INDEX Phrase_Index (Phrase)
+ KEY Phrase_Index (Phrase)
);
CREATE TABLE PhraseCache (
Index: branches/RC/core/install/upgrades.sql
===================================================================
diff -u -N -r11594 -r11599
--- branches/RC/core/install/upgrades.sql (.../upgrades.sql) (revision 11594)
+++ branches/RC/core/install/upgrades.sql (.../upgrades.sql) (revision 11599)
@@ -1106,4 +1106,7 @@
UPDATE ConfigurationValues SET VariableValue = '/platform/designs/general' WHERE VariableName = 'cms_DefaultDesign';
UPDATE ConfigurationValues SET ModuleOwner = 'In-Portal', Section = 'in-portal:configure_categories' WHERE VariableName = 'cms_DefaultDesign';
-UPDATE ConfigurationAdmin SET DisplayOrder = 10.29 WHERE VariableName = 'cms_DefaultDesign';
\ No newline at end of file
+UPDATE ConfigurationAdmin SET DisplayOrder = 10.29 WHERE VariableName = 'cms_DefaultDesign';
+
+UPDATE Phrase SET Module = 'Core' WHERE Phrase IN ('la_Hide', 'la_Show', 'la_fld_Requied', 'la_col_Modified');
+ALTER TABLE Phrase ADD UNIQUE (LanguageId, Phrase);
Index: branches/RC/themes/default2009/platform/designs/default_design.des.tpl
===================================================================
diff -u -N -r11511 -r11599
--- branches/RC/themes/default2009/platform/designs/default_design.des.tpl (.../default_design.des.tpl) (revision 11511)
+++ branches/RC/themes/default2009/platform/designs/default_design.des.tpl (.../default_design.des.tpl) (revision 11599)
@@ -19,6 +19,7 @@
+
@@ -74,7 +75,7 @@
-
+
Index: branches/RC/core/install/english.lang
===================================================================
diff -u -N -r11416 -r11599
--- branches/RC/core/install/english.lang (.../english.lang) (revision 11416)
+++ branches/RC/core/install/english.lang (.../english.lang) (revision 11599)
@@ -108,6 +108,7 @@
RW1haWxzIFF1ZXVlZA==
RW1haWxzIFNlbnQ=
RW1haWxzIFRvdGFs
+ RW5kIERhdGU=
Jm5ic3A7
RXZlbnQ=
RmllbGQgQ29tcGFyaXNpb24=
@@ -168,6 +169,7 @@
UHJldmlldw==
UHJpbWFyeSBHcm91cA==
UHJpbWFyeSBWYWx1ZQ==
+ UHJpb3JpdHk=
RmllbGQgUHJvbXB0
UXVldWVk
UmF0aW5n
@@ -232,6 +234,7 @@
R1pJUCBjb21wcmVzc2lvbiBsZXZlbCAwLTk=
UGF0aCB0byBXZWJzaXRl
UmV2aWV3cyBwZXIgcGFnZQ==
+ UXVpY2sgQ2F0ZWdvcnkgUGVybWlzc2lvbiBSZWJ1aWxk
IlJlY3ljbGUgQmluIiBDYXRlZ29yeUlk
UmVnaXN0cmF0aW9uIE51bWJlcg==
UmVtZW1iZXIgTGFzdCBBZG1pbiBUZW1wbGF0ZQ==
@@ -1829,6 +1832,7 @@
TmV3IFRoZW1l
Tm8gQ2F0ZWdvcmllcw==
Tm9uZQ==
+ Tm8gUGVybWlzc2lvbg==
Tm8gcGVybWlzc2lvbnM=
RG9lcyBOb3QgQ29udGFpbg==
Tm90IFZhbGlkYXRlZA==
@@ -1922,6 +1926,7 @@
QWRkaW5nIE1haWxpbmcgTGlzdA==
QWRkaW5nIFNraW4=
QWRkaW5nIFNwZWxsaW5nIERpY3Rpb25hcnk=
+ QWRkaW5nIFRoZXNhdXJ1cw==
QWRkaW5nIEJhc2UgU3R5bGU=
QWRkaW5nIEJsb2NrIFN0eWxl
QWRkaW5nIENhdGVnb3J5
@@ -1965,6 +1970,7 @@
RWRpdGluZyBTa2lu
RWRpdGluZyBTcGVsbGluZyBEaWN0aW9uYXJ5
RWRpdGluZyBTdHlsZQ==
+ RWRpdGluZyBUaGVzYXVydXM=
RWRpdGluZyBUcmFuc2xhdGlvbg==
RWRpdGluZyBCYXNlIFN0eWxl
RWRpdGluZyBCbG9jayBTdHlsZQ==
@@ -3221,6 +3227,8 @@
WC1Qcmlvcml0eTogMQpYLU1TTWFpbC1Qcmlvcml0eTogSGlnaApYLU1haWxlcjogSW4tUG9ydGFsClN1YmplY3Q6IEEgY2F0ZWdvcnkgaGFzIGJlZW4gbW9kaWZpZWQKCllvdXIgc3VnZ2VzdGVkIGNhdGVnb3J5ICI8aW5wMjpjX0ZpZWxkIG5hbWU9Ik5hbWUiLz4iIGhhcyBiZWVuIG1vZGlmaWVkLg==
WC1Qcmlvcml0eTogMQpYLU1TTWFpbC1Qcmlvcml0eTogSGlnaApYLU1haWxlcjogSW4tUG9ydGFsClN1YmplY3Q6IEEgY2F0ZWdvcnkgaGFzIGJlZW4gbW9kaWZpZWQKCkEgY2F0ZWdvcnkgIjxpbnAyOmNfRmllbGQgbmFtZT0iTmFtZSIvPiIgaGFzIGJlZW4gbW9kaWZpZWQu
WC1Qcmlvcml0eTogMQpYLU1TTWFpbC1Qcmlvcml0eTogSGlnaApYLU1haWxlcjogSW4tUG9ydGFsClN1YmplY3Q6IENvbW1vbiBGb290ZXIgVGVtcGxhdGUKCg==
+ U3ViamVjdDogVGhhbmsgWW91IGZvciBDb250YWN0aW5nIFVzIQoKPHA+RGVhciAkZmlyc3RuYW1lISBUaGFuayB5b3UgZm9yIGNvbnRhY3RpbmcgdXMhPC9wPg==
+ dGVzdApTdWJqZWN0OiBUaGFuayBZb3UgZm9yIENvbnRhY3RpbmcgVXMhCgo8cD5EZWFyICRmaXJzdG5hbWUhIDxiciAvPg0KVGhhbmsgeW91IGZvciBjb250YWN0aW5nIHVzITwvcD4=
WC1Qcmlvcml0eTogMQpYLU1TTWFpbC1Qcmlvcml0eTogSGlnaApYLU1haWxlcjogSW4tUG9ydGFsClN1YmplY3Q6IEluLXBvcnRhbCByZWdpc3RyYXRpb24KCkRlYXIgPGlucDI6dV9GaWVsZCBuYW1lPSJGaXJzdE5hbWUiIC8+IDxpbnAyOnVfRmllbGQgbmFtZT0iTGFzdE5hbWUiIC8+LA0KDQpUaGFuayB5b3UgZm9yIHJlZ2lzdGVyaW5nIG9uIDxpbnAyOm1fQmFzZVVybC8+LiBZb3VyIHJlZ2lzdHJhdGlvbiBpcyBub3cgYWN0aXZlLg==
WC1Qcmlvcml0eTogMQpYLU1TTWFpbC1Qcmlvcml0eTogSGlnaApYLU1haWxlcjogSW4tUG9ydGFsClN1YmplY3Q6IE5ldyB1c2VyIGhhcyBiZWVuIGFkZGVkCgpBIG5ldyB1c2VyICI8aW5wMjp1X0ZpZWxkIG5hbWU9IkxvZ2luIi8+IiBoYXMgYmVlbiBhZGRlZC4=
WC1Qcmlvcml0eTogMQpYLU1TTWFpbC1Qcmlvcml0eTogSGlnaApYLU1haWxlcjogSW4tUG9ydGFsClN1YmplY3Q6IEluLVBvcnRhbCBSZWdpc3RyYXRpb24KCkRlYXIgPGlucDI6dV9GaWVsZCBuYW1lPSJGaXJzdE5hbWUiIC8+IDxpbnAyOnVfRmllbGQgbmFtZT0iTGFzdE5hbWUiIC8+LA0KDQpUaGFuayB5b3UgZm9yIHJlZ2lzdGVyaW5nIG9uIDxpbnAyOm1fQmFzZVVybCAvPiB3ZWJzaXRlLiBZb3VyIHJlZ2lzdHJhdGlvbiB3aWxsIGJlIGFjdGl2ZSBhZnRlciBhcHByb3ZhbC4=
Index: branches/RC/themes/default2009/platform/designs/general.tpl
===================================================================
diff -u -N -r11586 -r11599
--- branches/RC/themes/default2009/platform/designs/general.tpl (.../general.tpl) (revision 11586)
+++ branches/RC/themes/default2009/platform/designs/general.tpl (.../general.tpl) (revision 11599)
@@ -29,7 +29,7 @@
-
+
Index: branches/RC/themes/default2009/platform/designs/form.tpl
===================================================================
diff -u -N -r11586 -r11599
--- branches/RC/themes/default2009/platform/designs/form.tpl (.../form.tpl) (revision 11586)
+++ branches/RC/themes/default2009/platform/designs/form.tpl (.../form.tpl) (revision 11599)
@@ -31,7 +31,7 @@
-
+
Index: branches/RC/core/install/upgrades.php
===================================================================
diff -u -N -r11572 -r11599
--- branches/RC/core/install/upgrades.php (.../upgrades.php) (revision 11572)
+++ branches/RC/core/install/upgrades.php (.../upgrades.php) (revision 11599)
@@ -675,6 +675,7 @@
function Upgrade_5_0_0($mode)
{
if ($mode == 'before') {
+ $this->_removeDuplicatePhrases(); // because In-Commerce & In-Link share some phrases with Proj-CMS
$this->_createProjCMSTables();
}
Index: branches/RC/core/admin_templates/js/grid_scroller.js
===================================================================
diff -u -N -r11576 -r11599
--- branches/RC/core/admin_templates/js/grid_scroller.js (.../grid_scroller.js) (revision 11576)
+++ branches/RC/core/admin_templates/js/grid_scroller.js (.../grid_scroller.js) (revision 11599)
@@ -232,15 +232,17 @@
// direct innerHTML assignment results empty line (15px height) to be added before
// container when grid data is set from ajax responce (like in catalog) in IE, so
// use jQuery here
+// document.getElementById(id).innerHTML = this._getMeasureHtml() + ''+this.Html+'
';
$( jq('#' + id) ).html( this._getMeasureHtml() + ''+this.Html+'
' );
}
else {
// direct innerHTML assignment results empty line (15px height) to be added before
// container when grid data is set from ajax responce (like in catalog) in IE, so
// use jQuery here
+// document.getElementById(id).innerHTML = ''+this.Html+'
';
$( jq('#' + id) ).html( ''+this.Html+'
' );
}
- execJS(document.getElementById(id));
+// execJS(document.getElementById(id));
}
else {
// console.log('id not given');
Index: branches/RC/core/admin_templates/js/ajax.js
===================================================================
diff -u -N -r11592 -r11599
--- branches/RC/core/admin_templates/js/ajax.js (.../ajax.js) (revision 11592)
+++ branches/RC/core/admin_templates/js/ajax.js (.../ajax.js) (revision 11599)
@@ -131,8 +131,8 @@
top: $content_offset.top + $parent_div.scrollTop(),
position: 'absolute',
zIndex: 200,
- opacity: 0.75,
- backgroundColor: 'lightgray',
+ opacity: 0.5,
+ backgroundColor: '#2D79D6',
// don't show progress overlay, when target div is hidden
display: $content_offset.top /*$content_height*/ > 0 ? 'block' : 'none'