Author: knguyen
Date: Tue Oct 9 10:54:50 2007
New Revision: 18789
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18789&repname=
=3Djahia
Log:
JAHIA-2342: Fixed loosing Language settings in Versioning engine
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/versioning/c=
ommon-javascript.inc
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/versioning/c=
ontainer/common-javascript.inc
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/versioning/p=
ages/common-javascript.inc
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/versio=
ning/common-javascript.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/views/engines/versioning/common-javascript.inc&rev=
=3D18789&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/versioning/c=
ommon-javascript.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/versioning/c=
ommon-javascript.inc Tue Oct 9 10:54:50 2007
@@ -18,7 +18,9 @@
var method =3D "";
if ( "operationChoices"=3D=3DengineView ){
method =3D "showOperationChoices"; =
- } else if ( "sitemap"=3D=3DengineView ){
+ } else if ( engineView =3D=3D "confirmRestore" ){
+ method =3D "showConfirmRestore"; =
+ } else if ( "showSiteMap"=3D=3DengineView ){
method =3D "showSiteMap"; =
}
sendForm(method);
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/versio=
ning/container/common-javascript.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/views/engines/versioning/container/common-javascrip=
t.inc&rev=3D18789&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/versioning/c=
ontainer/common-javascript.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/versioning/c=
ontainer/common-javascript.inc Tue Oct 9 10:54:50 2007
@@ -11,6 +11,23 @@
}
}
=
+function handleLanguageChange(lang) {
+ document.mainForm.method =3D "POST";
+ document.mainForm.screen.value =3D "<%=3DtheScreen%>";
+ document.mainForm.engine_lang.value =3D lang;
+ var engineView =3D '<%=3DengineView%>';
+ var method =3D "";
+ if ( engineView =3D=3D "revisionsList" ){
+ method =3D "showRevisionsList"; =
+ } else if ( engineView =3D=3D "confirmRestore" ){
+ method =3D "showConfirmRestore"; =
+ } else if ( engineView =3D=3D "containersList" ){
+ method =3D "showContainersList"; =
+ } =
+ sendForm(method);
+} =
+
+
function sendFormSave(){
window.close();
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/versio=
ning/pages/common-javascript.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/views/engines/versioning/pages/common-javascript.in=
c&rev=3D18789&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/versioning/p=
ages/common-javascript.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/versioning/p=
ages/common-javascript.inc Tue Oct 9 10:54:50 2007
@@ -22,6 +22,24 @@
sendForm('cancel', '');
} =
=
+function handleLanguageChange(lang) {
+ document.mainForm.method =3D "POST";
+ document.mainForm.screen.value =3D "<%=3DtheScreen%>";
+ document.mainForm.engine_lang.value =3D lang;
+ var engineView =3D '<%=3DengineView%>';
+ var method =3D "";
+ if ( "operationChoices"=3D=3DengineView ){
+ method =3D "showOperationChoices"; =
+ } else if ( engineView =3D=3D "confirmRestore" ){
+ method =3D "showConfirmRestore"; =
+ } else if ( "revisionsList"=3D=3DengineView ){
+ method =3D "showRevisionsList"; =
+ } else if ( "sitemap"=3D=3DengineView ){
+ method =3D "showSiteMap"; =
+ }
+ sendForm(method);
+} =
+
function sendForm(method, params) {
document.mainForm.method.value =3D method;
document.mainForm.action =3D "<%=3DactionURL%>";
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
