You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2010/06/18 18:32:17 UTC
svn commit: r956040 -
/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/src/main/resources/org/apache/clerezza/platform/accountcontrolpanel/
Author: reto
Date: Fri Jun 18 16:32:17 2010
New Revision: 956040
URL: http://svn.apache.org/viewvc?rev=956040&view=rev
Log:
fixed ssp to work with scala 2.8 (+= in mutable list returns value)
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/src/main/resources/org/apache/clerezza/platform/accountcontrolpanel/control-panel.ssp
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/src/main/resources/org/apache/clerezza/platform/accountcontrolpanel/control-panel.ssp
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/src/main/resources/org/apache/clerezza/platform/accountcontrolpanel/control-panel.ssp?rev=956040&r1=956039&r2=956040&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/src/main/resources/org/apache/clerezza/platform/accountcontrolpanel/control-panel.ssp (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/src/main/resources/org/apache/clerezza/platform/accountcontrolpanel/control-panel.ssp Fri Jun 18 16:32:17 2010
@@ -7,9 +7,8 @@ val nodeBuff = new ListBuffer[NodeBuffer
resultDocModifier.setTitle("Account Control Panel");
resultDocModifier.addNodes2Elem("tx-module", <h1>Account Control Panel</h1>);
-<div id="tx-content">
-{if ((res/cp("userBundlePermission")*) == "true")
- {nodeBuff +=(<h2>Bundle Control Panel</h2>
+if ((res/cp("userBundlePermission")*) == "true") {
+ nodeBuff +=(<h2>Bundle Control Panel</h2>
<h3>Install Bundle</h3>
<form method="post" action="control-panel/install-bundle" enctype="multipart/form-data">
@@ -62,31 +61,34 @@ resultDocModifier.addNodes2Elem("tx-modu
}
</tbody>
</table>
- <br/>)}
+ <br/>)
+}
+
+if((res/cp("changePasswordPermission")*) == "true") {
+ nodeBuff +=(<h2>Change Password</h2>
+ <form method="post" action="control-panel/change-password" >
+ <label for="oldPW">Current Password:</label>
+ <input type="password" name="oldPW"/>
+ <br />
+ <label for="newPW">New Password:</label>
+ <input type="password" name="newPW"/>
+ <br />
+ <label for="confirmNewPW">Confirm new Password:</label>
+ <input type="password" name="confirmNewPW"/>
+ <br />
+ <input type="submit" name="submit" value="Submit"/>
+ </form>)
}
-{if((res/cp("changePasswordPermission")*) == "true")
-nodeBuff +=(<h2>Change Password</h2>
-<form method="post" action="control-panel/change-password" >
-<label for="oldPW">Current Password:</label>
-<input type="password" name="oldPW"/>
-<br />
-<label for="newPW">New Password:</label>
-<input type="password" name="newPW"/>
-<br />
-<label for="confirmNewPW">Confirm new Password:</label>
-<input type="password" name="confirmNewPW"/>
-<br />
-<input type="submit" name="submit" value="Submit"/>
-</form>)}
-{
- if((res/cp("changedPassword")).length > 0) {
- nodeBuff +=(<br /><span>Password has not changed, either wrong current password or the
- new password and the confirmation didn't match!</span>)
- }
+if((res/cp("changedPassword")).length > 0) {
+ nodeBuff +=(<br /><span>Password has not changed, either wrong current password or the
+ new password and the confirmation didn't match!</span>)
}
+
+<div id="tx-content">
{if(nodeBuff.isEmpty)
- <span>There are no settings you can configure for this account!</span> else
+ <span>There are no settings you can configure for this account!</span>
+else
nodeBuff
}
</div>
\ No newline at end of file