Adopted Bootstrap.css :)

diff --git a/portal/accountview.py b/portal/accountview.py
index 0d4059f..66eb91e 100644 (file)
--- a/portal/accountview.py
+++ b/portal/accountview.py
@@ -66,7 +66,7 @@ class AccountView(LoginRequiredAutoLogoutView):
         pub_key_list = []
           
         for platform_detail in platform_details:
-            if 'sfa' in platform_detail['gateway_type']:
+            if 'sfa' in platform_detail['gateway_type'] and platform_detail['disabled']==0:
                 total_platform = platform_detail['platform']
                 total_platform_list.append(total_platform)
                 
@@ -152,10 +152,7 @@ class AccountView(LoginRequiredAutoLogoutView):
                         platform_access_list.append(platform_access)
        
         # Removing the platform which already has access
-        print platform_access_list
-        print total_platform_list
         for platform in platform_access_list:
-            print platform
             total_platform_list.remove(platform)
         # we could use zip. this one is used if columns have unequal rows 
         platform_list = [{'platform_no_access': t[0]}

diff --git a/portal/templates/account-view.html b/portal/templates/account-view.html
index ebad910..3cfc5aa 100644 (file)
--- a/portal/templates/account-view.html
+++ b/portal/templates/account-view.html
@@ -42,10 +42,10 @@
                        <tr class="odd">
                                        <td class="key">Password</td>
                                        <td class="value"> 
-                                               <button class="edit" 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">Edit</button>
                                                <span id="passval"class="value">******** </span>
                                                <span class="hide_this" id="span_pass">
-                                               <button type="button" class="cancel" title="Cancel" id="cancel_pass_change"> Cancel </button>
+                                               <button type="button" class="btn btn-default btn-xs" title="Cancel" id="cancel_pass_change"> Cancel </button>
                                                <div style='display:none;' id="pass_form">
                                                <input type='hidden'  value='' /></div>
                                                <table id="edit_password">
@@ -57,7 +57,7 @@
                                                                        <td>Confirm password: </td>
                                                                        <td class="field"> 
                                                                                <input type="password" name="confirmpassword" id="confirmpassword" /> 
-                                                                               <input type="submit" name="submit_pass" value="Save"/> 
+                                                                               <input type="submit" class="btn btn-default btn-xs" name="submit_pass" value="Save"/> 
                                                                        </td>
                                                        </tr>
                                                </table>
@@ -69,13 +69,13 @@
                                        <td class="value">
                                                <span id="nameval" class="value" >{{ fullname }} </span>
                                                <span class="hide_this" id="span_name">
-                                               <button type="button" class="cancel" title="Cancel" id="cancel_name_change"> Cancel </button> 
+                                               <button type="button" class="btn btn-default btn-xs" title="Cancel" id="cancel_name_change"> Cancel </button> 
                                                <div style='display:none;'><input type='hidden'  name='nameform'  /></div>
                                                <input id="fname" type="text" name="fname" class="required"  maxlength="200" value="{{firstname}}" />
                                                <input id="lname" type="text" name="lname" class="required"  maxlength="200" value="{{lastname}}" />
-                                               <input type="submit" name="submit_name" value="Save"/>
+                                               <input type="submit" class="btn btn-default btn-xs" name="submit_name" value="Save"/>
                                                </span>
-                                               <button class="edit" 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">Edit</button>
                                        </td>
                        </tr>
                        <tr class="odd">
@@ -89,7 +89,7 @@
                                <tr class="even">
                                        <td class="key">Generate Keys</td>
                                        <td> 
-                                               <button id="generate_keypair" name="generate" type="submit" onclick="myFunction()" 
+                                               <button id="generate_keypair" class="btn btn-danger btn-xs" name="generate" type="submit" onclick="myFunction()" 
                                                                title="Generate a new key pair. After it is generated, you will need to download your public and private keys again.">Generate a new Key Pair 
                                                </button>
                                </td> 
@@ -99,23 +99,23 @@
                                <td class="value">
                                                <span id="keyval" class="value">******** </span>
                                                <span class="hide_this" id="span_upload">
-                                                       <button type="button" class="cancel" title="Cancel" id="cancel_upload"> Cancel </button>
+                                                       <button type="button" class="btn btn-default btn-xs" 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"/>  
-                                                       <button 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="Delete your private key">Upload </button>
                                                </span>
                                                <div style='display:none;'> <input type='hidden'  name='dload'  /> </div> 
-                                               <button type="submit" name="dl_pubkey" class="download" title="Download your public key" id="dl_file"> Download </button>
-                                               <button 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"> Download </button>
+                                               <button class="btn btn-default btn-xs" id="upload_file" type="button" title="Upload a public key"> 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="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>
+                                       <button type="submit" name="dl_pkey" class="btn btn-default btn-xs" title="Download your privaye key" id="dl_pkey"> Download </button>
+                                       <button class="btn btn-danger btn-xs" id="delete" name="delete" type="submit" title="Delete your private key">Delete </button>
                                </td>
                                 {%endif%}              
                                </tr>
@@ -169,7 +169,7 @@
                        {% for row in my_users %}         
                        <tr class="border_bottom">
                        <td class="even"> {{ row.cred_exp }} </td>
-                               <td class="odd"><button id="dl_user_cred" 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">Download</button></td>
                        </tr>
                        {%endfor%}
                 </table>
@@ -185,7 +185,7 @@
                <tr class="border_bottom">
                        <td class="even"> {{ row.slice_name }} </td>
                                <td class="odd"> {{ row.cred_exp }} </td>
-                               <td class="even"> <button id="dl_slice_cred" name= "dl_slice_cred" type="submit" title="Download Slice Credentials">Download</button> </td>
+                               <td class="even"> <button class="btn btn-default btn-xs" name= "dl_slice_cred" type="submit" title="Download Slice Credentials">Download</button> </td>
                </tr>
                {%endfor%}
                </table>
@@ -201,12 +201,12 @@
                        <tr class="border_bottom">
                                <td class="even"> {{ row.auth_name }} </td>
                                <td class="odd"> {{ row.cred_exp }} </td>
-                               <td class="even"><button id="dl_auth_cred" name= "dl_auth_cred" type="submit" title="Download Authority Credentials">Download</button></td>
+                               <td class="even"><button class="btn btn-default btn-xs" name= "dl_auth_cred" type="submit" title="Download Authority Credentials">Download</button></td>
                        </tr>
                        {%endfor%}
                </table>
                <p></p> 
-               <p><button id="clear_cred" name= "clear_cred" type="submit" title="Clear All Credentials">Clear Credentials</button></p>
+               <p><button class="btn btn-danger" name= "clear_cred" type="submit" title="Clear All Credentials">Clear Credentials</button></p>
     </div>
 </div>
 
@@ -229,7 +229,7 @@
                 <td class="even"> {{ row.account_type }} </td>
                                <td class="odd"> {{ row.account_reference }} </td>
                                <td class="even">
-                               <button id="delete_account" name="delete_{{platform.platform_no_access}}" type="submit" title="Delete account from this platform">Delete {{row.platform_name}}</button>
+                               <button class="btn btn-default btn-xs" name="delete_{{platform.platform_no_access}}" type="submit" title="Delete account from this platform">Delete {{row.platform_name}}</button>
                                </td>
             </tr> 
             {%endfor%}               
@@ -249,7 +249,7 @@
             <tr class="border_bottom">
                 <td class="odd"> {{ platform.platform_no_access }} </td>
                 <td class="even">
-                                       <button id="add_account" name= "add_{{platform.platform_no_access}}" type="submit" title="Add account to this platform">Add {{platform.platform_no_access}}</button>
+                                       <button class="btn btn-default btn-xs" name= "add_{{platform.platform_no_access}}" type="submit" title="Add account to this platform">Add {{platform.platform_no_access}}</button>
                                </td>
             </tr> 
             {%endfor%}