X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Ffed4fire%2Ffed4fire_account-view.html;h=b71f3da83c210e1a0fe9e824360216a84212ca02;hb=16a4bf955a76fee81209cd60458745040ed3c711;hp=13da1254a7cacf496b03e59b186b99afff142290;hpb=942e4d7597ac78a506cca5b62c1832dbaae8a72e;p=unfold.git

diff --git a/portal/templates/fed4fire/fed4fire_account-view.html b/portal/templates/fed4fire/fed4fire_account-view.html
index 13da1254..b71f3da8 100644
--- a/portal/templates/fed4fire/fed4fire_account-view.html
+++ b/portal/templates/fed4fire/fed4fire_account-view.html
@@ -1,16 +1,18 @@
 {% extends "layout.html" %}
+{% load portal_filters %}
 {% block content %}
-
+{% widget "_widget-no_credentials.html" %}
+{% widget "_widget-tradeoff.html" %}
 <div class="row">
 	<div class="col-md-12">
 		 <div class="breadcrumbs">
 		 	 Account &nbsp;>&nbsp; <a href="/account">{{ person.email }}</a>
 		 </div>
 	</div>
-	 {%if 'no_creds'  in user_cred %}
+	 {%if 'no_creds' in user_cred %}
     <p class="command"><a href="#" style="color:red" data-toggle="modal" data-target="#myModal">NO CREDENTIALS</a> are delegated to the portal!</p>
     {%endif%}
-	 {%if 'creds_expired'  in user_cred %}
+	 {%if 'creds_expired' in user_cred %}
     <p class="command"><a href="#" style="color:red" data-toggle="modal" data-target="#myModal">EXPIRED CREDENTIALS</a> Please delegate again your credentials to the portal!</p>
     {%endif%}
 
@@ -22,12 +24,15 @@
     {% endfor %}
 </ul>
 {% endif %}
+
+<form id="editForm" method="post" action="account_process" enctype="multipart/form-data">
+<input type="hidden" id="button_value"  name="button_value" value="" />
+
 <div class="row">
 	<div class="col-md-12">
 		<ul class="nav nav-tabs nav-section">
 			<li class="active"><a href="#profile">User Profile</a></li>
 			<li><a href="#account">Account</a></li>
-			<li><a href="#access">Testbed Access</a></li>
 		</ul>
     </div>
 </div>
@@ -36,7 +41,6 @@
 		
 	  	<div class="col-md-12">
 
-			<form id="editForm" method="post" action="account_process" enctype="multipart/form-data">
 			  	{% csrf_token %}
 			  		<table class="profile">          
 			    		<tr>
@@ -127,7 +131,7 @@
 										   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">
+								<button type="submit" name="dl_pubkey" class="btn btn-default btn-xs" title="Download your public key" id="dl_pubkey" onclick="javascript:document.getElementById('button_value').value='dl_pubkey';">
 									<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">
@@ -139,16 +143,16 @@
 						 {%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="#"></a>
-			      				<button type="submit" name="dl_pkey" class="btn btn-default" title="Download your privaye key" id="dl_pkey">
+			      				<button type="submit" name="dl_pkey" class="btn btn-default" title="Download your privaye key" id="dl_pkey" value="dl_pkey" onclick="javascript:document.getElementById('button_value').value='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.');"/> 
+										onclick="javascript:document.getElementById('button_value').value='delete'; 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="#"></a>
-		     					<button type="submit" name="dl_pkey" class="btn btn-default disabled" title="Download your privaye key" id="dl_pkey">
+		     					<button type="submit" name="dl_pkey" class="btn btn-default disabled" title="Download your privaye key" id="dl_pkey" value="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" />
@@ -158,11 +162,28 @@
 			    		<tr class="even" id="sfi_config_row">
 			      			<td class="key">sfi_config </td>
 			      			<td class="value">use sfi_config file with sfi.py package (pip install sfa)<a href="#"></a>
-			      				<button type="submit" name="dl_sfi_config" class="btn btn-default btn-xs" title="Download your privaye key" id="dl_sfi_config">
+			      				<button type="submit" name="dl_sfi_config" class="btn btn-default btn-xs" title="Download your sfi_config" id="dl_sfi_config" value="dl_sfi_config" onclick="javascript:document.getElementById('button_value').value='dl_sfi_config';">
 									<span class="glyphicon glyphicon-download"></span> Download
 								</button>
 			    			</td>
                         </tr>
+						<tr class="odd">
+							{%if 'N/A' not in user_private_key%}
+							<td class="key">Identity</td> 
+    						<td>
+								<button type="submit" name="dl_identity" class="btn btn-default btn-xs" title="You will require it to use jfed" id="dl_identity" onclick="javascript:document.getElementById('button_value').value='dl_identity';">
+    								<span class="glyphicon glyphicon-download"></span> Download 
+								</button>
+							</td>
+							{%else%}
+							<td class="key">Identity</td> 
+							<td>
+    							<button type="submit" name="dl_identity" class="btn btn-default btn-xs disabled" title="You will require it to use jfed" id="dl_identity">
+        							<span class="glyphicon glyphicon-download"></span> Download 
+    							</button>
+							</td>
+							{%endif%} 
+						</tr>
 
 			  			<tr class="even">
 			    			<td colspan="2">
@@ -204,223 +225,96 @@
 		</table>
 	
 		</div>
-	
 
 	{%if 'Enabled'  in user_status %}
 	  	<div class="col-md-12">
 		<h3>Credentials <small>Delegated to Principal Account</small></h3>
-		        <table class="table">
-					<caption><b>Delegated User Credential</b></caption> 
-		            <tr class="odd"> 
-		                <th>Expiration Date</th>
-						<th>Download</th>
-		            </tr>
-					{% for row in my_users %}         
-					<tr class="border_bottom">
-		    			<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> Credential
-							</button>
-							<button class="btn btn-default btn-xs" name= "dl_user_cert" type="submit" title="Download User Certificate">
-								<span class="glyphicon glyphicon-download"></span> Certificate
-							</button>
-                             <button class="btn btn-default btn-xs" name= "dl_user_p12" type="submit" title="Download User PKCS12">
-                                 <span class="glyphicon glyphicon-download"></span> PKCS p12
-                             </button>
-						</td>
-					</tr>
-					{%endfor%}
-				 </table>
-				<p></p>
-				<table class="mytable table table-bordered table-hover">
-					<caption><b>Delegated Slice Credentials</b></caption>  
-		     		<tr class="odd"> 
-						<th>Slice Name</th> 
-		         		<th>Expiration Date</th>
-						<th>Download</th>
-		     		</tr>
-					{% for row in my_slices %}     
-		     		<tr class="border_bottom">
-		         		<td class="odd"> {{ row.slice_name }} </td>
-						<td class="odd"> {{ row.cred_exp }} </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 table-bordered table-hover">
-		   			<caption><b>Delegated Authority Credentials</b></caption>
-		   			<tr class="odd"> 
-		       			<th>Authority Name</th> 
-		       			<th>Expiration Date</th>
-						<th>Download</th>
-		   			</tr>
-		   			{% for row in my_auths %}
-		   			<tr class="border_bottom">
-		       			<td class="odd"> {{ row.auth_name }} </td>
-		       			<td class="odd"> {{ row.cred_exp }} </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>
-				 {%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%}
+		    <table class="table">
+				<caption><b>Delegated User Credential</b></caption> 
+		        <tr class="odd"> 
+		            <th>Expiration Date</th>
+					<th>Download</th>
+		        </tr>
+				{% for row in my_users %}         
+				<tr class="border_bottom">
+		    		<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" onclick="javascript:document.getElementById('button_value').value='dl_user_cred';">
+							<span class="glyphicon glyphicon-download"></span> Credential
+						</button>
+						<button class="btn btn-default btn-xs" name= "dl_user_cert" type="submit" title="Download User Certificate" onclick="javascript:document.getElementById('button_value').value='dl_user_cert';">
+							<span class="glyphicon glyphicon-download"></span> Certificate
+						</button>
+                         <button class="btn btn-default btn-xs" name= "dl_user_p12" type="submit" title="Download User PKCS12" onclick="javascript:document.getElementById('button_value').value='dl_user_p12';">
+                             <span class="glyphicon glyphicon-download"></span> PKCS p12
+                         </button>
+					</td>
+				</tr>
+				{%endfor%}
+			 </table>
+			<p></p>
+			<table class="mytable table table-bordered table-hover">
+				<caption><b>Delegated Slice Credentials</b></caption>  
+		    	<tr class="odd"> 
+					<th>Slice Name</th> 
+		     		<th>Expiration Date</th>
+					<th>Download</th>
+		    	</tr>
+				{% for row in my_slices %}     
+		    	<tr class="border_bottom">
+		     		<td class="odd"> {{ row.slice_name }} </td>
+					<td class="odd"> {{ row.cred_exp }} </td>
+					<td class="odd"> 
+						<button class="btn btn-default btn-xs" name= "dl_{{row.slice_name}}" type="submit" title="Download Slice Credentials" onclick="javascript:document.getElementById('button_value').value='dl_{{row.slice_name}}';">
+							<span class="glyphicon glyphicon-download"></span> Download
+						</button> 
+					</td>
+		    	</tr>
+		    	{%endfor%}
+		  	</table>
+			<p></p>
+			<table class="mytable table table-bordered table-hover">
+		   		<caption><b>Delegated Authority Credentials</b></caption>
+		   		<tr class="odd"> 
+		    		<th>Authority Name</th> 
+		    		<th>Expiration Date</th>
+					<th>Download</th>
+		   		</tr>
+		   		{% for row in my_auths %}
+		   		<tr class="border_bottom">
+		    		<td class="odd"> {{ row.auth_name }} </td>
+		    		<td class="odd"> {{ row.cred_exp }} </td>
+					<td class="odd">
+						<button class="btn btn-default btn-xs" name= "dl_{{row.auth_name}}" type="submit" title="Download Authority Credentials" onclick="javascript:document.getElementById('button_value').value='dl_{{row.auth_name}}';">
+							<span class="glyphicon glyphicon-download"></span> Download
+						</button>
+					</td>
+		   		</tr>
+		   		{%endfor%}
+			</table>
+			<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" onclick="javascript:document.getElementById('button_value').value='clear_cred';">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>
-<!-- Modal- No credentials -->
-<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                            <h4 class="modal-title" id="myModalLabel">No credentials are delegated to the portal</h4>
-                    </div>
-					<div class="modal-body" style="text-align:justify;">
-					<p>You are getting this message for any of the following reasons:</p>
-					<ul>
-						<li>If your account is still pending for validation</li>
-						<li>If you press the "Clear Credentials" button</li>
-						<li>If you "Generate a new key pair"</li>
-						<li>If a new slice is added to your account</li>
-					</ul>
-					<p>Unless your account has not yet been validated, it is sufficient to refresh the page or go back to the home page. 
-						The portal will then regenerate your credentials. In some cases it may take more time than usual. If nothing works, 
-						then please logout and login back into to the portal.
-					</p>
-					<h3>Manual delegation of credentials</h3>
-						<p>
-							You have selected upon sign-up to upload your public key. As you have uploaded your own public key, 
-							the portal can no longer generate your credentials automatically. In order to have your credentials 
-							delegated to the portal, please follow these instructions:
-						</p>
-						<ul>
-							<li>Your account must first be validated by the manager of your organization.</li>
-							<li>In order for the portal to contact testbeds on your behalf, so as to list and reserve resources, you will need to
-								<a href="/portal/manual_delegation" target="_blank">delegate your credentials to the portal.</a></li>
-						</ul>
-					</p>
-					<h3>Contact support</h3>
-					<p>If you don't have the above mentioned cases and still have this message, please  <a href="/contact/" target="_blank">contact us</a>.</p>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                    </div>
-                </div>
-            </div>
-</div>
-
-
-<!-- Modal- Trade-off Message  -->
-<div class="modal fade" id="tradeoffmodal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                            <h4 class="modal-title" id="myModalLabel">
-								Automatic vs. Manual delegation of credentials
-							</h4>
-                    </div>
-					<div class="modal-body" style="text-align:justify;">
-					<h3>Automatic delegation of credentials</h3>
-						<p>Don't delete private key, ease-of-use option:</p>
-						<ul>
-							<li>
-								This means that you will keep your private key in the portal and it will automatically delegate your credentials on your behalf.
-							</li>
-							<li>
-								This option does not provide as high of a level of security; however, your private key will still only be used in the portal and 
-								will be available to you and the OneLab admins only.
-							</li>
-						</ul>
-					<h3>Manual delegation of credentials</h3>
-						<p>Download & Delete private key, higher security option:</p>
-						<ul>
-							<li>If you delete your private key, you will have more security but the portal will no longer be able to delegate credentials 
-								on your behalf, and you will have to manually
-								<a href="/portal/manual_delegation" target="_blank">delegate your credentials to the portal.</a>
-							</li>
-						</ul>
-					<h3>Contact support</h3>
-					<p>For more information, please  <a href="/contact/" target="_blank">contact us</a>.</p>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                    </div>
-                </div>
-            </div>
-</div>
-
-
-
-	<div class="tab-pane row" id="access">
-	  	<div class="col-md-12">
-	
-		<h3>Testbed Access <small>Reference Accounts in the following testbeds</small></h3>
-        <table class="mytable table table-bordered table-hover"> 
-            <tr class="odd"> 
-                <th>Platform</th> 
-                <th>Account Type</th>
-				<th>Reference to</th>
-				<th>Remove Account</th>
-            </tr>   
-            {% for row in ref_acc %}         
-            <tr class="border_bottom">
-                <td class="odd"> {{ row.platform_name }} </td>
-                <td class="odd"> {{ row.account_type }} </td>
-				<td class="odd"> {{ row.account_reference }} </td>
-				<td class="odd">
-    				<button class="btn btn-danger" name="delete_{{row.platform_name}}" type="submit" title="Delete account from this platform">
-						<span class="glyphicon glyphicon-minus"></span>
-					</button>
-				</td>
-            </tr> 
-            {%endfor%}               
-        </table>		
-		
-		
-		<h3>Add reference account to the following testbeds</h3>
-        <table class="mytable table table-bordered table-hover"> 
-            <tr class="odd"> 
-                <th>Platforms</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="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>
 {%endif%} 
 </div>
-</form>
-</div>
 
+</form>
 <script>
     $(document).ready(function() {
+	    {%if 'no_creds' in user_cred or 'creds_expired' in user_cred %}
+        localStorage.clear();
+        $.post("/cache/clear/", function( data ) {
+        });
+        {% endif %}
     	$('.nav-tabs a').click(function (e) {
 			e.preventDefault();
 			$(this).tab('show');
 			id = $(this).attr('href').substr(1);
-		
 		});
 		
         $('button#createslice').click(function() {