X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Faccount-view.html;h=228ee558b4a47fe215252339b028d0a637b5694c;hb=2f89f2e81c44a63d6d90746a1f3c126603280b66;hp=361903224db027d62c1a8054b845e59067964ac6;hpb=deb1803f2fa1691e1c9ce21b9ecdfb0fd59777c9;p=myslice.git

diff --git a/portal/templates/account-view.html b/portal/templates/account-view.html
index 36190322..228ee558 100644
--- a/portal/templates/account-view.html
+++ b/portal/templates/account-view.html
@@ -1,5 +1,5 @@
-{% extends "layout-unfold1.html" %}
-{% block unfold_main %}
+{% extends "layout.html" %}
+{% block content %}
 
 
 {% if messages %}
@@ -10,29 +10,32 @@
 </ul>
 {% endif %}
 
-<div class="wrapper" id="institution">
+<div class="row">
+	<h1><img src="{{ STATIC_URL }}img/icon_user_small.png" alt="" /> User Account</h1>
+</div>
+
+<div class="row">
     <ul class="nav nav-tabs">
-      <li class="active"><a class="home-tab" data-panel="user_profile" href="#">User Profile</a></li>
-      <li><a class="home-tab" data-panel="principal_acc" href="#">User Account</a></li>
-      <li><a class="home-tab" data-panel="ref_acc" href="#">Testbed Access</a></li>
+      <li class="active"><a class="account-tab" data-panel="user_profile" href="#">User Profile</a></li>
+      <li><a class="account-tab" data-panel="principal_acc" href="#">User Account</a></li>
+      <li><a class="account-tab" data-panel="ref_acc" href="#">Testbed Access</a></li>
     </ul>
-<div class="home-panel" id="user_profile">
-<p></p>
-<form id="editForm"  method="POST" action="account_process" enctype="multipart/form-data">
-<div id="middle" align="center">
-	<div class="well">
+	
+	<div class="account-panel" id="user_profile">
+	<form id="editForm" method="post" action="account_process" enctype="multipart/form-data">
+	<div>
 	  	{% csrf_token %}
 	  		<table class="profile">          
-	    		<tr class="odd">
+	    		<tr>
 	      			<td colspan="2">
-						<div id="info">Platform: Myslice</div>
+						<div>Platform: Myslice</div>
 	      			</td>
 	    		</tr>
-	    		<tr class="even">
+	    		<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 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>
@@ -89,6 +92,7 @@
 						 </button>
 		  			</td>
 				</tr>
+				{%if 'Enabled'  in user_status %}
 				<tr class="even">
 		  			<td class="key">Generate Keys</td>
 		  			<td>
@@ -134,8 +138,7 @@
      					<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"	/>
+     					<input class="btn btn-danger btn-xs disabled" id="delete" name="delete" type="submit" title="Delete your private key" value="Delete" />
 					</td>
 				 {%endif%}		
 	  			</tr>
@@ -147,17 +150,16 @@
 						</p>
 	    			</td>
 	  			</tr>
+				{%endif%}
 			</table>
+		</div>
 	</div>
-</div>
-</div>
 
-<div class="home-panel" id="principal_acc" style="display:none;">
+	<div class="account-panel" id="principal_acc" style="display:none;">
 
-<h3>Principal Account <small>Account used for delegating credentials</small></h3>
-<div id="middle" align="center">
-	<div class="well">
-		<table class="table table-bordered table-hover  mytable"> 
+	<h3>Principal Account <small>Account used for delegating credentials</small></h3>
+	<div class="raw">
+		<table class="table"> 
 			<tr class="odd"> 
     			<th>Platform</th> 
         		<th>Account Type</th>
@@ -178,153 +180,141 @@
 			{%endfor%}               
 		</table>
 	</div>
-</div>
-
-
-
-{%if 'Enabled'  in user_status %}
-<h3>Credentials <small>Delegated to Principal Account</small></h3>
-<div id="middle" align="center">
-    <div class="well">
-        <table class="mytable table table-bordered table-hover">
-			<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>
 
 
-<div class="home-panel" id="ref_acc" style="display:none;">
-<h3>Testbed Access <small>Reference Accounts in the following testbeds</small></h3>
-<div id="middle" align="center">
-    <div class="well">
-        <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>
-    </div>
-</div>
 
+	{%if 'Enabled'  in user_status %}
+	<div class="row">
+		<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>
+	
 
 
-<h3>Add reference account to the following testbeds</h3>
-<div id="middle" align="center">
-    <div class="well">
-        <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>
-</div>
-</div>
+	<div class="account-panel" id="ref_acc" style="display:none;">
+		<h3>Testbed Access <small>Reference Accounts in the following testbeds</small></h3>
+		<div class="row">
+		        <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>
+		</div>
+		
+		
+		
+		<h3>Add reference account to the following testbeds</h3>
+		<div class="row">
+		        <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>
+	</div>
 {%endif%} 
-</div>
 </form>
 </div>
 
 <script>
     $(document).ready(function() {
-        $('a.home-tab').click(function() {
+        $('a.account-tab').click(function() {
             $('ul.nav-tabs li').removeClass('active');
             $(this).parent().addClass('active');
-            $('div.home-panel').hide();
+            $('div.account-panel').hide();
             $('div#'+$(this).data('panel')).show();
         });
         $('button#createslice').click(function() {
             window.location="/portal/slice_request/";
-        })
-        ;$('button#slicerequestbtn').click(function() {
-            /*
-            window.location="/portal/slice_request/";
-            */
         });
     });
 </script>