X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Ffed4fire%2Ffed4fire_account-view.html;h=985974fba1dcd7a8e0ada71f7c191a848b861b4d;hb=111d0fcb9681bf94ff184fe43bf636b6d672cbff;hp=5a610f30a7c06cdbf44567a35bd05ed49b7a2c35;hpb=87be70ddfd98c34b6d422368c244343a3b36e497;p=myslice.git

diff --git a/portal/templates/fed4fire/fed4fire_account-view.html b/portal/templates/fed4fire/fed4fire_account-view.html
index 5a610f30..985974fb 100644
--- a/portal/templates/fed4fire/fed4fire_account-view.html
+++ b/portal/templates/fed4fire/fed4fire_account-view.html
@@ -9,10 +9,10 @@
 		 	 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%}
 
@@ -24,6 +24,10 @@
     {% 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">
@@ -38,7 +42,6 @@
 		
 	  	<div class="col-md-12">
 
-			<form id="editForm" method="post" action="account_process" enctype="multipart/form-data">
 			  	{% csrf_token %}
 			  		<table class="profile">          
 			    		<tr>
@@ -129,7 +132,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">
@@ -141,16 +144,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" />
@@ -160,7 +163,7 @@
 			    		<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 sfi_config" 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>
@@ -169,7 +172,7 @@
 							{%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">
+								<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>
@@ -237,13 +240,13 @@
 				<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">
+						<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">
+						<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">
+                         <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>
@@ -263,7 +266,7 @@
 		     		<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">
+						<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>
@@ -283,7 +286,7 @@
 		    		<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">
+						<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>
@@ -292,7 +295,7 @@
 			</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>
+			<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%}
@@ -317,7 +320,7 @@
                 <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">
+    				<button class="btn btn-danger" name="delete_{{row.platform_name}}" type="submit" title="Delete account from this platform" onclick="javascript:document.getElementById('button_value').value='delete_{{row.platform_name}}';">
 						<span class="glyphicon glyphicon-minus"></span>
 					</button>
 				</td>
@@ -336,7 +339,7 @@
             <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">
+					<button class="btn btn-success btn-sm" name= "add_{{platform.platform_no_access}}" type="submit" title="Add account to this platform" onclick="javascript:document.getElementById('button_value').value='add_{{platform.platform_no_access}}';">
 						<span class="glyphicon glyphicon-plus"></span>
 					</button>
 				</td>
@@ -346,11 +349,16 @@
 	</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');