X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Faccount-view.html;h=7459a3ce96e910a6db16fcd7ae1c954cfc5d017e;hb=d88dd4a28b502d57131145b1a8b7d0c3b949d805;hp=346c41f8cf002754b2a10e493e0d3cd7f6502e7a;hpb=58e9556fdd0693e331a25d13517a7244349ebc27;p=myslice.git

diff --git a/portal/templates/account-view.html b/portal/templates/account-view.html
index 346c41f8..7459a3ce 100644
--- a/portal/templates/account-view.html
+++ b/portal/templates/account-view.html
@@ -2,47 +2,33 @@
 
 {% block head %}
 <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/onelab.css"/>
-<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/account_view_html.css" />
-<script type="text/javascript" src="{{STATIC_URL}}/jquery.validate.js"></script> 
-<script type="text/javascript" src="{{STATIC_URL}}/my_account.edit_profile.js"></script>
-<script type="text/javascript" src="{{STATIC_URL}}/my_account.register.js"></script>
+<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/account_view.css" />
+<script type="text/javascript" src="{{STATIC_URL}}/js/jquery.validate.js"></script> 
+<script type="text/javascript" src="{{STATIC_URL}}/js/my_account.edit_profile.js"></script>
+<script type="text/javascript" src="{{STATIC_URL}}/js/my_account.register.js"></script>
 {% endblock %}
 
-{% block unfold1_main %}
+{% block unfold_main %}
 
+<h2>User Details</h2>
 
-<h2>Platform Access</h2>
-<div id="middle" align="center">
-	<div class="well">
-		<table class="mytable"> 
-			<tr class="odd"> 
-    			<th>Platform</th> 
-        		<th>Account Type</th> 
-        		<th>user_hrn</th>
-        		<th>Pub Key</th>
-    		</tr>   
-			{% for row in data %}         
-   			<tr class="border_bottom">
-    			<td class="odd"> {{ row.platform_name }} </td>
-        		<td class="even"> {{ row.account_type }} </td>
-       			<td class="odd"> {{ row.usr_hrn }}  </td>
-        		<td class="even"> {{ row.usr_pubkey }} </td>
-    		</tr> 
-			{%endfor%}               
-		</table>
-	</div>
-</div>
+{% if messages %}
+<ul class="messages">
+    {% for message in messages %}
+    <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
+    {% endfor %}
+</ul>
+{% endif %}
 
 
-<h2>MySlice  Account</h2>
+<form id="editForm"  method="POST" action="account_process" enctype="multipart/form-data">
 <div id="middle" align="center">
 	<div class="well">
-		<form id="editForm"  method="POST" action="account_process" enctype="multipart/form-data">
 	  	{% csrf_token %}
 	  		<table class="profile">          
 	    		<tr class="odd">
 	      			<td colspan="2">
-						<div id="info">Personal Details</div>
+						<div id="info">Platform: Myslice</div>
 	      			</td>
 	    		</tr>
 	    		<tr class="even">
@@ -124,23 +110,95 @@
 						<button id="upload_file" type="button" title="Upload a public key"> Upload </button>       
 	      			</td>
 	    		</tr>
-	    		<tr class="even" id="pkey_row" display="none">
-	      			<td class="key">Private Key </td>
+	    		<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="download" title="Download your privaye key" id="dl_pkey"> Download </button>
 	      				<button id="delete" name="delete" type="submit" title="Delete your private key">Delete </button>
 	    			</td>
+				 {%endif%}		
 	  			</tr>
 	  			<tr class="odd">
 	    			<td colspan="2">
-	      				<p class="warning" id="pkey_del_msg"> For better security we recommend that you download and delete your private key from the server. 
-														  	  Always store your private key in a secure location. 
+	      				<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>
 			</table>
-		</form>
 	</div>
 </div>
 
+<h2>Account Information</h2>
+<h3>Principal Accounts</h3>
+<div id="middle" align="center">
+	<div class="well">
+		<table class="mytable"> 
+			<tr class="odd"> 
+    			<th>Platform</th> 
+        		<th>Account Type</th>
+				<th>Account_delegation</th>	 
+        		<th>user_hrn</th>
+        		<th>Pub Key</th>
+    		</tr>   
+			{% for row in data %}         
+   			<tr class="border_bottom">
+    			<td class="odd"> {{ row.platform_name }} </td>
+        		<td class="even"> {{ row.account_type }} </td>
+				<td class="odd"> {{ row.delegation_type }} </td>
+       			<td class="even"> {{ row.usr_hrn }}  </td>
+        		<td class="odd"> {{ row.usr_pubkey }} </td>
+    		</tr> 
+			{%endfor%}               
+		</table>
+	</div>
+</div>
+
+<h3>Secondary Accounts</h3>
+<div id="middle" align="center">
+    <div class="well">
+        <table class="mytable"> 
+            <tr class="odd"> 
+                <th>Platform</th> 
+                <th>Account Type</th>
+				<th>Reference to</th>
+            </tr>   
+            {% for row in ref_acc %}         
+            <tr class="border_bottom">
+                <td class="odd"> {{ row.platform_name }} </td>
+                <td class="even"> {{ row.account_type }} </td>
+				<td class="even"> {{ row.account_reference }} </td>
+            </tr> 
+            {%endfor%}               
+        </table>
+    </div>
+</div>
+
+<h2>Other Platforms</h2>
+<div id="middle" align="center">
+    <div class="well">
+        <table class="mytable"> 
+            <tr class="odd"> 
+                <th>Platforms</th> 
+                <th>Request Access</th>
+            </tr>   
+            {% for platform in platform_list %}         
+            <tr class="border_bottom">
+                <td class="odd"> {{ platform.platform_no_access }} </td>
+                <td class="even">
+					<button id="request_access" name= {{platform.platform_no_access}} type="submit" title="Request Access to this platform">Request {{platform.platform_no_access}}</button>
+				</td>
+            </tr> 
+            {%endfor%}               
+        </table>
+    </div>
+</div>
+
+
+</form>
+
+
+
 {% endblock %}