X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=portal%2Ftemplates%2Faccount-view.html;h=74a2a0fd283d9211035ce6ff03ae5887be5166c1;hb=bbc146e5dcbd1a5285b7465cd3e7f2c23a6dc9c8;hp=ebad910bc7808762ce0d14cfb8486afb54b07caf;hpb=d9bbe0a36624c6fe558c05307964be1b3ed4e3b1;p=myslice.git

diff --git a/portal/templates/account-view.html b/portal/templates/account-view.html
index ebad910b..74a2a0fd 100644
--- a/portal/templates/account-view.html
+++ b/portal/templates/account-view.html
@@ -1,16 +1,7 @@
 {% extends "layout-unfold1.html" %}
-
-{% block head %}
-<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/onelab.css"/>
-<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/account_view.css" />
-<script type="text/javascript" src="{{STATIC_URL}}/js/jquery.validate.js"></script> 
-<script type="text/javascript" src="{{STATIC_URL}}/js/my_account.edit_profile.js"></script>
-<script type="text/javascript" src="{{STATIC_URL}}/js/my_account.register.js"></script>
-{% endblock %}
-
 {% block unfold_main %}
 
-<h2>User Details</h2>
+<h2>User Profile</h2>
 
 {% if messages %}
 <ul class="messages">
@@ -35,17 +26,20 @@
 	      			<td class="key">Email</td>
 	      			<td class="value">
 						<span id="emailval" class="value" >{{ person.email }}</span>
-						<img class="logo" src="{{STATIC_URL}}/img/ques_icon.png" onclick="emailAlert()"  title="To change your email please contact the administrator" 
-							 style="height: 20px; width: 20px; position: absolute; left: 625px; left: 900px; margin-top: -9px;">
+						<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="odd">
 					<td class="key">Password</td>
 					<td class="value"> 
-		  				<button class="edit" type="button" title="Password" name="edit_pass" id="edit_pass">Edit</button>
+		  				<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="cancel" title="Cancel" id="cancel_pass_change"> Cancel </button>
+		    				<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">
@@ -57,7 +51,7 @@
 									<td>Confirm password: </td>
 									<td class="field"> 
 			  							<input type="password" name="confirmpassword" id="confirmpassword" /> 
-			  							<input type="submit" name="submit_pass" value="Save"/> 
+			  							<input type="submit" class="btn btn-default btn-xs" name="submit_pass" value="Save"/> 
 									</td>
 		      					</tr>
 		    				</table>
@@ -69,29 +63,32 @@
 					<td class="value">
 		  				<span id="nameval" class="value" >{{ fullname }} </span>
 		  				<span class="hide_this" id="span_name">
-		    				<button type="button" class="cancel" title="Cancel" id="cancel_name_change"> Cancel </button> 
+		    				<button type="button" class="btn btn-default btn-xs" title="Cancel" id="cancel_name_change"> Cancel </button> 
 		    				<div style='display:none;'><input type='hidden'  name='nameform'  /></div>
 		    				<input id="fname" type="text" name="fname" class="required"  maxlength="200" value="{{firstname}}" />
 		    				<input id="lname" type="text" name="lname" class="required"  maxlength="200" value="{{lastname}}" />
-		    				<input type="submit" name="submit_name" value="Save"/>
+		    				<input type="submit" class="btn btn-default btn-xs" name="submit_name" value="Save"/>
 		  				</span>
-		  				<button class="edit" type="button"title="Full Name" id="edit_name">Edit</button>
+		  				<button class="btn btn-default btn-xs" type="button"title="Full Name" id="edit_name">
+							<span class="glyphicon glyphicon-edit"></span> Edit
+						</button>
 					</td>
 	      		</tr>
 	      		<tr class="odd">
 					<td class="key">Authority</td>
 					<td class="value">
 		  				<span id="affval" class="value">{{ authority }}</span>
-		  				<img class="logo" src="{{STATIC_URL}}/img/ques_icon.png" onclick="affAlert()"  title="To change your affiliation please contact the administrator" 
-							 style="height: 20px; width: 20px; position: absolute; left: 625px; left: 900px; ">
+						 <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" 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">
@@ -99,24 +96,41 @@
 	      			<td class="value">
 						<span id="keyval" class="value">******** </span>
 						<span class="hide_this" id="span_upload">
-		  					<button type="button" class="cancel" title="Cancel" id="cancel_upload"> Cancel </button>
+		  					<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 name="upload_key" id="upload_key"  type="submit" title="Delete your private key">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="download" title="Download your public key" id="dl_file"> Download </button>
-						<button id="upload_file" type="button" title="Upload a public key"> Upload </button>       
+						<button type="submit" name="dl_pubkey" class="btn btn-default btn-xs" title="Download your public key" id="dl_file">
+							<span class="glyphicon glyphicon-download"></span> Download
+						</button>
+						<button class="btn btn-default btn-xs" id="upload_file" type="button" title="Upload a public key">
+							<span class="glyphicon glyphicon-upload"></span> Upload
+						</button>       
 	      			</td>
 	    		</tr>
 	    		<tr class="even" 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="#">
-	      				<button type="submit" name="dl_pkey" class="download" title="Download your privaye key" id="dl_pkey"> Download </button>
-	      				<button id="delete" name="delete" type="submit" title="Delete your private key">Delete </button>
+	      				<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>
+	      				<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   -->
+ 					<td class="value">********<a href="#">
+     					<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>
+     					<input class="btn btn-danger btn-xs disabled" id="delete" name="delete" type="submit" title="Delete your private key"
+								value="Delete"	/>
+					</td>
 				 {%endif%}		
 	  			</tr>
 	  			<tr class="odd">
@@ -131,24 +145,27 @@
 	</div>
 </div>
 
+
 <h2>Account Information</h2>
-<h3>Principal Account</h3>
+<h3>Principal Account <small>Account used for delegating credentials</small></h3>
 <div id="middle" align="center">
 	<div class="well">
-		<table class="mytable"> 
+		<table class="table table-bordered table-hover  mytable"> 
 			<tr class="odd"> 
     			<th>Platform</th> 
         		<th>Account Type</th>
-				<th>Account_delegation</th>
-        		<th>user_hrn</th>
+				<th>Account Delegation</th>
+        		<th>User hrn</th>
+				<th>User Status</th>
         		<!--<th>Pub Key</th> -->
     		</tr>   
-			{% for row in data %}         
+			{% for row in principal_acc %}         
    			<tr class="border_bottom">
     			<td class="odd"> {{ row.platform_name }} </td>
-        		<td class="even"> {{ row.account_type }} </td>
+        		<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%}               
@@ -157,10 +174,20 @@
 </div>
 
 
-<h3>Credentials</h3>
+
+{%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>
+
+<div id="hide-pending" class="plugin-hide" style="display: none;">
+<span class="glyphicon glyphicon-chevron-down"></span>
+<a href="#" class="plugin-tooltip" data-toggle="tooltip" data-original-title="Hide plugin &quot;Pending operations&quot; (QueryUpdater)">Credentials</a>
+
+<h5>Delegated Credentials to Principal Account</h5>
 <div id="middle" align="center">
     <div class="well">
-        <table class="mytable">
+        <table class="mytable table table-bordered table-hover">
 			<caption><b>Delegated User Credential</b></caption> 
             <tr class="odd"> 
                 <th>Expiration Date</th>
@@ -168,13 +195,17 @@
             </tr>
 			{% for row in my_users %}         
 			<tr class="border_bottom">
-    			<td class="even"> {{ row.cred_exp }} </td>
-				<td class="odd"><button id="dl_user_cred" name= "dl_user_cred" type="submit" title="Download User Credential">Download</button></td>
+    			<td class="odd"> {{ row.cred_exp }} </td>
+				<td class="odd">
+					<button class="btn btn-default btn-xs" name= "dl_user_cred" type="submit" title="Download User Credential">
+						<span class="glyphicon glyphicon-download"></span> Download
+					</button>
+				</td>
 			</tr>
 			{%endfor%}
 		 </table>
 		<p></p>
-		<table class="mytable">
+		<table class="mytable table table-bordered table-hover">
 			<caption><b>Delegated Slice Credentials</b></caption>  
      		<tr class="odd"> 
 				<th>Slice Name</th> 
@@ -183,14 +214,18 @@
      		</tr>
 			{% for row in my_slices %}     
      		<tr class="border_bottom">
-         		<td class="even"> {{ row.slice_name }} </td>
+         		<td class="odd"> {{ row.slice_name }} </td>
 				<td class="odd"> {{ row.cred_exp }} </td>
-				<td class="even"> <button id="dl_slice_cred" name= "dl_slice_cred" type="submit" title="Download Slice Credentials">Download</button> </td>
+				<td class="odd"> 
+					<button class="btn btn-default btn-xs" name= "dl_{{row.slice_name}}" type="submit" title="Download Slice Credentials">
+						<span class="glyphicon glyphicon-download"></span> Download
+					</button> 
+				</td>
      		</tr>
      		{%endfor%}
   		</table>
 		<p></p>
-		<table class="mytable">
+		<table class="mytable table table-bordered table-hover">
    			<caption><b>Delegated Authority Credentials</b></caption>
    			<tr class="odd"> 
        			<th>Authority Name</th> 
@@ -199,24 +234,39 @@
    			</tr>
    			{% for row in my_auths %}
    			<tr class="border_bottom">
-       			<td class="even"> {{ row.auth_name }} </td>
+       			<td class="odd"> {{ row.auth_name }} </td>
        			<td class="odd"> {{ row.cred_exp }} </td>
-				<td class="even"><button id="dl_auth_cred" name= "dl_auth_cred" type="submit" title="Download Authority Credentials">Download</button></td>
+				<td class="odd">
+					<button class="btn btn-default btn-xs" name= "dl_{{row.auth_name}}" type="submit" title="Download Authority Credentials">
+						<span class="glyphicon glyphicon-download"></span> Download
+					</button>
+				</td>
    			</tr>
    			{%endfor%}
 		</table>
-		<p></p>	
-		<p><button id="clear_cred" name= "clear_cred" type="submit" title="Clear All Credentials">Clear Credentials</button></p>
+		<p></p>
+		 {%if '' not in my_users%}	
+		<p><button class="btn btn-danger btn-lg btn-block"   name= "clear_cred" type="submit" title="Clear All Credentials">Clear Credentials</button></p>
+		{%else%}
+		<p><button class="btn btn-danger btn-lg btn-block disabled"   name= "clear_cred" type="submit" title="Clear All Credentials">Clear Credentials</button></p>
+		{%endif%}
     </div>
 </div>
+</div>
 
 
+<h3 id="show-filters" 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>TestBed Accounts</h3>
 
+<div id="hide-filters" class="plugin-hide" style="display: none;">
+<span class="glyphicon glyphicon-chevron-down"></span>
+<a href="#" class="plugin-tooltip" data-toggle="tooltip" data-original-title="Hide plugin &quot;Pending operations&quot; (QueryUpdater)">TestBed Accounts</a>
 
-<h3>Testbed Accounts</h3>
+<h5>Reference Accounts in the following testbeds</h5>
 <div id="middle" align="center">
     <div class="well">
-        <table class="mytable"> 
+        <table class="mytable table table-bordered table-hover"> 
             <tr class="odd"> 
                 <th>Platform</th> 
                 <th>Account Type</th>
@@ -226,36 +276,53 @@
             {% for row in ref_acc %}         
             <tr class="border_bottom">
                 <td class="odd"> {{ row.platform_name }} </td>
-                <td class="even"> {{ row.account_type }} </td>
+                <td class="odd"> {{ row.account_type }} </td>
 				<td class="odd"> {{ row.account_reference }} </td>
-				<td class="even">
-    				<button id="delete_account" name="delete_{{platform.platform_no_access}}" type="submit" title="Delete account from this platform">Delete {{row.platform_name}}</button>
+				<td class="odd">
+    				<button class="btn btn-danger btn-xs" name="delete_{{row.platform_name}}" type="submit" title="Delete account from this platform">
+						<span class="glyphicon glyphicon-minus"></span>
+					</button>
 				</td>
             </tr> 
             {%endfor%}               
         </table>
     </div>
 </div>
+</div>
+
+
+<h3 id="show-resources" 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>Add Accounts</h3>
 
-<h3>Add Accounts</h3>
+<div id="hide-resources" class="plugin-hide" style="display: none;">
+<span class="glyphicon glyphicon-chevron-down"></span>
+<a href="#" class="plugin-tooltip" data-toggle="tooltip" data-original-title="Hide plugin &quot;Pending operations&quot; (QueryUpdater)">Add Accounts</a>
+
+
+<h5>Add reference account to the following testbeds</h5>
 <div id="middle" align="center">
     <div class="well">
-        <table class="mytable"> 
+        <table class="mytable table table-bordered table-hover"> 
             <tr class="odd"> 
                 <th>Platforms</th> 
-                <th>Request Access</th>
+                <th>Add Account</th>
             </tr>   
             {% for platform in platform_list %}         
             <tr class="border_bottom">
                 <td class="odd"> {{ platform.platform_no_access }} </td>
-                <td class="even">
-					<button id="add_account" name= "add_{{platform.platform_no_access}}" type="submit" title="Add account to this platform">Add {{platform.platform_no_access}}</button>
+                <td class="odd">
+					<button class="btn btn-success btn-sm" name= "add_{{platform.platform_no_access}}" type="submit" title="Add account to this platform">
+						<span class="glyphicon glyphicon-plus"></span>
+					</button>
 				</td>
             </tr> 
             {%endfor%}               
         </table>
     </div>
 </div>
+</div>
+{%endif%} 
 
 </form>