From f512ba95ae83ff747b2f1c92886437a5b9bc318f Mon Sep 17 00:00:00 2001
From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Thu, 19 Dec 2013 17:40:38 +0100
Subject: [PATCH] MyAcc: look & fill

---
 portal/templates/account-view.html | 60 ++++++++++++++++++++++--------
 1 file changed, 45 insertions(+), 15 deletions(-)

diff --git a/portal/templates/account-view.html b/portal/templates/account-view.html
index 0e9eb6a5..fda9e905 100644
--- a/portal/templates/account-view.html
+++ b/portal/templates/account-view.html
@@ -26,14 +26,17 @@
 	      			<td class="key">Email</td>
 	      			<td class="value">
 						<span id="emailval" class="value" >{{ person.email }}</span>
-						<img class="img-thumbnail" src="{{STATIC_URL}}/img/ques_icon.png" onclick="emailAlert()"  title="To change your email please contact the administrator" 
-							 style="height: 24px;  position: absolute; left: 625px; left: 900px; margin-top: -3px;">
+						<button class="btn btn-default btn-xs" type="button" id="edit_email" onclick="emailAlert()"  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">Edit</button>
+		  				<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>
@@ -66,15 +69,18 @@
 		    				<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">Edit</button>
+		  				<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>
-		  				<img class="img-thumbnail" src="{{STATIC_URL}}/img/ques_icon.png" onclick="affAlert()"  title="To change your affiliation please contact the administrator" 
-							 style="height: 24px; position: absolute; left: 625px; left: 900px; margin-top:-3px; ">
+						 <button class="btn btn-default btn-xs" type="button" id="edit_auth" onclick="affAlert()"  title="To change your authority please contact the administrator">
+     						<span class="glyphicon glyphicon-question-sign"></span> Edit
+						 </button>
 		  			</td>
 				</tr>
 				<tr class="even">
@@ -94,18 +100,26 @@
 		  					<div style='display:none;'>
 		  					<input type='hidden'  name='upload'  /></div>
 		  					<input type="file" name="pubkey" class="required" id="pubkey"/>  
-		  					<button class="btn btn-default btn-xs" name="upload_key" id="upload_key"  type="submit" title="Delete your private key">Upload </button>
+		  					<button class="btn btn-default btn-xs" name="upload_key" id="upload_key"  type="submit" title="Upload your public key">
+								<span class="glyphicon glyphicon-upload"></span> Upload
+							</button>
 						</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"> Download </button>
-						<button class="btn btn-default btn-xs" id="upload_file" type="button" title="Upload a public key"> Upload </button>       
+						<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"> Download </button>
+	      				<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>
 	      				<button class="btn btn-danger btn-xs" id="delete" name="delete" type="submit" title="Delete your private key">Delete </button>
 	    			</td>
 				 {%endif%}		
@@ -171,7 +185,11 @@
 			{% 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">Download</button></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>
@@ -187,7 +205,11 @@
      		<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">Download</button> </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>
@@ -203,7 +225,11 @@
    			<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">Download</button></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>
@@ -238,7 +264,9 @@
                 <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">Delete</button>
+    				<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%}               
@@ -269,7 +297,9 @@
             <tr class="border_bottom">
                 <td class="odd"> {{ platform.platform_no_access }} </td>
                 <td class="odd">
-					<button class="btn btn-success btn-xs" name= "add_{{platform.platform_no_access}}" type="submit" title="Add account to this platform">Add</button>
+					<button class="btn btn-success btn-xs" name= "add_{{platform.platform_no_access}}" type="submit" title="Add account to this platform">
+						<span class="glyphicon glyphicon-plus"></span>
+					</button>
 				</td>
             </tr> 
             {%endfor%}               
-- 
2.43.0