From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Fri, 6 Jun 2014 10:16:51 +0000 (+0200)
Subject: account: template specific for fed4fire
X-Git-Tag: myslice-1.1~74
X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=dc78b106e59789f7aac853eb0db3159da876e87d

account: template specific for fed4fire
---

diff --git a/portal/accountview.py b/portal/accountview.py
index 20c2b05c..5c8d15fd 100644
--- a/portal/accountview.py
+++ b/portal/accountview.py
@@ -24,7 +24,7 @@ class AccountView(LoginRequiredAutoLogoutView, ThemeView):
 
 
     def get_context_data(self, **kwargs):
-
+        self.template_name = self.template
         page = Page(self.request)
         page.add_js_files  ( [ "js/jquery.validate.js", "js/my_account.register.js", "js/my_account.edit_profile.js" ] )
         page.add_css_files ( [ "css/onelab.css", "css/account_view.css","css/plugin.css" ] )
@@ -179,7 +179,6 @@ class AccountView(LoginRequiredAutoLogoutView, ThemeView):
         # we could use zip. this one is used if columns have unequal rows 
         platform_list = [{'platform_no_access': t[0]}
             for t in itertools.izip_longest(total_platform_list)]
-
         context = super(AccountView, self).get_context_data(**kwargs)
         context['principal_acc'] = principal_acc_list
         context['ref_acc'] = ref_acc_list
diff --git a/portal/templates/account-view.html b/portal/templates/account-view.html
index 69c43ca4..7d161ea3 100644
--- a/portal/templates/account-view.html
+++ b/portal/templates/account-view.html
@@ -30,7 +30,7 @@
 			  		<table class="profile">          
 			    		<tr>
 			      			<td colspan="2">
-								<div>Platforms: Myslice</div>
+								<div><h3>Platform: Myslice</h3></div>
 			      			</td>
 			    		</tr>
 			    		<tr>
@@ -144,23 +144,6 @@
 							</td>
 						 {%endif%}		
 			  			</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">
-    								<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">
 			      				<p class="message" id="pkey_del_msg"><b> Tradeoff:</b> Ease-of-use vs Security.<br>
diff --git a/portal/templates/onelab/onelab_account-view.html b/portal/templates/onelab/onelab_account-view.html
deleted file mode 100644
index a0806070..00000000
--- a/portal/templates/onelab/onelab_account-view.html
+++ /dev/null
@@ -1,322 +0,0 @@
-{% extends "layout_wide.html" %}
-{% block content %}
-
-
-{% if messages %}
-<ul class="messages">
-    {% for message in messages %}
-    <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
-    {% endfor %}
-</ul>
-{% endif %}
-<div class="container">
-	<div class="row">
-		<div class="col-md-12">
-			<ul class="nav nav-tabs nav-section">
-				<li class="active"><a href="#profile"><img src="{{ STATIC_URL }}icons/user-xs.png" alt="User Account" /> User Profile</a></li>
-				<li><a href="#account">Account</a></li>
-				<li><a href="#access">Testbed Access</a></li>
-			</ul>
-	    </div>
-	</div>
-</div>
-<div class="container tab-content">
-	<div class="tab-pane active row" id="profile">
-		
-	  	<div class="col-md-12">
-
-			<form id="editForm" method="post" action="account_process" enctype="multipart/form-data">
-			  	{% csrf_token %}
-			  		<table class="profile">          
-			    		<tr>
-			      			<td colspan="2">
-								<div>Platforms: Myslice</div>
-			      			</td>
-			    		</tr>
-			    		<tr>
-			      			<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="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>
-				  				<span class="hide_this" id="span_name">
-				    				<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" class="btn btn-default btn-xs" name="submit_name" value="Save"/>
-				  				</span>
-				  				<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>
-								 <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>
-						{%if 'Enabled'  in user_status %}
-						<tr class="even">
-				  			<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" 
-									   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">
-			      			<td class="key">Public Key</td>
-			      			<td class="value">
-								<span id="keyval" class="value">******** </span>
-								<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"/>  
-				  						<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">
-									<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="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">
-			    			<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>
-						{%endif%}
-					</table>
-			
-		</div>
-	</div>
-
-	<div class="tab-pane row" id="account">
-	  	<div class="col-md-12">
-	
-		<h3>Principal Account <small>Account used for delegating credentials</small></h3>
-		<table class="table"> 
-			<tr class="odd"> 
-    			<th>Platform</th> 
-        		<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 %}         
-   			<tr class="border_bottom">
-    			<td class="odd"> {{ row.platform_name }} </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%}               
-		</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> Download
-							</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%}
-		</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 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>		
-		
-		
-		<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>
-
-<script>
-    $(document).ready(function() {
-    	$('.nav-tabs a').click(function (e) {
-			e.preventDefault();
-			$(this).tab('show');
-			id = $(this).attr('href').substr(1);
-		
-		});
-		
-        $('button#createslice').click(function() {
-            window.location="/portal/slice_request/";
-        });
-    });
-</script>
-
-{% endblock %}