You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2007/06/01 03:35:39 UTC
svn commit: r543350 - in /roller/trunk/apps/weblogger/web/WEB-INF/jsps:
core/Profile.jsp editor/TemplateEdit.jsp
Author: agilliland
Date: Thu May 31 18:35:38 2007
New Revision: 543350
URL: http://svn.apache.org/viewvc?view=rev&rev=543350
Log:
use uneditable form fields instead of ugly old plain red text.
Modified:
roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Profile.jsp
roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/TemplateEdit.jsp
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Profile.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Profile.jsp?view=diff&rev=543350&r1=543349&r2=543350
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Profile.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Profile.jsp Thu May 31 18:35:38 2007
@@ -22,67 +22,67 @@
<s:form action="profile!save">
<s:hidden name="bean.userName" />
-<table class="formtable">
-
-<tr>
- <td class="label"><label for="userName" /><s:text name="userSettings.username" /></label></td>
- <td class="field"><span class="fixedAttr"><s:property value="bean.userName"/></span></td>
- <td class="description"><s:text name="yourProfile.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.passwordText" size="20" maxlength="20" />
- </td>
- <td class="description"><s:text name="userRegister.tip.password" /></td>
-</tr>
-
-<tr>
- <td class="label"><label for="passwordConfirm" /><s:text name="userSettings.passwordConfirm" /></label></td>
- <td class="field"><s:password name="bean.passwordConfirm" size="20" maxlength="20" /></td>
- <td class="description"><s:text name="userRegister.tip.passwordConfirm" /></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>
- <td class="description"><s:text name="userRegister.tip.screenName" /></td>
-</tr>
-
-<tr>
- <td class="label"><label for="fullName" /><s:text name="userSettings.fullname" /></label></td>
- <td class="field"><s:textfield name="bean.fullName" size="30" maxlength="30" /></td>
- <td class="description"><s:text name="userRegister.tip.fullName" /></td>
-</tr>
+ <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="yourProfile.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.passwordText" size="20" maxlength="20" />
+ </td>
+ <td class="description"><s:text name="userRegister.tip.password" /></td>
+ </tr>
+
+ <tr>
+ <td class="label"><label for="passwordConfirm" /><s:text name="userSettings.passwordConfirm" /></label></td>
+ <td class="field"><s:password name="bean.passwordConfirm" size="20" maxlength="20" /></td>
+ <td class="description"><s:text name="userRegister.tip.passwordConfirm" /></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>
+ <td class="description"><s:text name="userRegister.tip.screenName" /></td>
+ </tr>
+
+ <tr>
+ <td class="label"><label for="fullName" /><s:text name="userSettings.fullname" /></label></td>
+ <td class="field"><s:textfield name="bean.fullName" size="30" maxlength="30" /></td>
+ <td class="description"><s:text name="userRegister.tip.fullName" /></td>
+ </tr>
+
+ <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>
+ <td class="description"><s:text name="userRegister.tip.email" /></td>
+ </tr>
+
+ <tr>
+ <td class="label"><label for="locale" /><s:text name="userSettings.locale" /></label></td>
+ <td class="field">
+ <s:select name="bean.locale" size="1" list="localesList" listValue="displayName" />
+ </td>
+ <td class="description"><s:text name="userRegister.tip.locale" /></td>
+ </tr>
+
+ <tr>
+ <td class="label"><label for="timeZone" /><s:text name="userSettings.timeZone" /></label></td>
+ <td class="field">
+ <s:select name="bean.timeZone" size="1" list="timeZonesList" />
+ </td>
+ <td class="description"><s:text name="userRegister.tip.timeZone" /></td>
+ </tr>
+
+ </table>
-<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>
- <td class="description"><s:text name="userRegister.tip.email" /></td>
-</tr>
-
-<tr>
- <td class="label"><label for="locale" /><s:text name="userSettings.locale" /></label></td>
- <td class="field">
- <s:select name="bean.locale" size="1" list="localesList" listValue="displayName" />
- </td>
- <td class="description"><s:text name="userRegister.tip.locale" /></td>
-</tr>
+ <br />
-<tr>
- <td class="label"><label for="timeZone" /><s:text name="userSettings.timeZone" /></label></td>
- <td class="field">
- <s:select name="bean.timeZone" size="1" list="timeZonesList" />
- </td>
- <td class="description"><s:text name="userRegister.tip.timeZone" /></td>
-</tr>
+ <s:submit key="userSettings.button.save" />
+ <input type="button" value="<s:text name="userSettings.button.cancel"/>" onclick="window.location='<s:url action="menu"/>'" />
-</table>
-
-<br />
-
-<s:submit key="userSettings.button.save" />
-<input type="button" value="<s:text name="userSettings.button.cancel"/>" onclick="window.location='<s:url action="menu"/>'" />
-
</s:form>
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/TemplateEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/TemplateEdit.jsp?view=diff&rev=543350&r1=543349&r2=543350
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/TemplateEdit.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/TemplateEdit.jsp Thu May 31 18:35:38 2007
@@ -43,8 +43,7 @@
<td class="label"><s:text name="pageForm.name" /> </td>
<td class="field">
<s:if test="template.required">
- <span class="fixedAttr"><s:property value="bean.name"/></span>
- <s:hidden name="bean.name" />
+ <s:textfield name="bean.name" size="50" readonly="true" cssStyle="background: #e5e5e5" />
</s:if>
<s:else>
<s:textfield name="bean.name" size="50"/>
@@ -84,13 +83,7 @@
<tr>
<td class="label" valign="top"><s:text name="pageForm.link" /> </td>
<td class="field">
- <s:if test="template.required">
- <span class="fixedAttr"><s:property value="bean.link"/></span>
- <s:hidden name="bean.link" />
- </s:if>
- <s:else>
- <s:textfield name="bean.link" size="50" onkeyup="updatePageURLDisplay()" />
- </s:else>
+ <s:textfield name="bean.link" size="50" onkeyup="updatePageURLDisplay()" />
<br />
<s:property value="actionWeblog.absoluteURL" />/page/<span id="linkPreview" style="color:red"><s:property value="bean.link" /></span>
<s:if test="template.link != null">[<a id="launchLink" onClick="launchPage()"><s:text name="pageForm.launch" /></a>]</s:if>
@@ -103,8 +96,7 @@
<td class="label" valign="top" style="padding-top: 4px"><s:text name="pageForm.description" /> </td>
<td class="field">
<s:if test="template.required">
- <span class="fixedAttr"><s:property value="bean.description"/></span>
- <s:hidden name="bean.description" />
+ <s:textarea name="bean.description" cols="50" rows="2" readonly="true" cssStyle="background: #e5e5e5" />
</s:if>
<s:else>
<s:textarea name="bean.description" cols="50" rows="2" />