X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=blobdiff_plain;f=portal%2Ftemplates%2Fmanageuserview.html;h=3675c9af27fd8f3e889c1ca14bfc05dd47bd9c7d;hp=74a2a0fd283d9211035ce6ff03ae5887be5166c1;hb=d25b15bb54f4d6b26664d7c2554f632d767e461b;hpb=8e9f1db465d5579630eb84f51e3f3dd6b2458956

diff --git a/portal/templates/manageuserview.html b/portal/templates/manageuserview.html
index 74a2a0fd..3675c9af 100644
--- a/portal/templates/manageuserview.html
+++ b/portal/templates/manageuserview.html
@@ -12,7 +12,7 @@
 {% endif %}
 
 
-<form id="editForm"  method="POST" action="account_process" enctype="multipart/form-data">
+<form id="editForm"  method="POST" action="{{user_email}}/user_process" enctype="multipart/form-data">
 <div id="middle" align="center">
 	<div class="well">
 	  	{% csrf_token %}
@@ -22,43 +22,11 @@
 						<div id="info">Platform: Myslice</div>
 	      			</td>
 	    		</tr>
-	    		<tr class="even">
-	      			<td class="key">Email</td>
-	      			<td class="value">
-						<span id="emailval" class="value" >{{ person.email }}</span>
-						<button class="btn btn-default btn-xs" type="button" id="edit_email" onclick="editAlert()"  title="To change your affiliation please contact the administrator">
-    						<span class="glyphicon glyphicon-question-sign"></span> Edit
-						</button>
-					</td>
-	      		</tr>
+				<tr class="even">
+    				<td class="key">Email</td>
+    				<td class="value"> <span id="emailval" class="value" >{{ user_email }}</span> </td>
+				</tr>
 	      		<tr class="odd">
-					<td class="key">Password</td>
-					<td class="value"> 
-		  				<button class="btn btn-default btn-xs" type="button" title="Password" name="edit_pass" id="edit_pass">
-							<span class="glyphicon glyphicon-edit"></span> Edit
-						</button>
-		  				<span id="passval"class="value">******** </span>
-		  				<span class="hide_this" id="span_pass">
-		    				<button type="button" class="btn btn-default btn-xs" title="Cancel" id="cancel_pass_change"> Cancel </button>
-		    				<div style='display:none;' id="pass_form">
-		    				<input type='hidden'  value='' /></div>
-		    				<table id="edit_password">
-		      					<tr>
-									<td>Enter password: </td>
-									<td class="field"> <input type="password" name="password" id="password" /> </td>
-		      						</tr>
-		      						<tr>
-									<td>Confirm password: </td>
-									<td class="field"> 
-			  							<input type="password" name="confirmpassword" id="confirmpassword" /> 
-			  							<input type="submit" class="btn btn-default btn-xs" name="submit_pass" value="Save"/> 
-									</td>
-		      					</tr>
-		    				</table>
-		  				</span>	
-					</td>
-	      		</tr>
-	      		<tr class="even">
 					<td class="key">Full Name</td>
 					<td class="value">
 		  				<span id="nameval" class="value" >{{ fullname }} </span>
@@ -74,16 +42,22 @@
 						</button>
 					</td>
 	      		</tr>
-	      		<tr class="odd">
-					<td class="key">Authority</td>
-					<td class="value">
-		  				<span id="affval" class="value">{{ authority }}</span>
-						 <button class="btn btn-default btn-xs" type="button" id="edit_auth" onclick="editAlert()"  title="To change your authority please contact the administrator">
-     						<span class="glyphicon glyphicon-question-sign"></span> Edit
-						 </button>
-		  			</td>
-				</tr>
 				<tr class="even">
+     				<td class="key">Authority</td>
+     				<td class="value">
+         				<span id="authval" class="value" >{{ authority }} </span>
+         				<span class="hide_this" id="span_auth">
+             				<button type="button" class="btn btn-default btn-xs" title="Cancel" id="cancel_auth_change"> Cancel </button>
+             				<div style='display:none;'><input type='hidden'  name='authform'  /></div>
+             				<input id="authority" type="text" name="authority" class="required"  maxlength="200" value="{{authority}}" />
+             				<input type="submit" class="btn btn-default btn-xs" name="submit_auth" value="Save"/>
+         				</span>
+         				<button class="btn btn-default btn-xs" type="button"title="auth" id="edit_auth">
+             				<span class="glyphicon glyphicon-edit"></span> Edit
+        	 			</button>
+     				</td>
+ 				</tr>     
+				<tr class="odd">
 		  			<td class="key">Generate Keys</td>
 		  			<td>
 						<input type="submit" name="generate" class="btn btn-danger btn-xs" value="Generate a new Key Pair" id="generate_keypair" 
@@ -91,7 +65,7 @@
 							   title="It will generate a new key Pair and your current credentials will be overwritten."/>
 	      			</td> 
 	    		</tr>
-	    		<tr class="odd">
+	    		<tr class="even">
 	      			<td class="key">Public Key</td>
 	      			<td class="value">
 						<span id="keyval" class="value">******** </span>
@@ -112,7 +86,7 @@
 						</button>       
 	      			</td>
 	    		</tr>
-	    		<tr class="even" id="pkey_row">
+	    		<tr class="odd" id="pkey_row">
 				 {%if 'N/A' not in user_private_key%}
 	      			<td class="key">Private Key </td> <!-- Hide if priv_key doesn't exist in myslice platform   -->
 	      			<td class="value">********<a href="#">
@@ -133,14 +107,6 @@
 					</td>
 				 {%endif%}		
 	  			</tr>
-	  			<tr class="odd">
-	    			<td colspan="2">
-	      				<p class="message" id="pkey_del_msg"><b> Tradeoff:</b> Ease-of-use vs Security.<br>
-							<b>Ease-of-use:</b> Automatic account delegation. Don't delete private key.<br>
-							<b>Security:</b> Manual account delegation. Download & Delete private key.
-						</p>
-	    			</td>
-	  			</tr>
 			</table>
 	</div>
 </div>