X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fonelab%2Fonelab_account-view.html;h=585e39bd246c9064197bfa7853713de9327ba489;hb=6b2b529bd1b93c14b5d2fb9ee8c1aab9dc1300ed;hp=a0806070809cd7fc1bf015db2678272dca958917;hpb=3802d2308517f6ec27c8f0ea754409c0d4f4e2d7;p=myslice.git

diff --git a/portal/templates/onelab/onelab_account-view.html b/portal/templates/onelab/onelab_account-view.html
index a0806070..585e39bd 100644
--- a/portal/templates/onelab/onelab_account-view.html
+++ b/portal/templates/onelab/onelab_account-view.html
@@ -1,7 +1,13 @@
-{% extends "layout_wide.html" %}
+{% extends "layout.html" %}
 {% block content %}
 
-
+<div class="row">
+	<div class="col-md-12">
+		 <div class="breadcrumbs">
+		 	 Account &nbsp;>&nbsp; <a href="/account">{{ person.email }}</a>
+		 </div>
+	</div>
+</div>
 {% if messages %}
 <ul class="messages">
     {% for message in messages %}
@@ -9,18 +15,16 @@
     {% 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 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>
-<div class="container tab-content">
+<div class="tab-content">
 	<div class="tab-pane active row" id="profile">
 		
 	  	<div class="col-md-12">
@@ -30,14 +34,14 @@
 			  		<table class="profile">          
 			    		<tr>
 			      			<td colspan="2">
-								<div>Platforms: Myslice</div>
+								<div><h3>Platform: Myslice</h3></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">
+								<button class="btn btn-default" 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>
@@ -98,7 +102,7 @@
 						<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" 
+								<input type="submit" name="generate" class="btn btn-primary" 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> 
@@ -108,7 +112,7 @@
 			      			<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>
+				  					<button type="button" class="btn btn-default" 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"/>  
@@ -127,8 +131,8 @@
 			    		<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">
+			      			<td class="value">********<a href="#"></a>
+			      				<button type="submit" name="dl_pkey" class="btn btn-default" 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"
@@ -136,15 +140,15 @@
 			    			</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">
+		 					<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">
 		        					<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">
+			  			<tr class="even">
 			    			<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>
@@ -200,8 +204,14 @@
 		    			<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
+								<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%}
@@ -272,7 +282,7 @@
                 <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">
+    				<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>