Author: bpapez
Date: Sun Sep 2 12:06:19 2007
New Revision: 18346
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18346&repname=
=3Djahia
Log:
Read-only mode for a cluster node
Modified:
trunk/core/src/conf/java/JahiaEnginesResources.properties
trunk/core/src/conf/java/JahiaEnginesResources_de.properties
trunk/core/src/conf/java/JahiaEnginesResources_en.properties
trunk/core/src/conf/java/JahiaMessageResources.properties
trunk/core/src/conf/java/JahiaMessageResources_de.properties
trunk/core/src/conf/java/JahiaMessageResources_en.properties
trunk/core/src/java/org/jahia/params/ProcessingContext.java
trunk/core/src/java/org/jahia/settings/SettingsBean.java
trunk/core/src/webapp/WEB-INF/etc/config/jahia.skeleton
trunk/core/src/webapp/jsp/jahia/errors/error_403.jsp
trunk/core/src/webapp/jsp/jahia/topbar/operationbuttons.inc
trunk/core/src/webapp/jsp/jahia/topbar/topmenu.inc
Modified: trunk/core/src/conf/java/JahiaEnginesResources.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaEnginesResources.properties&rev=3D18346&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
--- trunk/core/src/conf/java/JahiaEnginesResources.properties (original)
+++ trunk/core/src/conf/java/JahiaEnginesResources.properties Sun Sep 2 12=
:06:19 2007
@@ -559,6 +559,8 @@
org.jahia.bin.JahiaErrorDisplay.httpForbidden.label =3D HTTP 403 Forbidden
org.jahia.bin.JahiaErrorDisplay.httpNotFound.label =3D HTTP 404 Not Found
org.jahia.bin.JahiaErrorDisplay.httpServiceUnavailable.label =3D HTTP 503 =
Service temporarily unavailable
+org.jahia.bin.JahiaErrorDisplay.invalidMode.label =3D HTTP 403 Invalid mode
+org.jahia.bin.JahiaErrorDisplay.invalidModeRequested.label =3D You request=
ed an invalid mode for this server.
org.jahia.bin.JahiaErrorDisplay.jahiaError.label =3D Jahia Error
org.jahia.bin.JahiaErrorDisplay.jspError.label =3D JSP Error
org.jahia.bin.JahiaErrorDisplay.login.label =3D Login
@@ -566,6 +568,7 @@
org.jahia.bin.JahiaErrorDisplay.logout.label =3D Logout
org.jahia.bin.JahiaErrorDisplay.mailNotification.label =3D A mail notifica=
tion has been sent to the Administrator.
org.jahia.bin.JahiaErrorDisplay.pageNotFound.label =3D 404 - Page not foun=
d.
+org.jahia.bin.JahiaErrorDisplay.redirectToNormal.label =3D You will be red=
irected to normal mode in {0} seconds...
org.jahia.bin.JahiaErrorDisplay.retry.label =3D Retry
org.jahia.bin.JahiaErrorDisplay.retryInTime.label =3D Please try again in =
{0,choice,0#|1#1 hour |1<{0,number,integer} hours }{1,choice,0#|1#1 minute =
|1<{1,number,integer} minutes }{2,choice,0#|1#1 second|1<{2,number,integer}=
seconds}.
org.jahia.bin.JahiaErrorDisplay.retryLater.label =3D Please try again late=
r.
Modified: trunk/core/src/conf/java/JahiaEnginesResources_de.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaEnginesResources_de.properties&rev=3D18346&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
--- trunk/core/src/conf/java/JahiaEnginesResources_de.properties (original)
+++ trunk/core/src/conf/java/JahiaEnginesResources_de.properties Sun Sep 2=
12:06:19 2007
@@ -82,6 +82,8 @@
org.jahia.bin.JahiaErrorDisplay.httpForbidden.label =3D HTTP 403 Nicht zul=
\u00E4ssig
org.jahia.bin.JahiaErrorDisplay.httpNotFound.label =3D HTTP 404 Nicht gefu=
nden
org.jahia.bin.JahiaErrorDisplay.httpServiceUnavailable.label =3D HTTP 503 =
Service vor\u00FCbergehend nicht verf\u00FCgbar
+org.jahia.bin.JahiaErrorDisplay.invalidMode.label =3D HTTP 403 Ung\u00FClt=
iger Modus
+org.jahia.bin.JahiaErrorDisplay.invalidModeRequested.label =3D Ihr Anforde=
rung ist in einem ung\u00FCltigen Modus f\u00FCr diesen Server.
org.jahia.bin.JahiaErrorDisplay.jahiaError.label =3D Jahia-Fehler
org.jahia.bin.JahiaErrorDisplay.jspError.label =3D JSP-Fehler
org.jahia.bin.JahiaErrorDisplay.login.label =3D Anmelden
@@ -89,6 +91,7 @@
org.jahia.bin.JahiaErrorDisplay.logout.label =3D Abmelden
org.jahia.bin.JahiaErrorDisplay.mailNotification.label =3D Der Administrat=
or wurde per E-Mail benachrichtigt.
org.jahia.bin.JahiaErrorDisplay.pageNotFound.label =3D 404 - Seite nicht g=
efunden
+org.jahia.bin.JahiaErrorDisplay.redirectToNormal.label =3D Sie werden in {=
0} Sekunden zum normalen Modus umgeleitet.
org.jahia.bin.JahiaErrorDisplay.retry.label =3D Wiederholen
org.jahia.bin.JahiaErrorDisplay.retryInTime.label =3D Bitte versuchen sie =
es in {0,choice,0#|1#1 Stunde |1<{0,number,integer} Stunden }{1,choice,0#|1=
#1 Minute |1<{1,number,integer} Minuten }{2,choice,0#|1#1 Sekunde|1<{2,numb=
er,integer} Sekunden} wieder.
org.jahia.bin.JahiaErrorDisplay.retryLater.label =3D Bitte versuchen sie e=
s zu einem sp\u00E4teren Zeitpunkt wieder.
Modified: trunk/core/src/conf/java/JahiaEnginesResources_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaEnginesResources_en.properties&rev=3D18346&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
--- trunk/core/src/conf/java/JahiaEnginesResources_en.properties (original)
+++ trunk/core/src/conf/java/JahiaEnginesResources_en.properties Sun Sep 2=
12:06:19 2007
@@ -559,6 +559,8 @@
org.jahia.bin.JahiaErrorDisplay.httpForbidden.label =3D HTTP 403 Forbidden
org.jahia.bin.JahiaErrorDisplay.httpNotFound.label =3D HTTP 404 Not Found
org.jahia.bin.JahiaErrorDisplay.httpServiceUnavailable.label =3D HTTP 503 =
Service temporarily unavailable
+org.jahia.bin.JahiaErrorDisplay.invalidMode.label =3D HTTP 403 Invalid mode
+org.jahia.bin.JahiaErrorDisplay.invalidModeRequested.label =3D You request=
ed an invalid mode for this server.
org.jahia.bin.JahiaErrorDisplay.jahiaError.label =3D Jahia Error
org.jahia.bin.JahiaErrorDisplay.jspError.label =3D JSP Error
org.jahia.bin.JahiaErrorDisplay.login.label =3D Login
@@ -566,6 +568,7 @@
org.jahia.bin.JahiaErrorDisplay.logout.label =3D Logout
org.jahia.bin.JahiaErrorDisplay.mailNotification.label =3D A mail notifica=
tion has been sent to the Administrator.
org.jahia.bin.JahiaErrorDisplay.pageNotFound.label =3D 404 - Page not foun=
d.
+org.jahia.bin.JahiaErrorDisplay.redirectToNormal.label =3D You will be red=
irected to normal mode in {0} seconds...
org.jahia.bin.JahiaErrorDisplay.retry.label =3D Retry
org.jahia.bin.JahiaErrorDisplay.retryInTime.label =3D Please try again in =
{0,choice,0#|1#1 hour |1<{0,number,integer} hours }{1,choice,0#|1#1 minute =
|1<{1,number,integer} minutes }{2,choice,0#|1#1 second|1<{2,number,integer}=
seconds}.
org.jahia.bin.JahiaErrorDisplay.retryLater.label =3D Please try again late=
r.
Modified: trunk/core/src/conf/java/JahiaMessageResources.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaMessageResources.properties&rev=3D18346&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
--- trunk/core/src/conf/java/JahiaMessageResources.properties (original)
+++ trunk/core/src/conf/java/JahiaMessageResources.properties Sun Sep 2 12=
:06:19 2007
@@ -193,11 +193,14 @@
org.jahia.bin.JahiaErrorDisplay.httpForbidden.label =3D HTTP 403 Forbidden
org.jahia.bin.JahiaErrorDisplay.httpNotFound.label =3D HTTP 404 Not Found
org.jahia.bin.JahiaErrorDisplay.httpServiceUnavailable.label =3D HTTP 503 =
Service temporarily unavailable
+org.jahia.bin.JahiaErrorDisplay.invalidMode.label =3D HTTP 403 Invalid mode
+org.jahia.bin.JahiaErrorDisplay.invalidModeRequested.label =3D You request=
ed an invalid mode for this server.
org.jahia.bin.JahiaErrorDisplay.jahiaError.label =3D Jahia Error
org.jahia.bin.JahiaErrorDisplay.login.label =3D Login
org.jahia.bin.JahiaErrorDisplay.loginAgain.label =3D You must log in again
org.jahia.bin.JahiaErrorDisplay.mailNotification.label =3D A mail notifica=
tion has been sent to the Administrator.
org.jahia.bin.JahiaErrorDisplay.pageNotFound.label =3D 404 - Page not foun=
d.
+org.jahia.bin.JahiaErrorDisplay.redirectToNormal.label =3D You will be red=
irected to normal mode in {0} seconds...
org.jahia.bin.JahiaErrorDisplay.retry.label =3D Retry
org.jahia.bin.JahiaErrorDisplay.retryInTime.label =3D Please try again in =
{0,choice,0#|1#1 hour |1<{0,number,integer} hours }{1,choice,0#|1#1 minute =
|1<{1,number,integer} minutes }{2,choice,0#|1#1 second|1<{2,number,integer}=
seconds}.
org.jahia.bin.JahiaErrorDisplay.retryLater.label =3D Please try again late=
r.
Modified: trunk/core/src/conf/java/JahiaMessageResources_de.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaMessageResources_de.properties&rev=3D18346&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
--- trunk/core/src/conf/java/JahiaMessageResources_de.properties (original)
+++ trunk/core/src/conf/java/JahiaMessageResources_de.properties Sun Sep 2=
12:06:19 2007
@@ -191,12 +191,15 @@
org.jahia.bin.JahiaErrorDisplay.httpForbidden.label =3D HTTP 403 Nicht zul=
=C3=A4ssig
org.jahia.bin.JahiaErrorDisplay.httpNotFound.label =3D HTTP 404 Nicht gefu=
nden
org.jahia.bin.JahiaErrorDisplay.httpServiceUnavailable.label =3D HTTP 503 =
Service vor\u00FCbergehend nicht verf\u00FCgbar
+org.jahia.bin.JahiaErrorDisplay.invalidMode.label =3D HTTP 403 Ung\u00FClt=
iger Modus
+org.jahia.bin.JahiaErrorDisplay.invalidModeRequested.label =3D Ihr Anforde=
rung ist in einem ung\u00FCltigen Modus f\u00FCr diesen Server.
org.jahia.bin.JahiaErrorDisplay.jahiaError.label =3D Jahia-Fehler
org.jahia.bin.JahiaErrorDisplay.login.label =3D Anmelden
org.jahia.bin.JahiaErrorDisplay.loginAgain.label =3D Sie m=C3=BCssen sich =
erneut anmelden
org.jahia.bin.JahiaErrorDisplay.logout.label =3D Abmelden
org.jahia.bin.JahiaErrorDisplay.mailNotification.label =3D Der Administrat=
or wurde per E-Mail benachrichtigt.
org.jahia.bin.JahiaErrorDisplay.pageNotFound.label =3D 404 - Seite nicht g=
efunden
+org.jahia.bin.JahiaErrorDisplay.redirectToNormal.label =3D Sie werden in {=
0} Sekunden zum normalen Modus umgeleitet.
org.jahia.bin.JahiaErrorDisplay.retry.label =3D Wiederholen
org.jahia.bin.JahiaErrorDisplay.retryInTime.label =3D Bitte versuchen sie =
es in {0,choice,0#|1#1 Stunde |1<{0,number,integer} Stunden }{1,choice,0#|1=
#1 Minute |1<{1,number,integer} Minuten }{2,choice,0#|1#1 Sekunde|1<{2,numb=
er,integer} Sekunden} wieder.
org.jahia.bin.JahiaErrorDisplay.retryLater.label =3D Bitte versuchen sie e=
s zu einem sp\u00E4teren Zeitpunkt wieder.
Modified: trunk/core/src/conf/java/JahiaMessageResources_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaMessageResources_en.properties&rev=3D18346&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
--- trunk/core/src/conf/java/JahiaMessageResources_en.properties (original)
+++ trunk/core/src/conf/java/JahiaMessageResources_en.properties Sun Sep 2=
12:06:19 2007
@@ -194,12 +194,15 @@
org.jahia.bin.JahiaErrorDisplay.httpForbidden.label =3D HTTP 403 Forbidden
org.jahia.bin.JahiaErrorDisplay.httpNotFound.label =3D HTTP 404 Not Found
org.jahia.bin.JahiaErrorDisplay.httpServiceUnavailable.label =3D HTTP 503 =
Service temporarily unavailable
+org.jahia.bin.JahiaErrorDisplay.invalidMode.label =3D HTTP 403 Invalid mode
+org.jahia.bin.JahiaErrorDisplay.invalidModeRequested.label =3D You request=
ed an invalid mode for this server.
org.jahia.bin.JahiaErrorDisplay.jahiaError.label =3D Jahia Error
org.jahia.bin.JahiaErrorDisplay.login.label =3D Login
org.jahia.bin.JahiaErrorDisplay.loginAgain.label =3D You must log in again
org.jahia.bin.JahiaErrorDisplay.logout.label =3D Logout
org.jahia.bin.JahiaErrorDisplay.mailNotification.label =3D A mail notifica=
tion has been sent to the Administrator.
org.jahia.bin.JahiaErrorDisplay.pageNotFound.label =3D 404 - Page not foun=
d.
+org.jahia.bin.JahiaErrorDisplay.redirectToNormal.label =3D You will be red=
irected to normal mode in {0} seconds...
org.jahia.bin.JahiaErrorDisplay.retry.label =3D Retry
org.jahia.bin.JahiaErrorDisplay.retryInTime.label =3D Please try again in =
{0,choice,0#|1#1 hour |1<{0,number,integer} hours }{1,choice,0#|1#1 minute =
|1<{1,number,integer} minutes }{2,choice,0#|1#1 second|1<{2,number,integer}=
seconds}.
org.jahia.bin.JahiaErrorDisplay.retryLater.label =3D Please try again late=
r.
Modified: trunk/core/src/java/org/jahia/params/ProcessingContext.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/params/ProcessingContext.java&rev=3D18346&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
--- trunk/core/src/java/org/jahia/params/ProcessingContext.java (original)
+++ trunk/core/src/java/org/jahia/params/ProcessingContext.java Sun Sep 2 =
12:06:19 2007
@@ -823,7 +823,7 @@
newLoadRequest.setWithMarkedForDeletion(true);
} else if (EDIT.equals(getOpMode())) {
newLoadRequest.setWithDeleted(false);
- newLoadRequest.setWithMarkedForDeletion(true);
+ newLoadRequest.setWithMarkedForDeletion(false);
}
if (this.entryLoadRequest.getWorkflowState() > 0) {
this.entryLoadRequest =3D newLoadRequest;
@@ -2059,27 +2059,13 @@
}
theUrl.append(strutsAction);
=
- String paramValue =3D getSiteURLPart();
String paramSep =3D "?";
- if (paramValue !=3D null && !paramValue.trim().equals("")) {
- theUrl.append(paramSep);
- theUrl.append(paramValue);
- paramSep =3D "&";
- }
- paramValue =3D getOpModeURLPart(getOpMode());
- if (paramValue !=3D null && !paramValue.trim().equals("")) {
- theUrl.append(paramSep);
- theUrl.append(paramValue);
- paramSep =3D "&";
- }
- if (getContentPage() !=3D null) {
- paramValue =3D getPageURLPart(getContentPage().getID(),true);
- if (paramValue !=3D null && !paramValue.trim().equals("")) {
- theUrl.append(paramSep);
- theUrl.append(paramValue);
- paramSep =3D "&";
- }
- }
+ String urlParams =3D getSiteAndModeAndPageAsURLParams(paramSep);
+ theUrl.append(urlParams);
+ if (urlParams.length() > 0)
+ paramSep =3D "&"; =
+ =
+ String paramValue;
final Enumeration propertyNames =3D extraJahiaParams.propertyNames=
();
while (propertyNames.hasMoreElements()) {
final String propertyName =3D (String) propertyNames.nextEleme=
nt();
@@ -2100,6 +2086,35 @@
=
return encodeURL(theUrl.toString());
}
+ =
+ public String getSiteAndModeAndPageAsURLParams(String paramSepFirst) {
+ boolean old =3D useQueryStringParameterUrl;
+ useQueryStringParameterUrl =3D true;
+ StringBuffer theUrl =3D new StringBuffer();
+ String paramValue =3D getSiteURLPart();
+ String paramSep =3D paramSepFirst;
+ if (paramValue !=3D null && !paramValue.trim().equals("")) {
+ theUrl.append(paramSep);
+ theUrl.append(paramValue);
+ paramSep =3D "&";
+ }
+ paramValue =3D getOpModeURLPart(opMode);
+ if (paramValue !=3D null && !paramValue.trim().equals("")) {
+ theUrl.append(paramSep);
+ theUrl.append(paramValue);
+ paramSep =3D "&";
+ }
+ if (contentPage !=3D null) {
+ paramValue =3D getPageURLPart(contentPage.getID(), true);
+ if (paramValue !=3D null && !paramValue.trim().equals("")) {
+ theUrl.append(paramSep);
+ theUrl.append(paramValue);
+ paramSep =3D "&";
+ }
+ }
+ useQueryStringParameterUrl =3D old;
+ return theUrl.toString();
+ } =
=
// @author Khue Nguyen
=
@@ -2147,37 +2162,23 @@
theUrl.append("/");
}
theUrl.append(facesPage);
-
- if (getContentPage() !=3D null) {
- final String paramValue =3D getPageURLKeyPart(getContentPage()=
.getID());
- final String paramSep =3D "?";
- if (paramValue !=3D null && !paramValue.trim().equals("")) {
- theUrl.append(paramSep);
- theUrl.append(paramValue);
- }
- }
- String paramValue =3D getSiteURLPart();
+ =
String paramSep =3D "?";
- if (paramValue !=3D null && !paramValue.trim().equals("")) {
- theUrl.append(paramSep);
- theUrl.append(paramValue);
- paramSep =3D "&";
- }
- paramValue =3D getOpModeURLPart(getOpMode());
- if (paramValue !=3D null && !paramValue.trim().equals("")) {
- theUrl.append(paramSep);
- theUrl.append(paramValue);
- paramSep =3D "&";
- }
if (getContentPage() !=3D null) {
- paramValue =3D getPageURLPart(getContentPage().getID());
- if (paramValue !=3D null && !paramValue.trim().equals("")) {
+ final String paramValue =3D getPageURLKeyPart(getContentPage()=
.getID());
+ if (paramValue !=3D null && !paramValue.trim().equ=
als("")) {
theUrl.append(paramSep);
theUrl.append(paramValue);
- paramSep =3D "&";
+ paramSep =3D "&"; =
}
}
=
+ String urlParams =3D getSiteAndModeAndPageAsURLParams(paramSep);
+ theUrl.append(urlParams);
+ if (urlParams.length() > 0)
+ paramSep =3D "&";
+ =
+ String paramValue; =
final Enumeration propertyNames =3D extraJahiaParams.propertyNames=
();
while (propertyNames.hasMoreElements()) {
final String propertyName =3D (String) propertyNames.nextEleme=
nt();
Modified: trunk/core/src/java/org/jahia/settings/SettingsBean.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/settings/SettingsBean.java&rev=3D18346&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
--- trunk/core/src/java/org/jahia/settings/SettingsBean.java (original)
+++ trunk/core/src/java/org/jahia/settings/SettingsBean.java Sun Sep 2 12:=
06:19 2007
@@ -335,6 +335,7 @@
private boolean useFlatFileManager;
private boolean showTimeBasedPublishingIcons;
private boolean developmentMode =3D true;
+ private boolean readOnlyMode =3D true;
private boolean waiAutoAddMissingAttributes;
private int connectionTimeoutForProductionJob;
=
@@ -767,6 +768,7 @@
showTimeBasedPublishingIcons =3D getBoolean("showTimeBasedPubl=
ishingIcons", true);
localAccessUri =3D getString("localAccessUri", "http://localho=
st:8080");
developmentMode =3D getBoolean("developmentMode",true);
+ readOnlyMode =3D getBoolean("readOnlyMode",false);
tbpDisp =3D getBoolean("timebased_display",false);
aclDisp =3D getBoolean("aclDiff_display",false);
wflowDisp =3DgetBoolean("workflow_display",false);
@@ -1962,6 +1964,10 @@
return developmentMode;
}
=
+ public boolean isReadOnlyMode() {
+ return readOnlyMode;
+ } =
+ =
/**
* to get the Site errors page behavior
* @return a boolean
Modified: trunk/core/src/webapp/WEB-INF/etc/config/jahia.skeleton
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/etc/config/jahia.skeleton&rev=3D18346&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
--- trunk/core/src/webapp/WEB-INF/etc/config/jahia.skeleton (original)
+++ trunk/core/src/webapp/WEB-INF/etc/config/jahia.skeleton Sun Sep 2 12:0=
6:19 2007
@@ -802,6 +802,14 @@
# This setting can be used to deactivate development mode which flush
# the html cache each time you change the operation mode (live/edit)
developmentMode =3D false
+
+######################################################################
+### Read-only Mode #################################################
+######################################################################
+# This setting can be used to activate read-only mode, which will not
+# display the edit/admin tabs and links in the top admin bar
+readOnlyMode =3D false
+
######################################################################
### AES (Advanced Edition Settings) ##################################
######################################################################
Modified: trunk/core/src/webapp/jsp/jahia/errors/error_403.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/errors/error_403.jsp&rev=3D18346&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
--- trunk/core/src/webapp/jsp/jahia/errors/error_403.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/errors/error_403.jsp Sun Sep 2 12:06:1=
9 2007
@@ -14,24 +14,52 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. =
See the License for the specific language governing permissions and =
limitations under the License.
---%><%@ page language=3D"java" =
-%><?xml version=3D"1.0" encoding=3D"iso-8859-1"?><%
+--%>
+<%@ page language=3D"java"%>
+<[EMAIL PROTECTED] import=3D"org.jahia.exceptions.JahiaInvalidModeException"%>
+<[EMAIL PROTECTED] import=3D"java.text.MessageFormat"%>
+<[EMAIL PROTECTED] import=3D"org.jahia.resourcebundle.JahiaResourceBundle"%>
+<[EMAIL PROTECTED] import=3D"org.jahia.params.ParamBean"%>
+<[EMAIL PROTECTED] import=3D"org.jahia.bin.Jahia" %>
+<[EMAIL PROTECTED] import=3D"org.jahia.params.ProcessingContext" %>
+<[EMAIL PROTECTED] import=3D"org.jahia.services.usermanager.JahiaUser" %>
+<[EMAIL PROTECTED] import=3D"org.jahia.data.JahiaData"%>
+<[EMAIL PROTECTED] uri=3D"JahiaLib" prefix=3D"jahia" %>
+<?xml version=3D"1.0" encoding=3D"iso-8859-1"?><%
=
final String cpath =3D Jahia.getContextPath();
final String spath =3D Jahia.getServletPath();
-
+ final ParamBean jParams =3D (ParamBean) request.getAttribute("org.jahi=
a.params.ParamBean");
+ final int REDIRECTION_DELAY =3D 5000;
+ Throwable exception =3D (Throwable)request.getAttribute("originalExcep=
tion");
+ while (exception.getCause() !=3D null) {
+ exception =3D exception.getCause();
+ }
+ boolean isInvalidModeError =3D exception instanceof JahiaInvalidModeEx=
ception;
+ =
%><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html xmlns=3D"http://www.w3.org/1999/xhtml";>
<head>
- <%@ page import=3D"org.jahia.bin.Jahia" %>
- <%@ page import=3D"org.jahia.params.ProcessingContext" %>
- <%@ page import=3D"org.jahia.services.usermanager.JahiaUser" %>
- <%@ taglib uri=3D"JahiaLib" prefix=3D"jahia" %>
- <title><jahia:engineResourceBundle resourceName=3D"org.jahia.bin.Jahia=
ErrorDisplay.httpForbidden.label"/></title>
<link rel=3D"stylesheet" href=3D"<%=3Drequest.getContextPath()%>/jsp/j=
ahia/engines/css/error.css" type=3D"text/css"/>
<script type=3D"text/javascript" src=3D"<%=3Drequest.getContextPath()%=
>/jsp/jahia/javascript/jahia.js"></script>
<script type=3D"text/javascript" src=3D"<%=3Drequest.getContextPath()%=
>/jsp/jahia/errors/error_include.js"></script>
+<%if (isInvalidModeError) { %>
+ <title><jahia:engineResourceBundle resourceName=3D"org.jahia.bin.Jahia=
ErrorDisplay.invalidMode.label"/></title>
+<script type=3D"text/javascript" language=3D"javascript">
+<!--
+ function redirectToPage() {
+ window.location.href =3D "<%=3DjParams.composeOperationUrl(ParamBean=
.NORMAL, null)%>";
+ } =
+
+ window.onload =3D function() {
+ setTimeout("redirectToPage()", <%=3DREDIRECTION_DELAY%>);
+ }
+ //-->
+ </script> =
+ <%} else {%>
+ <title><jahia:engineResourceBundle resourceName=3D"org.jahia.bin.Jahia=
ErrorDisplay.httpForbidden.label"/></title>
+ <%} %> =
</head>
<%
final JahiaUser currentUser =3D ((JahiaUser) session.getAttribute(Proc=
essingContext.SESSION_USER));
@@ -45,7 +73,16 @@
%>
<body>
<br/><br/><br/>
-
+<% if (isInvalidModeError) { =
+ %>
+ <p class=3D"bold">
+ <jahia:engineResourceBundle resourceName=3D"org.jahia.bin.JahiaErrorDispl=
ay.invalidModeRequested.label"/>
+ <%=3DMessageFormat.format(JahiaResourceBundle.getEngineResource(
+ "org.jahia.bin.JahiaErrorDisplay.redirectToNormal.label", jParams,
+ jParams.getLocale()), new Object[]{new Integer(REDIRECTION_DELAY =
/ 1000)})%>
+ </p> =
+ <% =
+} else { %>
<table align=3D"center" width=3D"530" height=3D"63" border=3D"0" cellspaci=
ng=3D"0" cellpadding=3D"0">
<tr>
<td colspan=3D"2" class=3D"boxtitlecolor1"><jahia:engineResourceBu=
ndle
@@ -87,6 +124,6 @@
</td>
</tr>
</table>
-
+<%} %>
</body>
</html>
Modified: trunk/core/src/webapp/jsp/jahia/topbar/operationbuttons.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/topbar/operationbuttons.inc&rev=3D18346&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
--- trunk/core/src/webapp/jsp/jahia/topbar/operationbuttons.inc (original)
+++ trunk/core/src/webapp/jsp/jahia/topbar/operationbuttons.inc Sun Sep 2 =
12:06:19 2007
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and =
limitations under the License.
--%><%
-
+if (!jData.getProcessingContext().settings().isReadOnlyMode()) {
boolean writeAccess =3D false; =
boolean editModePermission =3D ServicesRegistry.getInstance().getJahia=
ACLManagerService().getSiteActionPermission("engines.actions.editMode", jPa=
rams.getUser(), JahiaBaseACL.READ_RIGHTS, jParams.getSiteID()) > 0;
if (editModePermission) {
@@ -124,5 +124,6 @@
</div>
<%
}
- }
+ }
+} =
%>
Modified: trunk/core/src/webapp/jsp/jahia/topbar/topmenu.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/topbar/topmenu.inc&rev=3D18346&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
--- trunk/core/src/webapp/jsp/jahia/topbar/topmenu.inc (original)
+++ trunk/core/src/webapp/jsp/jahia/topbar/topmenu.inc Sun Sep 2 12:06:19 =
2007
@@ -100,19 +100,18 @@
<span>|</span><content:adminButton title=3D'<%=3DgetCommonResource("admini=
stration","administration",toploc)%>'/>
<%
}
-if (jData.gui().isEditMode()) {
-if (jData.page().checkWriteAccess(user)){
- PageBean pageBean =3D new PageBean(jData.page(),jParams);
+if (jData.gui().isEditMode() && !jData.getProcessingContext().settings().i=
sReadOnlyMode()) {
+ if (jData.page().checkWriteAccess(user)){
+ PageBean pageBean =3D new PageBean(jData.page(),jParams);
%>
<span>|</span>
<%
- jData.gui().html().drawBeginActionMenu(pageBean , null, null, false, =
"", "jahiatemplates.common", "pageSettings", out);
- }
- }
-if (!jData.gui().isNormalMode()){
-if (jData.page().checkWriteAccess(user,true)
- || (jData.page().checkAdminAccess(user,true) && jData.page().check=
ReadAccess(user))
- ) {
+ jData.gui().html().drawBeginActionMenu(pageBean , null, null, false, "=
", "jahiatemplates.common", "pageSettings", out);
+ }
+}
+if (!jData.gui().isNormalMode() && !jData.getProcessingContext().settings(=
).isReadOnlyMode()){
+ if (jData.page().checkWriteAccess(user,true)
+ || (jData.page().checkAdminAccess(user,true) && jData.page().checkRea=
dAccess(user))) {
Vector languageSettings =3D jParams.getSite().getLanguageSetti=
ngs();
if (languageSettings.size() > 0) {
%>
@@ -180,15 +179,15 @@
}
}//end while
}
- }
- }
+ }
+}
=
if (jData.getProcessingContext().settings().isEsiCacheActivated()) { %>
<span>|</span>
<img src=3D"<content:serverHttpPath />/jsp/jahia/engines/images/esi_invali=
date_page.gif" alt=3D"<content:resourceBundle resourceBundle=3D'jahiatempla=
tes.common' resourceName=3D'esiInvalidatePage' defaultValue=3D'Regenerate t=
he current page in the ESI Cache Server'/>" border=3D"0" onClick=3D"esiGene=
ratePageInvalidationUrl()"/>
<%
}
-if(jData.gui().isEditMode()){
+if(jData.gui().isEditMode() && !jData.getProcessingContext().settings().is=
ReadOnlyMode()){
// clipboard display
if (request.getSession().getAttribute("clipboard_key")!=3Dnull) {
%>
@@ -198,12 +197,11 @@
<% }
}
// ajax libs and advanced edit settings include
- String path =3D request.getContextPath();//jahia path used in subseque=
nt includes
+ String path =3D request.getContextPath();//jahia path used in subseque=
nt includes
+if(jData.gui().isEditMode() && !jData.getProcessingContext().settings().is=
ReadOnlyMode()){ =
%>
<%@ include file=3D"aes.inc" %>
-<%
- if(jData.gui().isEditMode()){
-%>
+
<span>
<table border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
<tr id=3D"filemanagerLinkBoxFirstRow">
@@ -213,6 +211,8 @@
</tr>
</table>
</span>
-<% } %>
+<% =
+} =
+%>
</div>
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
