Author: knguyen
Date: Wed Oct 10 10:10:50 2007
New Revision: 18808
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18808&repname=
=3Djahia
Log:
JAHIA-2030: integrate Sergyi's work in progress in all Struts engines.
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/engines_defa=
ult_layout.jsp
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/engine=
s_default_layout.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/views/engines/engines_default_layout.jsp&rev=3D1880=
8&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/engines_defa=
ult_layout.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/engines_defa=
ult_layout.jsp Wed Oct 10 10:10:50 2007
@@ -102,10 +102,21 @@
// used by Html editors
// override this for preprocessing before for submission
}
-
+//-->
+</script>
+<script type=3D"text/javascript" src=3D"<%=3DURL%>../javascript/prototype/=
prototype-150-compressed.js"></script>
+<script type=3D"text/javascript" src=3D"<%=3Drequest.getContextPath()%>/js=
p/jahia/javascript/workinprogress.js"></script>
+<script type=3D"text/javascript">
+jahia.config =3D {
+ contextPath: '<%=3Drequest.getContextPath()%>'
+};
+</script>
+<script type=3D"text/javascript">
+<!--
var submittedCount =3D 0;
=
function teleportCaptainFlam(what) {
+ workInProgressOverlay.launch();
if (submittedCount =3D=3D 0) {
submittedCount++;
document.mainForm.submit();
@@ -182,6 +193,7 @@
}
=
function sendForm(method, params) {
+ workInProgressOverlay.launch();
document.mainForm.method.value =3D method;
document.mainForm.screen.value =3D "<%=3DtheScreen%>";
document.mainForm.engineview.value =3D "<%=3DengineView%>";
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=3D18808&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 Wed Oct 10 10:10:50 2007
@@ -41,6 +41,7 @@
} =
=
function sendForm(method, params) {
+ workInProgressOverlay.launch();
document.mainForm.method.value =3D method;
document.mainForm.action =3D "<%=3DactionURL%>";
document.mainForm.screen.value =3D "<%=3DtheScreen%>";
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=3D18808&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 Wed Oct 10 10:10:50 2007
@@ -41,6 +41,7 @@
} =
=
function sendForm(method, params) {
+ workInProgressOverlay.launch();
document.mainForm.method.value =3D method;
document.mainForm.action =3D "<%=3DactionURL%>";
document.mainForm.screen.value =3D "<%=3DtheScreen%>";
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
