Author: gmazza
Date: Mon Aug 11 13:10:36 2014
New Revision: 1617271
URL: http://svn.apache.org/r1617271
Log:
Merged CreateUser.jsp and ModifyUser.jsp into UserEdit.jsp.
Added:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/UserEdit.jsp
- copied, changed from r1617232,
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/ModifyUser.jsp
Removed:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CreateUser.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/ModifyUser.jsp
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUserBean.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/ProfileBean.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/resources/ApplicationResources_de.properties
roller/trunk/app/src/main/resources/ApplicationResources_es.properties
roller/trunk/app/src/main/resources/ApplicationResources_fr.properties
roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
roller/trunk/app/src/main/resources/ApplicationResources_ko.properties
roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
roller/trunk/app/src/main/resources/struts.xml
roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Register.jsp
roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java?rev=1617271&r1=1617270&r2=1617271&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java
Mon Aug 11 13:10:36 2014
@@ -29,6 +29,7 @@ import org.apache.commons.logging.LogFac
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.UserManager;
+import org.apache.roller.weblogger.config.AuthMethod;
import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.pojos.GlobalPermission;
import org.apache.roller.weblogger.pojos.User;
@@ -45,8 +46,12 @@ public class CreateUser extends UIAction
// a bean to store our form data
private CreateUserBean bean = new CreateUserBean();
-
-
+ private AuthMethod authMethod = WebloggerConfig.getAuthMethod();
+
+ public String getAuthMethod() {
+ return authMethod.name();
+ }
+
public CreateUser() {
this.actionName = "createUser";
this.desiredMenu = "admin";
@@ -96,16 +101,14 @@ public class CreateUser extends UIAction
// copy form data into new user pojo
User newUser = new User();
- getBean().copyTo(newUser, getLocale());
- // password not copied
- newUser.setDateCreated(new java.util.Date());
-
- // set username and password
+ getBean().copyTo(newUser);
+ // fields not copied over from above copyTo():
newUser.setUserName(getBean().getUserName());
+ newUser.setDateCreated(new java.util.Date());
newUser.resetPassword(getBean().getPassword());
// are we granting the user admin rights?
- if(((CreateUserBean)getBean()).isAdministrator()) {
+ if((getBean()).isAdministrator()) {
mgr.grantRole("admin", newUser);
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUserBean.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUserBean.java?rev=1617271&r1=1617270&r2=1617271&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUserBean.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUserBean.java
Mon Aug 11 13:10:36 2014
@@ -39,9 +39,9 @@ public class CreateUserBean {
private String emailAddress = null;
private String locale = null;
private String timeZone = null;
+ private String openIdUrl = null;
private Boolean enabled = Boolean.TRUE;
private String activationCode = null;
-
private boolean administrator = false;
@@ -108,7 +108,15 @@ public class CreateUserBean {
public void setTimeZone(String timeZone) {
this.timeZone = timeZone;
}
-
+
+ public String getOpenIdUrl() {
+ return openIdUrl;
+ }
+
+ public void setOpenIdUrl(String openIdUrl) {
+ this.openIdUrl = openIdUrl;
+ }
+
public Boolean getEnabled() {
return enabled;
}
@@ -134,19 +142,20 @@ public class CreateUserBean {
}
- public void copyTo(User dataHolder, Locale locale) {
+ public void copyTo(User dataHolder) {
dataHolder.setScreenName(this.screenName);
dataHolder.setFullName(this.fullName);
dataHolder.setEmailAddress(this.emailAddress);
dataHolder.setLocale(this.locale);
dataHolder.setTimeZone(this.timeZone);
+ dataHolder.setOpenIdUrl(this.openIdUrl);
dataHolder.setEnabled(this.enabled);
dataHolder.setActivationCode(this.activationCode);
}
- public void copyFrom(User dataHolder, Locale locale) {
+ public void copyFrom(User dataHolder) {
this.id = dataHolder.getId();
this.userName = dataHolder.getUserName();
@@ -156,6 +165,7 @@ public class CreateUserBean {
this.emailAddress = dataHolder.getEmailAddress();
this.locale = dataHolder.getLocale();
this.timeZone = dataHolder.getTimeZone();
+ this.openIdUrl = dataHolder.getOpenIdUrl();
this.enabled = dataHolder.getEnabled();
this.activationCode = dataHolder.getActivationCode();
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java?rev=1617271&r1=1617270&r2=1617271&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java
Mon Aug 11 13:10:36 2014
@@ -51,6 +51,12 @@ public class ModifyUser extends UIAction
private String userName = null;
+ private AuthMethod authMethod = WebloggerConfig.getAuthMethod();
+
+ public String getAuthMethod() {
+ return authMethod.name();
+ }
+
public ModifyUser() {
this.actionName = "modifyUser";
this.desiredMenu = "admin";
@@ -101,7 +107,7 @@ public class ModifyUser extends UIAction
if (getUser() != null && getUser().getUserName() != null) {
// populate form data from user profile data
- getBean().copyFrom(getUser(), getLocale());
+ getBean().copyFrom(getUser());
} else {
addError("userAdmin.error.userNotFound");
return ERROR;
@@ -121,7 +127,7 @@ public class ModifyUser extends UIAction
if (!hasActionErrors()) {
- getBean().copyTo(getUser(), getLocale());
+ getBean().copyTo(getUser());
// reset password if set
if (!StringUtils.isEmpty(getBean().getPassword())) {
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java?rev=1617271&r1=1617270&r2=1617271&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java
Mon Aug 11 13:10:36 2014
@@ -32,7 +32,6 @@ import org.apache.struts2.interceptor.va
/**
* Allows user to edit his/her profile.
- * TODO: check on the impact of deleting that cookieLogin stuff
*/
public class Profile extends UIAction {
private static Log log = LogFactory.getLog(Profile.class);
@@ -54,18 +53,11 @@ public class Profile extends UIAction {
@SkipValidation
public String execute() {
User ud = getAuthenticatedUser();
-
// load up the form from the users existing profile data
getBean().copyFrom(ud);
- getBean().setPasswordText(null);
- getBean().setPasswordConfirm(null);
- getBean().setLocale(ud.getLocale());
- getBean().setTimeZone(ud.getTimeZone());
- getBean().setOpenIdUrl(ud.getOpenIdUrl());
return INPUT;
}
-
public String save() {
myValidate();
@@ -75,14 +67,9 @@ public class Profile extends UIAction {
// We ONLY modify the user currently logged in
User existingUser = getAuthenticatedUser();
- // We want to be VERY selective about what data gets updated
- existingUser.setScreenName(getBean().getScreenName());
- existingUser.setFullName(getBean().getFullName());
- existingUser.setEmailAddress(getBean().getEmailAddress());
- existingUser.setLocale(getBean().getLocale());
- existingUser.setTimeZone(getBean().getTimeZone());
- UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
-
+ // copy updated attributes
+ getBean().copyTo(existingUser);
+
if (StringUtils.isNotEmpty(getBean().getOpenIdUrl())) {
try {
String openidurl = getBean().getOpenIdUrl();
@@ -108,19 +95,16 @@ public class Profile extends UIAction {
try {
// save the updated profile
+ UserManager mgr =
WebloggerFactory.getWeblogger().getUserManager();
mgr.saveUser(existingUser);
WebloggerFactory.getWeblogger().flush();
- addMessage("yourProfile.saved");
-
+ addMessage("generic.changes.saved");
return SUCCESS;
-
} catch (WebloggerException ex) {
log.error("ERROR in action", ex);
addError("Unexpected error doing profile save");
}
-
}
-
return INPUT;
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/ProfileBean.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/ProfileBean.java?rev=1617271&r1=1617270&r2=1617271&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/ProfileBean.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/ProfileBean.java
Mon Aug 11 13:10:36 2014
@@ -22,7 +22,7 @@ import org.apache.roller.weblogger.pojos
/**
- * A simple bean for managing the form data used by the RegisterForm.
+ * Bean for managing the form data used by Registration and Edit User Profile.
*/
public class ProfileBean {
@@ -34,7 +34,7 @@ public class ProfileBean {
private String emailAddress = null;
private String locale = null;
private String timeZone = null;
- private String openidUrl = null;
+ private String openIdUrl = null;
private String passwordText = null;
private String passwordConfirm = null;
@@ -107,11 +107,11 @@ public class ProfileBean {
}
public String getOpenIdUrl() {
- return openidUrl;
+ return openIdUrl;
}
- public void setOpenIdUrl(String openidUrl) {
- this.openidUrl = openidUrl;
+ public void setOpenIdUrl(String openIdUrl) {
+ this.openIdUrl = openIdUrl;
}
public String getPasswordText() {
@@ -132,25 +132,26 @@ public class ProfileBean {
public void copyTo(User dataHolder) {
-
+ // avoiding password, that is handled separately in class Profile
dataHolder.setScreenName(this.screenName);
dataHolder.setFullName(this.fullName);
dataHolder.setEmailAddress(this.emailAddress);
dataHolder.setLocale(this.locale);
dataHolder.setTimeZone(this.timeZone);
+ dataHolder.setOpenIdUrl(this.openIdUrl);
}
public void copyFrom(User dataHolder) {
-
+ // avoiding password, that is handled separately in class Profile
this.id = dataHolder.getId();
this.userName = dataHolder.getUserName();
- this.password = dataHolder.getPassword();
this.screenName = dataHolder.getScreenName();
this.fullName = dataHolder.getFullName();
this.emailAddress = dataHolder.getEmailAddress();
this.locale = dataHolder.getLocale();
this.timeZone = dataHolder.getTimeZone();
+ this.openIdUrl = dataHolder.getOpenIdUrl();
}
}
Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1617271&r1=1617270&r2=1617271&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Mon Aug
11 13:10:36 2014
@@ -1314,6 +1314,24 @@ uploadFiles.uploadedFile={0}
uploadFiles.error.badPath=The path [{0}] is invalid. Paths may not contain
"/", "\\", or ".."
uploadFiles.error.upload=Upload failed for [{0}]
+# ---------------------------------------------------------------- User
settings
+
+userSettings.username=Username
+userSettings.screenname=Screen Name
+userSettings.fullname=Full Name
+userSettings.password=Password
+userSettings.passwordConfirm=Password (Confirm)
+userSettings.email=Email
+userSettings.locale=Locale
+userSettings.timeZone=Timezone
+userSettings.openIdUrl=OpenID URL
+userSettings.tip.username=Usernames can''t be changed.
+
+# ----------------------------------------------------------------- Your
profile (profile.jsp)
+
+yourProfile.title=Your Profile
+yourProfile.description=Change your password, default locale, timezone and
other settings.
+
# ------------------------------------------------------------------- User
admin
userAdmin.title.searchUser=Find user to edit
@@ -1336,7 +1354,7 @@ userAdmin.subtitle.userCreation=New user
userAdmin.prompt.orYouCan=Or you can
userAdmin.prompt.createANewUser=create a new user
-userAdmin.userWeblogs=Users Weblogs
+userAdmin.userWeblogs=User''s Weblogs
userAdmin.userMemberOf=User is a member of the following weblog(s)
userAdmin.userHasNoWeblogs=User is a member of no weblogs.
userAdmin.newEntry=New Entry
@@ -1345,13 +1363,13 @@ userAdmin.manage=Manage
userAdmin.tip.screenName=User''s screen name (with no HTML).
userAdmin.tip.fullName=User''s full name (with no HTML).
-userAdmin.tip.userName=A short one-word username for the user account.\
+userAdmin.tip.userName=A short one-word username for the user account. \
Please limit it to simple ASCII alphanumeric characters (a-z, A-Z and 0-9), \
and do not use HTML.
userAdmin.tip.password=User''s password.
-userAdmin.tip.email=Valid email address neeeded for automated notification.
+userAdmin.tip.email=Valid email address needed for automated notification.
userAdmin.tip.enabled=Disabled users are unable to login to Roller.
-userAdmin.tip.userAdmin=Check to give this user Global Admin permission.
+userAdmin.tip.userAdmin=Check to give user Global Admin rights on this Roller
instance.
userAdmin.tip.locale=User''s preferred locale.
userAdmin.tip.timeZone=User''s preferred timezone.
@@ -1418,7 +1436,7 @@ userRegister.tip.locale=Your preferred l
userRegister.heading.ready=Ready to roll?
userRegister.tip.ready=When you are, click the button below.
-userRegister.button.save=Register User
+userRegister.button.save=Sign Up
userRegister.success.ready=Yes, form appears to be complete. Click the button
below.
userRegister.error.mismatchedPasswords=Your passwords do not match!
@@ -1437,19 +1455,6 @@ Register.error.timeZoneNull=Time Zone is
Register.error.timeZoneSize=Time Zone cannot be more than 20 characters
-# ---------------------------------------------------------------- User
settings
-
-userSettings.button.save=Save Profile
-userSettings.username=Username
-userSettings.screenname=Screen Name
-userSettings.fullname=Full Name
-userSettings.password=Password
-userSettings.passwordConfirm=Password (Confirm)
-userSettings.email=Email
-userSettings.locale=Locale
-userSettings.timeZone=Timezone
-userSettings.openIdUrl=OpenID name
-
# ------------------------------------------------------------------ Weblog
edit
weblogEdit.title.newEntry=New Entry
@@ -1740,13 +1745,6 @@ welcome.user.account.activated=Your user
welcome.user.account.not.activated=In order to login to the system, you have
to \
activate your user account by clicking the link that is sent to you via e-mail.
-# ----------------------------------------------------------------- Your
profile
-
-yourProfile.title=Your Profile
-yourProfile.tip.userName=You can''t change your username.
-yourProfile.description=Change your password, default locale, timezone and
other settings.
-yourProfile.saved=Changes to your profile have been saved.
-
# ---------------------------------------------------------------- Your Weblogs
yourWebsites.title=Main Menu
@@ -1818,4 +1816,3 @@ user.account.activation.mail.content=\
<html><body style=\"background: white; color: black; font-size: 12px\"> \
<p>To activate your new Roller user account with username [{1}], please click
the link below:</p> \
<p><a href=\"{2}\">{2}</a></p></body></html>
-
Modified: roller/trunk/app/src/main/resources/ApplicationResources_de.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_de.properties?rev=1617271&r1=1617270&r2=1617271&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_de.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_de.properties Mon
Aug 11 13:10:36 2014
@@ -684,14 +684,31 @@ uploadFiles.uploadedFile={0}
uploadFiles.uploadedFiles=Hochgeladene Datei(en):
user.account.activation.mail.content=<html><body style="background: white;
color: black; font-size: 12px"> <p>Zum Aktivieren Ihres neuen
Roller-Benutzerkontos mit dem Benutzernamen [{1}] klicken Sie bitte auf den
folgenden Link:</p> <p><a href="{2}">{2}</a></p></body></html>
user.account.activation.mail.subject=Roller: Aktivitierungscode f\u00FCr Ihr
Benutzerkonto
+
+# ----------------------------------------------------- User settings:
register, profile, create, modify users
+
+userSettings.email=E-Mail
+userSettings.fullname=Kompletter Benutzername
+userSettings.locale=Sprache
+userSettings.password=Passwort
+userSettings.passwordConfirm=Passwort (Best\u00E4tigen)
+userSettings.screenname=Angezeigter Name
+userSettings.timeZone=Zeitzone
+userSettings.username=Benutzerk\u00FCrzel
+userSettings.tip.username=Sie k\u00F6nnen Benutzernamen nicht \u00E4ndern.
+
+# ----------------------------------------------------- profile.jsp
+
+yourProfile.description=\u00C4ndern Sie Ihr Passwort, Ihren Ort, die Zeitzone
und andere Einstellungen.
+yourProfile.title=Ihr Profil
+
+# ----------------------------------------------------- create/modify.jsp
+
userAdmin.cantChangeOwnRole=Sie k\u00F6nnen Ihre eigene Rolle nicht \u00E4ndern
userAdmin.editEntries=Eintr\u00E4ge bearbeiten
-# ---------------------------------------------------------------------- Search
userAdmin.enabled=Eingeschaltet
-# ------------------------------------------------------------- Search Form
userAdmin.error.unexpected=Unerwarteter Error
userAdmin.error.userNotFound=Der angegebene Benutzer wurde nicht gefunden
-# ------------------------------------------------------------------
Stylesheet Editor
userAdmin.manage=Verwalten
userAdmin.newEntry=Neuer Eintrag
userAdmin.prompt.createANewUser=Neuen Benutzer erstellen
@@ -730,16 +747,8 @@ userRegister.tip.passwordConfirm=Best\u0
userRegister.tip.screenName=Ihr gew\u00FCnschter angezeigter Name (kein HTML)
userRegister.tip.timeZone=Ihre bevorzugte Zeitzone
userRegister.tip.userName=Ein kurzer, aus einem Wort bestehender Benutzername
f\u00FCr das Benutzerkonto. Bitte beschr\u00E4nken Sie sich auf einfache
ASCII-Zeichen (a-z, A-Z, 0-9), und vermeiden Sie die Verwendung von HTML.
-userSettings.button.save=Profil speichern
+
# ------------------------------------------------------------------- Planet
Roller
-userSettings.email=E-Mail
-userSettings.fullname=Kompletter Benutzername
-userSettings.locale=Sprache
-userSettings.password=Passwort
-userSettings.passwordConfirm=Passwort (Best\u00E4tigen)
-userSettings.screenname=Angezeigter Name
-userSettings.timeZone=Zeitzone
-userSettings.username=Benutzerk\u00FCrzel
weblogEdit.allowComments=Erlaube Kommentare
weblogEdit.category=Kategorie
weblogEdit.commentDays=f\u00FCr
@@ -919,10 +928,6 @@ welcome.title=Willkommen bei Roller
welcome.toLoginAndPost=um sich einzuloggen und den ersten Eintrag zu bloggen.
welcome.user.account.activated=Ihr Benutzerkonto ist aktiviert.
welcome.user.account.not.activated=Um sich in das System einloggen zu
k\u00F6nnen m\u00FCssen Sie Ihr Benutzerkonto aktivieren indem Sie auf den Link
in der E-Mail klicken.
-yourProfile.description=\u00C4ndern Sie Ihr Passwort, Ihren Ort, die Zeitzone
und andere Einstellungen.
-yourProfile.saved=Ver\u00E4nderungen in Ihrem Profil wurden gespeichert.
-yourProfile.tip.userName=Sie k\u00F6nnen Ihren Benutzernamen nicht \u00E4ndern.
-yourProfile.title=Ihr Profil
yourWebsites.accept=Akzeptieren
yourWebsites.actions=Aktionen
yourWebsites.confirmResignation=Sind Sie sicher, dass Sie aus dem Weblog
austreten wollen?
Modified: roller/trunk/app/src/main/resources/ApplicationResources_es.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_es.properties?rev=1617271&r1=1617270&r2=1617271&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_es.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_es.properties Mon
Aug 11 13:10:36 2014
@@ -442,7 +442,6 @@ userRegister.tip.timeZone=Su zona horari
userRegister.tip.locale=Su idioma preferido.
userRegister.tip.password=Su contrase\u00F1a.
userRegister.tip.passwordConfirm=Confirmar su contrase\u00F1a.
-userSettings.button.save=Guardar perfil
userSettings.username=Nombre de usuario
userSettings.fullname=Nombre completo
userSettings.password=Contrase\u00F1a
@@ -557,9 +556,8 @@ welcome.accountCreated=Su nueva cuenta d
welcome.clickHere=Haga click aqu\u00ED
welcome.toLoginAndPost=para entrar.
yourProfile.title=Su perfil
-yourProfile.tip.userName=No puede cambiar su nombre de usuario.
+userSettings.tip.username=No puede cambiar nombre de usuario.
yourProfile.description=Cambiar la contrase\u00F1a, lugar por defecto, zona
horaria y otros ajustes de configuraci\u00F3n.
-yourProfile.saved=Los cambios en su perfil se han guardado.
yourWebsites.title=Men\u00FA principal
yourWebsites.actions=Acciones
yourWebsites.createOne=crear uno?
Modified: roller/trunk/app/src/main/resources/ApplicationResources_fr.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_fr.properties?rev=1617271&r1=1617270&r2=1617271&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_fr.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_fr.properties Mon
Aug 11 13:10:36 2014
@@ -907,8 +907,6 @@ userRegister.tip.passwordConfirm=Confirm
# ---------------------------------------------------------------- User
settings
-userSettings.button.save=Enregistrer
-
userSettings.username=Nom d'utilisateur
userSettings.screenname=Nom de plume
userSettings.fullname=Prénom et nom
@@ -1167,10 +1165,9 @@ welcome.toLoginAndPost=pour vous connect
# ----------------------------------------------------------------- Your
profile
yourProfile.title=Votre profil
-yourProfile.tip.userName=Vous ne pouvez pas changer votre nom d'utilisateur.
+userSettings.tip.username=Vous ne pouvez pas changer nom d'utilisateur.
yourProfile.description=Vous pouvez changer votre mot de passe, votre langue
par défaut ou votre fuseau horaire, \
ainsi que d'autres paramètres liés à votre profil.
-yourProfile.saved=Les modifications à votre profil ont été enregistrées.
# ---------------------------------------------------------------- Your Weblogs
Modified:
roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties?rev=1617271&r1=1617270&r2=1617271&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
Mon Aug 11 13:10:36 2014
@@ -691,8 +691,6 @@ userRegister.tip.passwordConfirm=\u3082\
# ---------------------------------------------------------------- User
settings
-userSettings.button.save=\u5909\u66F4\u3092\u4FDD\u5B58
-
userSettings.username=\u30E6\u30FC\u30B6\u540D
userSettings.fullname=\u30D5\u30EB\u30CD\u30FC\u30E0
userSettings.password=\u30D1\u30B9\u30EF\u30FC\u30C9
@@ -908,9 +906,7 @@ welcome.toLoginAndPost=to login.
# ----------------------------------------------------------------- Your
profile
yourProfile.title=\u30D7\u30ED\u30D5\u30A1\u30A4\u30EB
-yourProfile.tip.userName=\u30E6\u30FC\u30B6\u540D\u306F\u5909\u66F4\u3067\u304D\u307E\u305B\u3093
yourProfile.description=\u30D1\u30B9\u30EF\u30FC\u30C9\u30FB\u30ED\u30B1\u30FC\u30EB\u30FB\u30BF\u30A4\u30E0\u30BE\u30FC\u30F3\u306A\u3069\u304C\u5909\u66F4\u3067\u304D\u307E\u3059
-yourProfile.saved=\u5909\u66F4\u304C\u4FDD\u5B58\u3055\u308C\u307E\u3057\u305F
# ---------------------------------------------------------------- Your Weblogs
Modified: roller/trunk/app/src/main/resources/ApplicationResources_ko.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ko.properties?rev=1617271&r1=1617270&r2=1617271&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ko.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ko.properties Mon
Aug 11 13:10:36 2014
@@ -1016,8 +1016,6 @@ Register.error.timeZoneSize=\uc2dc\uac04
# ---------------------------------------------------------------- User
settings
-userSettings.button.save=\ud504\ub85c\ud30c\uc77c \uc800\uc7a5
-
userSettings.username=\uc0ac\uc6a9\uc790\uba85
userSettings.screenname=\ud654\uba74 \ud45c\uc2dc \uc774\ub984
userSettings.fullname=\uc804\uccb4 \uc774\ub984
@@ -1291,9 +1289,7 @@ welcome.toLoginAndPost=
# ----------------------------------------------------------------- Your
profile
yourProfile.title=\uadc0\ud558\uc758 \ud504\ub85c\ud30c\uc77c
-yourProfile.tip.userName=\uadc0\ud558 \uc790\uc2e0\uc758
\uc0ac\uc6a9\uc790\uba85\uc744 \ubcc0\uacbd\ud560 \uc218
\uc5c6\uc2b5\ub2c8\ub2e4.
yourProfile.description=\ube44\ubc00\ubc88\ud638, \uae30\ubcf8
\ub85c\ucf00\uc77c, \uc2dc\uac04\ub300, \uadf8\ub9ac\uace0 \uae30\ud0c0
\uc124\uc815 \uc815\ubcf4\ub4e4\uc744 \ubcc0\uacbd\ud558\uc2ed\uc2dc\uc624.
-yourProfile.saved=\uadc0\ud558\uc758 \ud504\ub85c\ud30c\uc77c
\ubcc0\uacbd\uc774 \uc800\uc7a5\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
# ---------------------------------------------------------------- Your Weblogs
Modified: roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ru.properties?rev=1617271&r1=1617270&r2=1617271&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ru.properties Mon
Aug 11 13:10:36 2014
@@ -633,8 +633,6 @@ userRegister.tip.passwordConfirm=\u041f\
# ---------------------------------------------------------------- User
settings
-userSettings.button.save=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c
\u043b\u0438\u0447\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435
-
userSettings.username=\u0418\u043c\u044f
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
userSettings.fullname=\u041f\u043e\u043b\u043d\u043e\u0435 \u0438\u043c\u044f
userSettings.password=\u041f\u0430\u0440\u043e\u043b\u044c
@@ -870,9 +868,7 @@ welcome.toLoginAndPost = \u0410\u0432\u0
# ----------------------------------------------------------------- Your
profile
yourProfile.title=\u0412\u0430\u0448 \u043f\u0440\u043e\u0444\u0438\u043b\u044c
-yourProfile.tip.userName=\u0412\u044b \u043d\u0435
\u043c\u043e\u0436\u0435\u0442\u0435
\u0438\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0412\u0430\u0448\u0435
\u0438\u043c\u044f.
yourProfile.description=\u0418\u0437\u043c\u0435\u043d\u0438\u0435\u0442\u0435
\u0412\u0430\u0448 \u043f\u0430\u0440\u043e\u043b\u044c,
\u0432\u0440\u0435\u043c\u0435\u043d\u043d\u0443\u044e \u0437\u043e\u043d\u0443
\u0438 \u0434\u0440\u0443\u0433\u0438\u0435
\u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438.
-yourProfile.saved=\u0418\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f
\u0412\u0430\u0448\u0435\u0433\u043e \u043f\u0440\u043e\u0444\u0438\u043b\u044f
\u0431\u044b\u043b\u0438 \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u044b.
# ---------------------------------------------------------------- Your Weblogs
Modified:
roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties?rev=1617271&r1=1617270&r2=1617271&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
Mon Aug 11 13:10:36 2014
@@ -450,7 +450,6 @@ userRegister.tip.password=\u60a8\u7684\u
userRegister.tip.passwordConfirm=\u786e\u8ba4\u60a8\u7684\u5bc6\u7801\u3002
userRegister.tip.timeZone=\u60a8\u7684\u65f6\u533a\u3002
userRegister.tip.userName=\u4f7f\u7528\u4e00\u4e2a\u7b80\u77ed\u7684\u7528\u6237\u540d\u4f5c\u4e3a\u7528\u6237\u7684\u5e10\u53f7\u3002\u4ec5\u9650\u4e8eASCII\u5b57\u7b26\uff08a\uff0dz\uff0cA\uff0dZ\u548c0\uff0d9\uff09\uff0c\u4e0d\u80fd\u4f7f\u7528HTML\u3002
-userSettings.button.save=\u4fdd\u5b58\u4e2a\u4eba\u8d44\u6599
userSettings.email=\u7535\u5b50\u90ae\u4ef6
userSettings.fullname=\u5168\u540d
userSettings.locale=\u672c\u5730\u5316\u8bbe\u7f6e
@@ -584,8 +583,6 @@ welcome.clickHere=\u70b9\u51fb\u8fd9\u91
welcome.title=\u6b22\u8fce\u6765\u5230 Roller\u4e16\u754c
welcome.toLoginAndPost=\u767b\u5f55\u5e76\u64b0\u5199\u60a8\u7684\u7b2c\u4e00\u6761\u65e5\u5fd7\u5427!
yourProfile.description=\u66f4\u6539\u60a8\u7684\u5bc6\u7801\u3001\u9ed8\u8ba4\u672c\u5730\u5316\u8bbe\u7f6e\u3001\u65f6\u533a\u548c\u5176\u4ed6\u8bbe\u7f6e\u3002
-yourProfile.saved=\u4e2a\u4eba\u8d44\u6599\u7684\u66f4\u6539\u5df2\u7ecf\u88ab\u4fdd\u5b58\u3002
-yourProfile.tip.userName=\u60a8\u4e0d\u80fd\u591f\u66f4\u6539\u60a8\u7684\u7528\u6237\u540d
yourProfile.title=\u60a8\u7684\u4e2a\u4eba\u8d44\u6599
yourWebsites.accept=\u63a5\u53d7
yourWebsites.actions=\u52a8\u4f5c
Modified: roller/trunk/app/src/main/resources/struts.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/struts.xml?rev=1617271&r1=1617270&r2=1617271&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/struts.xml (original)
+++ roller/trunk/app/src/main/resources/struts.xml Mon Aug 11 13:10:36 2014
@@ -173,13 +173,16 @@
<action name="createUser!*" method="{1}"
class="org.apache.roller.weblogger.ui.struts2.admin.CreateUser">
- <result name="input" type="tiles">.CreateUser</result>
+ <result name="input" type="tiles">.UserEdit</result>
</action>
<action name="modifyUser!*" method="{1}"
class="org.apache.roller.weblogger.ui.struts2.admin.ModifyUser">
- <result name="input" type="tiles">.ModifyUser</result>
+ <result name="input" type="tiles">.UserEdit</result>
<result name="error" type="chain">userAdmin</result>
+ <result name="cancel" type="redirectAction">
+ <param name="actionName">userAdmin</param>
+ </result>
</action>
<action name="globalCommentManagement!*" method="{1}"
Copied: roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/UserEdit.jsp (from
r1617232, roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/ModifyUser.jsp)
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/UserEdit.jsp?p2=roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/UserEdit.jsp&p1=roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/ModifyUser.jsp&r1=1617232&r2=1617271&rev=1617271&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/ModifyUser.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/UserEdit.jsp Mon Aug 11
13:10:36 2014
@@ -17,29 +17,50 @@
--%>
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+<%-- Titling, processing actions different between add and edit --%>
+<s:if test="actionName == 'modifyUser'">
+ <s:set var="subtitleKey">userAdmin.subtitle.editUser</s:set>
+ <s:set var="mainAction">modifyUser</s:set>
+</s:if>
+<s:else>
+ <s:set var="subtitleKey">userAdmin.subtitle.createNewUser</s:set>
+ <s:set var="mainAction">createUser</s:set>
+</s:else>
+
<p class="subtitle">
- <s:text name="userAdmin.subtitle.editUser">
+ <s:text name="%{#subtitleKey}">
<s:param value="bean.userName" />
</s:text>
</p>
-<s:form action="modifyUser!save">
+<s:form>
<s:hidden name="salt" />
- <s:hidden name="bean.id" />
-
+ <s:if test="actionName == 'modifyUser'">
+ <%-- bean for add does not have a bean id yet --%>
+ <s:hidden name="bean.id" />
+ </s:if>
+
<table class="formtable">
<tr>
<td class="label"><label for="userName" /><s:text
name="userSettings.username" /></label></td>
- <td class="field"><s:textfield name="bean.userName" size="30"
maxlength="30" readonly="true" cssStyle="background: #e5e5e5" /></td>
- <td class="description"><s:text name="userAdmin.tip.userName"
/></td>
- </tr>
-
- <tr>
- <td class="label"><label for="passwordText" /><s:text
name="userSettings.password" /></label></td>
- <td class="field"><s:password name="bean.password" size="20"
maxlength="20" /></td>
- <td class="description"><s:text name="userAdmin.tip.password"
/></td>
+ <td class="field">
+ <s:if test="actionName == 'modifyUser'">
+ <s:textfield name="bean.userName" size="30" maxlength="30"
readonly="true" cssStyle="background: #e5e5e5" />
+ </s:if>
+ <s:else>
+ <s:textfield name="bean.userName" size="30" maxlength="30"
/>
+ </s:else>
+ </td>
+ <td class="description"><s:text name="userSettings.tip.username" />
+ <s:if test="actionName == 'modifyUser'">
+ <s:text name="userSettings.tip.username" />
+ </s:if>
+ <s:else>
+ <s:text name="userAdmin.tip.userName" />
+ </s:else>
+ </td>
</tr>
-
+
<tr>
<td class="label"><label for="screenName" /><s:text
name="userSettings.screenname" /></label></td>
<td class="field"><s:textfield name="bean.screenName" size="30"
maxlength="30" /></td>
@@ -52,6 +73,22 @@
<td class="description"><s:text name="userAdmin.tip.fullName"
/></td>
</tr>
+ <s:if test="authMethod == 'ROLLERDB' || authMethod == 'DB_OPENID'">
+ <tr>
+ <td class="label"><label for="passwordText" /><s:text
name="userSettings.password" /></label></td>
+ <td class="field"><s:password name="bean.password" size="20"
maxlength="20" /></td>
+ <td class="description"><s:text name="userAdmin.tip.password"
/></td>
+ </tr>
+ </s:if>
+
+ <s:if test="authMethod == 'OPENID' || authMethod == 'DB_OPENID'">
+ <tr>
+ <td class="label"><label for="openIdUrl" /><s:text
name="userSettings.openIdUrl" /></label></td>
+ <td class="field"><s:textfield name="bean.openIdUrl" size="40"
maxlength="255" style="width:75%" id="f_openid_identifier" /></td>
+ <td class="description"><s:text
name="userRegister.tip.openIdUrl" /></td>
+ </tr>
+ </s:if>
+
<tr>
<td class="label"><label for="emailAddress" /><s:text
name="userSettings.email" /></label></td>
<td class="field"><s:textfield name="bean.emailAddress" size="40"
maxlength="40" /></td>
@@ -94,59 +131,58 @@
<br />
- <p class="subtitle"><s:text name="userAdmin.userWeblogs" /></p>
-
- <s:if test="permissions != null && !permissions.isEmpty() > 0">
-
- <p><s:text name="userAdmin.userMemberOf" /></p>
- <table class="rollertable" style="width: 80%">
- <s:iterator id="perms" value="permissions">
- <tr>
- <td width="%30">
- <a href='<s:property value="#perms.weblog.absoluteURL"
/>'>
- <s:property value="#perms.weblog.name" />
[<s:property value="#perms.weblog.handle" />]
- </a>
- </td>
- <td width="%15">
- <s:url action="entryAdd"
namespace="/roller-ui/authoring" id="newEntry">
- <s:param name="weblog"
value="#perms.weblog.handle" />
- </s:url>
- <img src='<s:url
value="/images/page_white_edit.png"/>' />
- <a href='<s:property value="newEntry" />'>
- <s:text name="userAdmin.newEntry" /></a>
- </td>
- <td width="%15">
- <s:url action="entries"
namespace="/roller-ui/authoring" id="editEntries">
- <s:param name="weblog"
value="#perms.weblog.handle" />
- </s:url>
- <img src='<s:url
value="/images/page_white_edit.png"/>' />
- <a href='<s:property value="editEntries" />'>
- <s:text name="userAdmin.editEntries" /></a>
- </td>
- <td width="%15">
- <s:url action="weblogConfig"
namespace="/roller-ui/authoring" id="manageWeblog">
- <s:param name="weblog"
value="#perms.weblog.handle" />
- </s:url>
- <img src='<s:url
value="/images/page_white_edit.png"/>' />
- <a href='<s:property value="manageWeblog" />'>
- <s:text name="userAdmin.manage" /></a>
- </td>
- </tr>
- </s:iterator>
- </table>
-
+ <s:if test="actionName == 'modifyUser'">
+ <p class="subtitle"><s:text name="userAdmin.userWeblogs" /></p>
+
+ <s:if test="permissions != null && !permissions.isEmpty() > 0">
+ <p><s:text name="userAdmin.userMemberOf" />:</p>
+ <table class="rollertable" style="width: 80%">
+ <s:iterator id="perms" value="permissions">
+ <tr>
+ <td width="%30">
+ <a href='<s:property
value="#perms.weblog.absoluteURL" />'>
+ <s:property value="#perms.weblog.name" />
[<s:property value="#perms.weblog.handle" />]
+ </a>
+ </td>
+ <td width="%15">
+ <s:url action="entryAdd"
namespace="/roller-ui/authoring" id="newEntry">
+ <s:param name="weblog"
value="#perms.weblog.handle" />
+ </s:url>
+ <img src='<s:url
value="/images/page_white_edit.png"/>' />
+ <a href='<s:property value="newEntry" />'>
+ <s:text name="userAdmin.newEntry" /></a>
+ </td>
+ <td width="%15">
+ <s:url action="entries"
namespace="/roller-ui/authoring" id="editEntries">
+ <s:param name="weblog"
value="#perms.weblog.handle" />
+ </s:url>
+ <img src='<s:url
value="/images/page_white_edit.png"/>' />
+ <a href='<s:property value="editEntries" />'>
+ <s:text name="userAdmin.editEntries" /></a>
+ </td>
+ <td width="%15">
+ <s:url action="weblogConfig"
namespace="/roller-ui/authoring" id="manageWeblog">
+ <s:param name="weblog"
value="#perms.weblog.handle" />
+ </s:url>
+ <img src='<s:url
value="/images/page_white_edit.png"/>' />
+ <a href='<s:property value="manageWeblog" />'>
+ <s:text name="userAdmin.manage" /></a>
+ </td>
+ </tr>
+ </s:iterator>
+ </table>
+ </s:if>
+ <s:else>
+ <s:text name="userAdmin.userHasNoWeblogs" />
+ </s:else>
</s:if>
-
- <s:else>
- <s:text name="userAdmin.userHasNoWeblogs" />
- </s:else>
-
+
<br />
<br />
-
+
<div class="control">
- <s:submit value="%{getText('generic.save')}" />
- <input type="button" value="<s:text name="generic.cancel"/>"
onclick="window.location='<s:url action="userAdmin"/>'" />
+ <s:submit value="%{getText('generic.save')}"
action="%{#mainAction}!save"/>
+ <s:submit value="%{getText('generic.cancel')}"
action="modifyUser!cancel" />
</div>
</s:form>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp?rev=1617271&r1=1617270&r2=1617271&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp Mon Aug 11
13:10:36 2014
@@ -27,7 +27,7 @@
<tr>
<td class="label"><label for="userName" /><s:text
name="userSettings.username" /></label></td>
<td class="field"><s:textfield name="bean.userName" size="30"
maxlength="30" readonly="true" cssStyle="background: #e5e5e5" /></td>
- <td class="description"><s:text name="yourProfile.tip.userName"
/></td>
+ <td class="description"><s:text name="userSettings.tip.username"
/></td>
</tr>
<tr>
@@ -63,7 +63,6 @@
<td class="description"><s:text
name="userRegister.tip.passwordConfirm" /></td>
</tr>
</s:if>
-
<s:else>
<s:hidden name="bean.password" />
</s:else>
@@ -71,7 +70,7 @@
<s:if test="authMethod == 'OPENID' || authMethod == 'DB_OPENID'">
<tr>
<td class="label"><label for="openIdUrl" /><s:text
name="userSettings.openIdUrl" /></label></td>
- <td class="field"><s:textfield name="bean.openIdUrl" size="40"
maxlength="255" id="f_openid_identifier" /></td>
+ <td class="field"><s:textfield name="bean.openIdUrl" size="40"
maxlength="255" style="width:75%" id="f_openid_identifier" /></td>
<td class="description"><s:text
name="userRegister.tip.openIdUrl" /></td>
</tr>
</s:if>
@@ -96,7 +95,7 @@
<br />
- <s:submit value="%{getText('userSettings.button.save')}" />
+ <s:submit value="%{getText('generic.save')}" />
<input type="button" value="<s:text name="generic.cancel"/>"
onclick="window.location='<s:url action="menu"/>'" />
</s:form>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Register.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Register.jsp?rev=1617271&r1=1617270&r2=1617271&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Register.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Register.jsp Mon Aug 11
13:10:36 2014
@@ -84,7 +84,7 @@
</td>
</tr>
- <s:if test="authMethod != 'OPENID'">
+ <s:if test="authMethod == 'ROLLERDB' || authMethod == 'DB_OPENID'">
<tr>
<td class="label"><label for="passwordText" /><s:text
name="userSettings.password" /></label></td>
<td class="field">
@@ -110,7 +110,7 @@
<s:if test="authMethod == 'OPENID' || authMethod == 'DB_OPENID'">
<tr>
<td class="label"><label for="openIdUrl" /><s:text
name="userSettings.openIdUrl" /></label></td>
- <td class="field"><s:textfield name="bean.openIdUrl" size="40"
maxlength="255" id="f_openid_identifier" onkeyup="onChange()"/></td>
+ <td class="field"><s:textfield name="bean.openIdUrl" size="40"
maxlength="255" style="width:75%" id="f_openid_identifier"
onkeyup="onChange()"/></td>
<td class="description"><s:text
name="userRegister.tip.openIdUrl" /></td>
</tr>
</s:if>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml?rev=1617271&r1=1617270&r2=1617271&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml Mon Aug 11 13:10:36 2014
@@ -168,12 +168,8 @@
<put-attribute name="content"
value="/WEB-INF/jsps/admin/UserAdmin.jsp" />
</definition>
- <definition name=".CreateUser" extends=".tiles-tabbedpage" >
- <put-attribute name="content"
value="/WEB-INF/jsps/admin/CreateUser.jsp" />
- </definition>
-
- <definition name=".ModifyUser" extends=".tiles-tabbedpage" >
- <put-attribute name="content"
value="/WEB-INF/jsps/admin/ModifyUser.jsp" />
+ <definition name=".UserEdit" extends=".tiles-tabbedpage" >
+ <put-attribute name="content" value="/WEB-INF/jsps/admin/UserEdit.jsp"
/>
</definition>
<definition name=".GlobalCommentManagement" extends=".tiles-tabbedpage" >
