X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Faccount-view.html;h=74a2a0fd283d9211035ce6ff03ae5887be5166c1;hb=bbc146e5dcbd1a5285b7465cd3e7f2c23a6dc9c8;hp=83e03d3d0274fae8bad2f8e6b5dcdc2b0ed2c446;hpb=14d2b5115a61a9011c79568cab1554afb14b7bdd;p=unfold.git

diff --git a/portal/templates/account-view.html b/portal/templates/account-view.html
index 83e03d3d..74a2a0fd 100644
--- a/portal/templates/account-view.html
+++ b/portal/templates/account-view.html
@@ -26,7 +26,7 @@
 	      			<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="emailAlert()"  title="To change your affiliation please contact the administrator">
+						<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>
@@ -78,17 +78,17 @@
 					<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="affAlert()"  title="To change your authority please contact the administrator">
+						 <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">Generate Keys</td>
-		  			<td> 
-		  				<button id="generate_keypair" class="btn btn-danger btn-xs" name="generate" type="submit" onclick="myFunction()" 
-								title="Generate a new key pair. After it is generated, you will need to download your public and private keys again.">Generate a new Key Pair 
-						</button>
+		  			<td>
+						<input type="submit" name="generate" class="btn btn-danger btn-xs" value="Generate a new Key Pair" id="generate_keypair" 
+							   onclick="return confirm('Are you sure? If you do so, your current credentials will be overwritten.');" 
+							   title="It will generate a new key Pair and your current credentials will be overwritten."/>
 	      			</td> 
 	    		</tr>
 	    		<tr class="odd">
@@ -98,11 +98,10 @@
 						<span class="hide_this" id="span_upload">
 		  					<button type="button" class="btn btn-default btn-xs" title="Cancel" id="cancel_upload"> Cancel </button>
 		  					<div style='display:none;'>
-		  					<input type='hidden'  name='upload'  /></div>
-		  					<input type="file" name="pubkey" class="required" id="pubkey"/>  
-		  					<button class="btn btn-default btn-xs" name="upload_key" id="upload_key"  type="submit" title="Upload your public key">
-								<span class="glyphicon glyphicon-upload"></span> Upload
-							</button>
+		  						<input type='hidden'  name='upload'  /></div>
+		  						<input type="file" name="pubkey" class="required" id="pubkey"/>  
+		  						<input class="btn btn-default btn-xs" name="upload_key" id="upload_key"  type="submit" title="Upload your public key" value="Upload"
+								   onclick="return confirm('Are you sure? It will overwrite your current credentials and you have delegate it manually.');"/>
 						</span>
 						<div style='display:none;'> <input type='hidden'  name='dload'  /> </div> 
 						<button type="submit" name="dl_pubkey" class="btn btn-default btn-xs" title="Download your public key" id="dl_file">
@@ -120,7 +119,8 @@
 	      				<button type="submit" name="dl_pkey" class="btn btn-default btn-xs" title="Download your privaye key" id="dl_pkey">
 							<span class="glyphicon glyphicon-download"></span> Download	
 						</button>
-	      				<button class="btn btn-danger btn-xs" id="delete" name="delete" type="submit" title="Delete your private key">Delete </button>
+	      				<input class="btn btn-danger btn-xs" id="delete" name="delete" type="submit"  value="Delete" title="Delete your private key"
+								onclick="return confirm('Are you sure? If you do so, you have to delegate your credentials manually.');"/> 
 	    			</td>
 				  {%else%}
 					<td class="key">Private Key </td> <!-- Hide if priv_key doesn't exist in myslice platform   -->
@@ -128,7 +128,8 @@
      					<button type="submit" name="dl_pkey" class="btn btn-default btn-xs disabled" title="Download your privaye key" id="dl_pkey">
         					<span class="glyphicon glyphicon-download"></span> Download 
      					</button>
-     				<button class="btn btn-danger btn-xs disabled" id="delete" name="delete" type="submit" title="Delete your private key">Delete </button>
+     					<input class="btn btn-danger btn-xs disabled" id="delete" name="delete" type="submit" title="Delete your private key"
+								value="Delete"	/>
 					</td>
 				 {%endif%}		
 	  			</tr>
@@ -155,6 +156,7 @@
         		<th>Account Type</th>
 				<th>Account Delegation</th>
         		<th>User hrn</th>
+				<th>User Status</th>
         		<!--<th>Pub Key</th> -->
     		</tr>   
 			{% for row in principal_acc %}         
@@ -163,6 +165,7 @@
         		<td class="odd"> {{ row.account_type }} </td>
 				<td class="odd"> {{ row.delegation_type }} </td>
        			<td class="odd"> {{ row.usr_hrn }}  </td>
+				<td class="odd"> {{ row.user_status }}  </td>
         	<!--	<td class="even"> {{ row.usr_pubkey }} </td> -->
     		</tr> 
 			{%endfor%}               
@@ -172,7 +175,7 @@
 
 
 
-
+{%if 'Enabled'  in user_status %}
 <h3 id="show-pending" class="plugin-show" style="display: block;">
 <span class="glyphicon glyphicon-chevron-right"></span>
 <a href="#" class="plugin-tooltip" data-toggle="tooltip" data-original-title="Show plugin &quot;Pending operations&quot; (QueryUpdater)"></a>Credentials</h3>
@@ -319,6 +322,7 @@
     </div>
 </div>
 </div>
+{%endif%} 
 
 </form>