Author: tdraier
Date: Fri May 25 15:05:13 2007
New Revision: 17384
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17384&repname=
=3Djahia
Log:
fixed site wizard navigation and cosmetics (backport 17176)
fixed site management cosmetics (backport 17177)
changed text (backport 17178)
Modified:
trunk/core/src/conf/java/JahiaAdministrationResources.properties
trunk/core/src/conf/java/JahiaAdministrationResources_en.properties
trunk/core/src/conf/java/JahiaAdministrationResources_fr.properties
trunk/core/src/conf/java/JahiaMessageResources.properties
trunk/core/src/conf/java/JahiaMessageResources_en.properties
trunk/core/src/java/org/jahia/admin/sites/ManageSites.java
trunk/core/src/java/org/jahia/bin/JahiaAdministration.java
trunk/core/src/webapp/jsp/jahia/administration/site_choose_template_set=
.jsp
trunk/core/src/webapp/jsp/jahia/administration/site_create_admin.jsp
trunk/core/src/webapp/jsp/jahia/administration/sites_management.jsp
trunk/core/src/webapp/jsp/jahia/configuration_wizard/congratulations.jsp
Modified: trunk/core/src/conf/java/JahiaAdministrationResources.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaAdministrationResources.properties&rev=3D17384&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/JahiaAdministrationResources.properties (origi=
nal)
+++ trunk/core/src/conf/java/JahiaAdministrationResources.properties Fri Ma=
y 25 15:05:13 2007
@@ -443,6 +443,7 @@
org.jahia.admin.site.ManageSites.pleaseBeCareful.label =3D Please be care=
ful:<br/>This will permanently delete the virtual site from your server.
org.jahia.admin.site.ManageSites.pleaseChooseASite.label =3D Please choos=
e a site
org.jahia.admin.site.ManageSites.pleaseChooseTemplateSet.label =3D Please=
choose a template set
+org.jahia.admin.site.ManageSites.pleaseChooseLanguage.label =3D Select the=
site default language
org.jahia.admin.site.ManageSites.purgeOptions.label =3D Purge Options
org.jahia.admin.site.ManageSites.selectAdministrator.label =3D Select an =
administrator from another site.
org.jahia.admin.site.ManageSites.selectTheAdministrator.label =3D Select =
the administrator
Modified: trunk/core/src/conf/java/JahiaAdministrationResources_en.properti=
es
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaAdministrationResources_en.properties&rev=3D17384&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/JahiaAdministrationResources_en.properties (or=
iginal)
+++ trunk/core/src/conf/java/JahiaAdministrationResources_en.properties Fri=
May 25 15:05:13 2007
@@ -443,6 +443,7 @@
org.jahia.admin.site.ManageSites.pleaseBeCareful.label =3D Please be care=
ful:<br/>This will permanently delete the virtual site from your server.
org.jahia.admin.site.ManageSites.pleaseChooseASite.label =3D Please choos=
e a site
org.jahia.admin.site.ManageSites.pleaseChooseTemplateSet.label =3D Please=
choose a template set
+org.jahia.admin.site.ManageSites.pleaseChooseLanguage.label =3D Select the=
site default language
org.jahia.admin.site.ManageSites.purgeOptions.label =3D Purge Options
org.jahia.admin.site.ManageSites.selectAdministrator.label =3D Select an =
administrator from another site.
org.jahia.admin.site.ManageSites.selectTheAdministrator.label =3D Select =
the administrator
Modified: trunk/core/src/conf/java/JahiaAdministrationResources_fr.properti=
es
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaAdministrationResources_fr.properties&rev=3D17384&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/JahiaAdministrationResources_fr.properties (or=
iginal)
+++ trunk/core/src/conf/java/JahiaAdministrationResources_fr.properties Fri=
May 25 15:05:13 2007
@@ -596,6 +596,7 @@
org.jahia.admin.site.ManageSites.or.label =3D ou
org.jahia.admin.site.ManageSites.pleaseBeCareful.label =3D Soyez prudent&=
nbsp;:<br>cette action supprimera d=C3=A9finitivement le site virtuel s=C3=
=A9lectionn=C3=A9 de votre serveur.
org.jahia.admin.site.ManageSites.pleaseChooseASite.label =3D Veuillez s=
=C3=A9lectionner un site
+org.jahia.admin.site.ManageSites.pleaseChooseLanguage.label =3D Selectionn=
ez la langue par defaut du site
org.jahia.admin.site.ManageSites.pleaseChooseTemplateSet.label =3D Veuill=
ez s=C3=A9lectionner un jeu de mod=C3=A8les
org.jahia.admin.site.ManageSites.purgeOptions.label =3D Options de purge
org.jahia.admin.site.ManageSites.selectAdministrator.label =3D S=C3=A9lec=
tionner un administrateur provenant d'un autre site.
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=3D17384&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 Fri May 25 15=
:05:13 2007
@@ -42,6 +42,7 @@
org.jahia.cancelOff.button =3D /jsp/jahia/engines/images/buttons/cancel_of=
f.gif
org.jahia.cancelOn.button =3D /jsp/jahia/engines/images/buttons/cancel_on.=
gif
org.jahia.connect.button =3D Connect to Jahia
+org.jahia.createSite.button =3D Create your virtual site
org.jahia.loading.button =3D Loading...
org.jahia.pleaseWait.button =3D Please wait
org.jahia.waitingForStartup.button =3D Waiting for startup
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=3D17384&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 Fri May 25=
15:05:13 2007
@@ -42,6 +42,7 @@
org.jahia.cancelOff.button =3D /jsp/jahia/engines/images/buttons/cancel_of=
f.gif
org.jahia.cancelOn.button =3D /jsp/jahia/engines/images/buttons/cancel_on.=
gif
org.jahia.connect.button =3D Connect to Jahia
+org.jahia.createSite.button =3D Create your virtual site
org.jahia.loading.button =3D Loading...
org.jahia.pleaseWait.button =3D Please wait
org.jahia.waitingForStartup.button =3D Waiting for startup
Modified: trunk/core/src/java/org/jahia/admin/sites/ManageSites.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/admin/sites/ManageSites.java&rev=3D17384&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/admin/sites/ManageSites.java (original)
+++ trunk/core/src/java/org/jahia/admin/sites/ManageSites.java Fri May 25 1=
5:05:13 2007
@@ -172,6 +172,10 @@
displayAdd(req, res, sess);
} else if (op.equals("processadd")) {
processAdd(req, res, sess);
+ } else if (op.equals("displaycreateadmin")) {
+ displayCreateAdmin(req, res, sess);
+ } else if (op.equals("displayselectexistantadmin")) {
+ displaySelectExistantAdmin(req, res, sess);
} else if (op.equals("processcreateadmin")) {
processCreateAdmin(req, res, sess);
} else if (op.equals("processexistantadmin")) {
@@ -212,6 +216,10 @@
=
// retrieve previous form values...
String jahiaDisplayMessage =3D (String) request.getAttribute(CLASS=
_NAME + "jahiaDisplayMessage");
+ String warningMsg =3D (String) request.getAttribute("warningMsg");
+ if (warningMsg =3D=3D null) {
+ warningMsg =3D "";
+ }
=
// set default values...
if (jahiaDisplayMessage =3D=3D null) {
@@ -232,6 +240,30 @@
Collections.sort(sortedSites, JahiaSite.getTitleComparator=
());
}
request.setAttribute("sitesList", sortedSites.elements());
+ if (sortedSites.size() =3D=3D 0) {
+ JahiaSite newJahiaSite =3D (JahiaSite) session.getAttribut=
e(CLASS_NAME + "newJahiaSite");
+
+ if (newJahiaSite =3D=3D null) {
+ logger.debug("site not found in session, assuming new =
site ");
+
+ // it's the first time this screen is displayed, so cr=
eate an empty one
+
+ newJahiaSite =3D new JahiaSite(-1,
+ "mySite", // site title
+ "servername", // site server name
+ "mysite", // site key
+ true, // is active
+ -1, // default page (homepage id)
+ "", // description
+ null, // the acl
+ null);
+ }
+
+ session.setAttribute(CLASS_NAME + "newJahiaSite", newJahia=
Site);
+ session.setAttribute(CLASS_NAME + "noSites", Boolean.TRUE);
+ } else {
+ session.removeAttribute(CLASS_NAME + "noSites");
+ }
} catch (JahiaException ex) {
logger.error("Error while retrieving site list", ex);
jahiaDisplayMessage =3D JahiaResourceBundle.getAdminResource("=
org.jahia.admin.JahiaDisplayMessage.requestProcessingError.label",
@@ -239,6 +271,7 @@
}
// set request attributes...
request.setAttribute("jahiaDisplayMessage", jahiaDisplayMessage);
+ request.setAttribute("warningMsg", warningMsg);
=
// redirect...
JahiaAdministration.doRedirect(request, response, session, JSP_PAT=
H + "sites_management.jsp");
@@ -275,9 +308,9 @@
// it's the first time this screen is displayed, so create an =
empty one
=
newJahiaSite =3D new JahiaSite(-1,
- "", // site title
- "", // site server name
- "", // site key
+ "mySite", // site title
+ "servername", // site server name
+ "mySite", // site key
true, // is active
-1, // default page (homepage id)
"", // description
@@ -370,7 +403,7 @@
String siteDescr =3D JahiaTools.getStrParameter(request, "siteDesc=
r", "").trim();
String siteAdmin =3D JahiaTools.getStrParameter(request, "siteAdmi=
n", "").trim();
Boolean defaultSite =3D Boolean.valueOf(request.getParameter("defa=
ultSite") !=3D null);
-
+ request.getSession().setAttribute("siteAdminOption",siteAdmin);
String warningMsg =3D "";
=
session.setAttribute(CLASS_NAME + "defaultSite", defaultSite);
@@ -461,7 +494,12 @@
session.setAttribute(CLASS_NAME + "newJahiaSite", site);
request.setAttribute("newJahiaSite", site);
request.setAttribute("warningMsg", warningMsg);
- displayAdd(request, response, session);
+
+ if (session.getAttribute(CLASS_NAME + "noSites") !=3D null=
) {
+ displayList(request, response, session);
+ } else {
+ displayAdd(request, response, session); =
=
+ }
}
} catch (JahiaException ex) {
warningMsg =3D JahiaResourceBundle.getAdminResource("org.jahia=
.admin.warningMsg.processingRequestError.label",
@@ -477,6 +515,7 @@
siteAdmin =3D null;
defaultSite =3D null;
warningMsg =3D null;
+ request.getSession().setAttribute("lastPage","processadd");
}
} // end processAdd
=
@@ -493,6 +532,12 @@
throws IOException, ServletException {
//logger.debug(" display create administrator started ");
=
+ request.getSession().setAttribute("admin","create");
+
+ String warningMsg =3D (String) request.getAttribute("warningMsg");
+ if (warningMsg =3D=3D null) {
+ warningMsg =3D "";
+ }
// retrieve previous form values...
String jahiaDisplayMessage =3D (String) request.getAttribute(CLASS=
_NAME + "jahiaDisplayMessage");
String adminUsername =3D (String) request.getAttribute("adminUsern=
ame");
@@ -508,25 +553,45 @@
jahiaDisplayMessage =3D Jahia.COPYRIGHT;
}
if (adminUsername =3D=3D null) {
- adminUsername =3D "";
+ adminUsername =3D (String) session.getAttribute(CLASS_NAME + "=
adminUsername");
+ }
+ if (adminUsername =3D=3D null) {
+ adminUsername =3D "siteadmin";
}
if (adminPassword =3D=3D null) {
- adminPassword =3D "";
+ adminPassword =3D (String) session.getAttribute(CLASS_NAME + "=
adminPassword");
+ adminConfirm =3D adminPassword;
}
- if (adminConfirm =3D=3D null) {
- adminConfirm =3D "";
+ if (adminPassword =3D=3D null) {
+ adminPassword =3D "siteadmin";
+ adminConfirm =3D "siteadmin";
+ }
+
+ Properties userProps =3D (Properties) session.getAttribute(CLASS_N=
AME + "adminProps");
+
+ if (adminFirstName =3D=3D null && userProps !=3D null) {
+ adminFirstName =3D userProps.getProperty("firstname");
}
if (adminFirstName =3D=3D null) {
- adminFirstName =3D "";
+ adminFirstName =3D "Site administrator";
+ }
+ if (adminLastName =3D=3D null && userProps !=3D null) {
+ adminLastName =3D userProps.getProperty("lastname");
}
if (adminLastName =3D=3D null) {
adminLastName =3D "";
}
+ if (adminOrganization =3D=3D null && userProps !=3D null) {
+ adminOrganization =3D userProps.getProperty("organization");
+ }
if (adminOrganization =3D=3D null) {
adminOrganization =3D "";
}
+ if (adminEmail =3D=3D null && userProps !=3D null) {
+ adminEmail =3D userProps.getProperty("email");
+ }
if (adminEmail =3D=3D null) {
- adminEmail =3D "";
+ adminEmail =3D "[EMAIL PROTECTED]";
}
=
// set display message...
@@ -540,9 +605,11 @@
request.setAttribute("adminLastName", adminLastName);
request.setAttribute("adminOrganization", adminOrganization);
request.setAttribute("adminEmail", adminEmail);
+ request.setAttribute("warningMsg", warningMsg);
=
// redirect...
JahiaAdministration.doRedirect(request, response, session, JSP_PAT=
H + "site_create_admin.jsp");
+ request.getSession().setAttribute("lastPage","processcreateadmin");
} // end displayCreateAdmin
=
/**
@@ -558,6 +625,8 @@
throws IOException, ServletException {
//logger.debug("display select existant administrator started ");
=
+ request.getSession().setAttribute("admin","create");
+
// retrieve previous form values...
String jahiaDisplayMessage =3D (String) request.getAttribute(CLASS=
_NAME + "jahiaDisplayMessage");
String selectedSite =3D (String) request.getAttribute("selectedSit=
e");
@@ -665,8 +734,7 @@
String adminLastName =3D JahiaTools.getStrParameter(request, "admi=
nLastName", "").trim();
String adminOrganization =3D JahiaTools.getStrParameter(request, "=
adminOrganization", "").trim();
String adminEmail =3D JahiaTools.getStrParameter(request, "adminEm=
ail", "").trim();
- String jahiaDisplayMessage =3D "";
-
+ String warningMsg =3D "";
// set request attributes...
request.setAttribute("adminUsername", adminUsername);
request.setAttribute("adminPassword", adminPassword);
@@ -681,31 +749,31 @@
lookupUser(0, (String) session.getAttribute(CLASS_NAME + "=
jahiaLoginUsername"));
=
if (adminUsername.equals(currentUser.getUsername())) {
- jahiaDisplayMessage =3D JahiaResourceBundle.getAdminResource("=
org.jahia.admin.JahiaDisplayMessage.usernameSameLogin.label",
+ warningMsg =3D JahiaResourceBundle.getAdminResource("org.jahia=
.admin.JahiaDisplayMessage.usernameSameLogin.label",
jParams, jParams.getLocale());
} else if (adminUsername.length() =3D=3D 0) {
- jahiaDisplayMessage =3D JahiaResourceBundle.getAdminResource("=
org.jahia.admin.JahiaDisplayMessage.usernameMustLeast4Chars.label",
+ warningMsg =3D JahiaResourceBundle.getAdminResource("org.jahia=
.admin.JahiaDisplayMessage.usernameMustLeast4Chars.label",
jParams, jParams.getLocale());
} else if (adminUsername.length() < 4) {
- jahiaDisplayMessage =3D JahiaResourceBundle.getAdminResource("=
org.jahia.admin.JahiaDisplayMessage.usernameTooShort.label",
+ warningMsg =3D JahiaResourceBundle.getAdminResource("org.jahia=
.admin.JahiaDisplayMessage.usernameTooShort.label",
jParams, jParams.getLocale());
} else if (!adminPassword.equals(adminConfirm)) {
- jahiaDisplayMessage =3D JahiaResourceBundle.getAdminResource("=
org.jahia.admin.JahiaDisplayMessage.confirmPasswdBeSame.label",
+ warningMsg =3D JahiaResourceBundle.getAdminResource("org.jahia=
.admin.JahiaDisplayMessage.confirmPasswdBeSame.label",
jParams, jParams.getLocale());
} else if (adminPassword.length() =3D=3D 0) {
- jahiaDisplayMessage =3D JahiaResourceBundle.getAdminResource("=
org.jahia.admin.JahiaDisplayMessage.passwdLeast4Chars.label",
+ warningMsg =3D JahiaResourceBundle.getAdminResource("org.jahia=
.admin.JahiaDisplayMessage.passwdLeast4Chars.label",
jParams, jParams.getLocale());
} else if (adminPassword.length() < 4) {
- jahiaDisplayMessage =3D JahiaResourceBundle.getAdminResource("=
org.jahia.admin.JahiaDisplayMessage.passwdTooShort.label",
+ warningMsg =3D JahiaResourceBundle.getAdminResource("org.jahia=
.admin.JahiaDisplayMessage.passwdTooShort.label",
jParams, jParams.getLocale());
} else if (adminEmail.length() =3D=3D 0) {
- jahiaDisplayMessage =3D JahiaResourceBundle.getAdminResource("=
org.jahia.admin.JahiaDisplayMessage.EmailMustset.label",
+ warningMsg =3D JahiaResourceBundle.getAdminResource("org.jahia=
.admin.JahiaDisplayMessage.EmailMustset.label",
jParams, jParams.getLocale());
} else if (!JahiaTools.isAlphaValid(adminUsername)) {
- jahiaDisplayMessage =3D JahiaResourceBundle.getAdminResource("=
org.jahia.admin.JahiaDisplayMessage.onlyLettersDigitsUnderscoreWithUsername=
.label",
+ warningMsg =3D JahiaResourceBundle.getAdminResource("org.jahia=
.admin.JahiaDisplayMessage.onlyLettersDigitsUnderscoreWithUsername.label",
jParams, jParams.getLocale());
} else if (!JahiaTools.isAlphaValid(adminPassword)) {
- jahiaDisplayMessage =3D JahiaResourceBundle.getAdminResource("=
org.jahia.admin.JahiaDisplayMessage.onlyLettersDigitsUnderscoreWithPasswd.l=
abel",
+ warningMsg =3D JahiaResourceBundle.getAdminResource("org.jahia=
.admin.JahiaDisplayMessage.onlyLettersDigitsUnderscoreWithPasswd.label",
jParams, jParams.getLocale());
} else {
processError =3D false;
@@ -739,7 +807,7 @@
redirectAfterAdd(request, response, session);
}
} else {
- request.setAttribute(CLASS_NAME + "jahiaDisplayMessage", jahia=
DisplayMessage);
+ request.setAttribute("warningMsg", warningMsg);
displayCreateAdmin(request, response, session);
}
} // end processCreateAdmin
Modified: trunk/core/src/java/org/jahia/bin/JahiaAdministration.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/bin/JahiaAdministration.java&rev=3D17384&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/bin/JahiaAdministration.java (original)
+++ trunk/core/src/java/org/jahia/bin/JahiaAdministration.java Fri May 25 1=
5:05:13 2007
@@ -726,7 +726,6 @@
if(theGroup.isMember( theUser )) {
loginError =3D false;
superAdmin =3D true;
- session.setAttribute( CLASS_NAME + "adminUsername"=
, theUser.getUsername() );
logger.debug("Login granted: " + jahiaLoginUsernam=
e + " entered correct password.");
} else {
Vector adminGrantedSites =3D null;
@@ -1031,7 +1030,6 @@
session.setAttribute( CLASS_NAME + "isSuperAdmin", =
Boolean.valueOf(isSuperAdmin) );
session.setAttribute( CLASS_NAME + "manageSiteID", =
new Integer(theSite.getID()) );
session.setAttribute( CLASS_NAME + "accessGranted", =
Boolean.TRUE);
- session.setAttribute( CLASS_NAME + "adminUsername", =
theUser.getUsername() );
session.setAttribute( CLASS_NAME + "jahiaLoginUsername=
", theUser.getUsername() );
=
logger.debug("Silent login granted: user " + theUser.=
getUsername() + " has valid login session.");
@@ -1044,7 +1042,6 @@
session.setAttribute( CLASS_NAME + "isSuperAdmin", =
Boolean.TRUE);
session.setAttribute( CLASS_NAME + "manageSiteID", =
new Integer(0) );
session.setAttribute( CLASS_NAME + "accessGranted", =
Boolean.TRUE);
- session.setAttribute( CLASS_NAME + "adminUsername", =
theUser.getUsername() );
session.setAttribute( CLASS_NAME + "jahiaLoginUsername", =
theUser.getUsername() );
}
=
Modified: trunk/core/src/webapp/jsp/jahia/administration/site_choose_templa=
te_set.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/administration/site_choose_template_set.jsp&rev=3D17384&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/administration/site_choose_template_set=
.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/administration/site_choose_template_set=
.jsp Fri May 25 15:05:13 2007
@@ -112,7 +112,7 @@
</tr>
<tr>
<td>
- Langue
+ <jahia:adminResourceBundle resourceName=3D"org=
.jahia.admin.site.ManageSites.pleaseChooseLanguage.label"/> :
</td>
<td>
<select name=3D"languageList" onchange=3D"setCheckedV=
alue(firstImport,'noImport')" >
@@ -149,15 +149,29 @@
<jahia:adminResourceBundle
resourceName=3D"org.jahia.admin.otherOperati=
ons.label"/> :
</div>
<ul id=3D"operationList">
+
<li class=3D"operationEntry">
- <a class=3D"operationLink" href=3D'<%=3DJahiaAdministration.compose=
ActionURL(request,response,"sites","&sub=3Dadd")%>'><jahia:adminResourceBun=
dle resourceName=3D"org.jahia.admin.site.ManageSites.backToPreviousStep.lab=
el"/>
+
+ <%
+ if ("0".equals(((String)session.getAttribute("siteAdminOptio=
n")).trim())) {
+ %>
+ <a class=3D"operationLink" href=3D'<%=3DJahiaAdministration.comp=
oseActionURL(request,response,"sites","&sub=3Ddisplaycreateadmin")%>'><jahi=
a:adminResourceBundle resourceName=3D"org.jahia.admin.site.ManageSites.back=
ToPreviousStep.label"/>
+ <% } else { %>
+ <a class=3D"operationLink" href=3D'<%=3DJahiaAdministration.comp=
oseActionURL(request,response,"sites","&sub=3Ddisplayselectexistantadmin")%=
>'><jahia:adminResourceBundle resourceName=3D"org.jahia.admin.site.ManageSi=
tes.backToPreviousStep.label"/>
+ <% } %>
</li>
+ <%
+ if (session.getAttribute(JahiaAdministration.CLASS_NAME + =
"redirectToJahia") =3D=3D null) {
+ %>
<li class=3D"operationEntry">
<a class=3D"operationLink" href=3D'<%=3DJahiaAdministration.compose=
ActionURL(request,response,"sites","&sub=3Dlist")%>'><jahia:adminResourceBu=
ndle resourceName=3D"org.jahia.admin.site.ManageSites.backToSitesList.label=
"/></a>
</li>
<li class=3D"operationEntry">
<a class=3D"operationLink" href=3D'<%=3DJahiaAdministration.compose=
ActionURL(request,response,"displaymenu","")%>'><jahia:adminResourceBundle =
resourceName=3D"org.jahia.admin.backToMenu.label"/></a>
</li>
+ <%
+ }
+ %>
</ul>
</div>
=
Modified: trunk/core/src/webapp/jsp/jahia/administration/site_create_admin.=
jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/administration/site_create_admin.jsp&rev=3D17384&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/administration/site_create_admin.jsp (o=
riginal)
+++ trunk/core/src/webapp/jsp/jahia/administration/site_create_admin.jsp Fr=
i May 25 15:05:13 2007
@@ -18,6 +18,7 @@
<[EMAIL PROTECTED] file=3D"/jsp/jahia/administration/include/header.inc"%>
=
<%
+ String warningMsg =3D
(String)request.getAttribute("warningMsg");
String adminUsername =3D
(String)request.getAttribute("adminUsername"=
);
String adminPassword =3D
(String)request.getAttribute("adminPasswo=
rd");
String adminConfirm =3D
(String)request.getAttribute("adminConfir=
m");
@@ -40,6 +41,9 @@
<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.site.Manage=
Sites.createAdministrator.label"/> :
</h2>
=
+ <p class=3D"errorbold">
+ <%=3DwarningMsg%>
+ </p>
<form name=3D"jahiaAdmin" action=3D'<%=3DJahiaAdministration.composeActi=
onURL(request,response,"sites","&sub=3Dprocesscreateadmin")%>' method=3D"po=
st">
=
<table border=3D"0" style=3D"margin: auto">
@@ -124,14 +128,26 @@
</div>
<ul id=3D"operationList">
<li class=3D"operationEntry">
- <a class=3D"operationLink" href=3D'<%=3DJahiaAdministration.compose=
ActionURL(request,response,"sites","&sub=3Dadd")%>'><jahia:adminResourceBun=
dle resourceName=3D"org.jahia.admin.site.ManageSites.backToPreviousStep.lab=
el"/>
+<% if (session.getAttribute(JahiaAdministration.CLASS_NAME + "noSites") !=
=3D null) { %>
+ <a class=3D"operationLink" href=3D'<%=3DJahiaAdministration.compos=
eActionURL(request,response,"sites","&sub=3Dlist")%>'><jahia:adminResourceB=
undle resourceName=3D"org.jahia.admin.site.ManageSites.backToPreviousStep.l=
abel"/>
+<% } else { %>
+ <a class=3D"operationLink" href=3D'<%=3DJahiaAdministration.compos=
eActionURL(request,response,"sites","&sub=3Dadd")%>'><jahia:adminResourceBu=
ndle resourceName=3D"org.jahia.admin.site.ManageSites.backToPreviousStep.la=
bel"/>
+<% } %>
</li>
+ <%
+ if (session.getAttribute(JahiaAdministration.CLASS_NAME + =
"redirectToJahia") =3D=3D null) {
+ %>
+
<li class=3D"operationEntry">
<a class=3D"operationLink" href=3D'<%=3DJahiaAdministration.compose=
ActionURL(request,response,"sites","&sub=3Dlist")%>'><jahia:adminResourceBu=
ndle resourceName=3D"org.jahia.admin.site.ManageSites.backToSitesList.label=
"/></a>
</li>
<li class=3D"operationEntry">
<a class=3D"operationLink" href=3D'<%=3DJahiaAdministration.compose=
ActionURL(request,response,"displaymenu","")%>'><jahia:adminResourceBundle =
resourceName=3D"org.jahia.admin.backToMenu.label"/></a>
</li>
+ <%
+ }
+ %>
+
</ul>
</div>
=
Modified: trunk/core/src/webapp/jsp/jahia/administration/sites_management.j=
sp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/administration/sites_management.jsp&rev=3D17384&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/administration/sites_management.jsp (or=
iginal)
+++ trunk/core/src/webapp/jsp/jahia/administration/sites_management.jsp Fri=
May 25 15:05:13 2007
@@ -25,7 +25,9 @@
=
<%
Enumeration sitesList =3D (Enumeration)request.getAttribute("sitesLis=
t");
+ String warningMsg =3D (String)request.getAttribute("warningMsg");
JahiaData jData =3D (JahiaData) request.getAttribute("org.jahia.data.J=
ahiaData");
+ JahiaSite newJahiaSite =3D (JahiaSite)session.getAttribute(JahiaAdmini=
stration.CLASS_NAME + "newJahiaSite");
ProcessingContext jParams =3D null;
if (jData !=3D null) {
jParams =3D jData.params();
@@ -54,6 +56,9 @@
=
<div id=3D"adminMainContent">
=
+<p class=3D"errorbold">
+ <%=3DwarningMsg%>
+</p>
<% if ( sitesList !=3D null && sitesList.hasMoreElements()){ %>
<h2><jahia:adminResourceBundle resourceName=3D"org.jahia.admin.site.Ma=
nageSites.virtualSitesListe.label"/> :</h2>
<table class=3D"evenOddTable" border=3D"0" cellpadding=3D"5" cellspaci=
ng=3D"0" width=3D"100%">
@@ -140,7 +145,7 @@
<br><em><jahia:adminResourceBundle resourceName=3D"org.jahia=
.admin.site.ManageSites.egSiteTitle.label"/></em>
</td>
<td>
- : <input class=3D"input" type=3D"text" name=3D"siteTitl=
e" size=3D"<%=3DinputSize%>">
+ : <input class=3D"input" type=3D"text" name=3D"siteTitl=
e" value=3D"<%=3DnewJahiaSite.getTitle()%>" size=3D"<%=3DinputSize%>">
</td>
</tr>
<tr>
@@ -149,7 +154,7 @@
<br><em><jahia:adminResourceBundle resourceName=3D"org.jahia=
.admin.site.ManageSites.egSiteServerName.label"/></em>
</td>
<td>
- : <input class=3D"input" type=3D"text" name=3D"siteServ=
erName" size=3D"<%=3DinputSize%>">
+ : <input class=3D"input" type=3D"text" name=3D"siteServ=
erName" value=3D"<%=3DnewJahiaSite.getServerName()%>" size=3D"<%=3DinputSiz=
e%>">
</td>
</tr>
<tr>
@@ -158,7 +163,7 @@
<br><em><jahia:adminResourceBundle resourceName=3D"org.jahia=
.admin.site.ManageSites.egSiteKey.label"/></em>
</td>
<td>
- : <input class=3D"input" type=3D"text" name=3D"siteKey"=
size=3D"<%=3DinputSize%>">
+ : <input class=3D"input" type=3D"text" name=3D"siteKey"=
value=3D"<%=3DnewJahiaSite.getSiteKey()%>" size=3D"<%=3DinputSize%>">
<br><em> <jahia:adminResourceBundle resourceName=
=3D"org.jahia.admin.site.ManageSites.siteKeyAppears.label"/></em>
=
</td>
@@ -168,7 +173,7 @@
<jahia:adminResourceBundle resourceName=3D"org.jahia.admin.s=
ite.ManageSites.siteDesc.label"/>
</td>
<td>
- <textarea class=3D"input" name=3D"siteDescr" rows=3D"1=
0" cols=3D'<%=3D(isMSIE)?"55":"25"%>'></textarea>
+ <textarea class=3D"input" name=3D"siteDescr" rows=3D"1=
0" cols=3D'<%=3D(isMSIE)?"55":"25"%>'><%=3DnewJahiaSite.getDescr()%></texta=
rea>
</td>
</tr>
</table>
@@ -219,11 +224,11 @@
</td>
</tr>
</table>
-</form>
=
<br/>
<div class=3D"buttonList" style=3D"text-align:right">
<div class=3D"button"><a href=3D"javascript:document.siteImport.submit();"=
><jahia:adminResourceBundle resourceName=3D"org.jahia.admin.site.ManageSite=
s.fileImport.label"/></a></div></div>
+</form>
</fieldset>
=
<%
Modified: trunk/core/src/webapp/jsp/jahia/configuration_wizard/congratulati=
ons.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/configuration_wizard/congratulations.jsp&rev=3D17384&repname=3Dj=
ahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/configuration_wizard/congratulations.js=
p (original)
+++ trunk/core/src/webapp/jsp/jahia/configuration_wizard/congratulations.js=
p Fri May 25 15:05:13 2007
@@ -132,8 +132,8 @@
=
function changeButton() {
var divElement =3D document.getElementById('connectButtonDiv');
- divElement.innerHTML =3D "<a href=3D'javascript:loadFirstPage();' =
title=3D'<jahia:message key=3D'org.jahia.connect.button'/>'>" +
- "<jahia:message key=3D'org.jahia.connect.butto=
n'/></a>";
+ divElement.innerHTML =3D "<a href=3D'javascript:loadFirstPage();' =
title=3D'<jahia:message key=3D'org.jahia.createSite.button'/>'>" +
+ "<jahia:message key=3D'org.jahia.createSite.bu=
tton'/></a>";
jahiaReady =3D true;
}
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
