FIX: conflict in settings.py

[myslice.git] / portal / templates / my_account.html

diff --git a/portal/templates/my_account.html b/portal/templates/my_account.html
index 73b8d70..75cb11f 100644 (file)
--- a/portal/templates/my_account.html
+++ b/portal/templates/my_account.html
@@ -13,21 +13,21 @@
 
 
 <h2>Platform Access</h2>
-<table border="2" bordercolor="#C1DAD7" style="table-layout:fixed;background-color:FFFFFF;width:830px" cellpadding="12" cellspacing="12" align="center"> 
-  <tr> 
-    <th align="center" style="width:15%">Platform</th> 
-    <th align="center" style="width:15%">Account Type</th> 
-    <th align="center" style="width:15%">user_hrn</th>
-    <th align="center">Pub Key</th>
-  </tr>   
-  {% for row in data %}         
-  <tr>
-    <td align="center"> {{ row.platform_name }} </td>
-    <td align="center"> {{ row.account_type }} </td>
-    <td align="center" style="word-wrap: break-word"> {{ row.usr_hrn }}  </td>
-    <td align="center" style="word-wrap: break-word"> {{ row.usr_pubkey }} </td>
-  </tr> 
-  {%endfor%}               
+<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="even">
+       <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>
 
 
@@ -40,7 +40,7 @@
   <div class='ms-dashboard-content' id='tophat__list__user_hrn'>
     <div id="main">
       <div id="middle" align="center">
-       <form id="editForm"  method="POST" action="acc_process" enctype="multipart/form-data">
+       <form id="editForm"  method="POST" action="account_process" enctype="multipart/form-data">
          {% csrf_token %}
          <table class="profile">          
            <tr class="odd">
@@ -99,9 +99,9 @@
 
              </tr>
              <tr class="odd">
-               <td class="key">Affiliation</td>
+               <td class="key">Authority</td>
                <td class="value">
-                 <span id="affval" class="value">{{ affiliation }}</span>
+                 <span id="affval" class="value">{{ authority }}</span>
                  <img class="logo" src="{{STATIC_URL}}/img/ques_icon.png" onclick="affAlert()"  title="To change your affiliation please contact the administrator" style="height: 20px; width: 20px; position: absolute; left: 625px; left: 900px; ">
                  </td>
                </tr>