Mercurial > kallithea

changeset 6402:0bc464a5528a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
templates: make various tables more well-formed with consistent columns
author Mads Kiilerich <mads@kiilerich.com>
date Fri, 06 Jan 2017 01:43:50 +0100
parents 785a9770e8e0
children 6e43c6fd9ebc
files kallithea/templates/admin/repo_groups/repo_group_edit_perms.html kallithea/templates/admin/repos/repo_edit_permissions.html kallithea/templates/admin/settings/settings_system.html kallithea/templates/admin/user_groups/user_group_edit_perms.html kallithea/templates/base/perms_summary.html
diffstat 5 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html	Fri Jan 06 01:43:50 2017 +0100
+++ b/kallithea/templates/admin/repo_groups/repo_group_edit_perms.html	Fri Jan 06 01:43:50 2017 +0100
@@ -90,7 +90,7 @@
                     <td></td>'""")
                 %>
                 ## ADD HERE DYNAMICALLY NEW INPUTS FROM THE '_tmpl'
-                <tr class="new_members last_new_member" id="add_perm_input"></tr>
+                <tr class="new_members last_new_member" id="add_perm_input"><td colspan="6"></td></tr>
                 <tr>
                     <td colspan="6">
                         <span id="add_perm" style="cursor: pointer;">
--- a/kallithea/templates/admin/repos/repo_edit_permissions.html	Fri Jan 06 01:43:50 2017 +0100
+++ b/kallithea/templates/admin/repos/repo_edit_permissions.html	Fri Jan 06 01:43:50 2017 +0100
@@ -87,7 +87,7 @@
                     <td></td>'""")
                 %>
                 ## ADD HERE DYNAMICALLY NEW INPUTS FROM THE '_tmpl'
-                <tr class="new_members last_new_member" id="add_perm_input"></tr>
+                <tr class="new_members last_new_member" id="add_perm_input"><td colspan="6"></td></tr>
                 <tr>
                     <td colspan="6">
                         <span id="add_perm" style="cursor: pointer;">
--- a/kallithea/templates/admin/settings/settings_system.html	Fri Jan 06 01:43:50 2017 +0100
+++ b/kallithea/templates/admin/settings/settings_system.html	Fri Jan 06 01:43:50 2017 +0100
@@ -24,6 +24,7 @@
 <table class="table" style="margin:0px 0px 0px 0px">
   <colgroup>
       <col style="width:180px">
+      <col>
   </colgroup>
   <tbody>
       %for key, value in c.modules:
--- a/kallithea/templates/admin/user_groups/user_group_edit_perms.html	Fri Jan 06 01:43:50 2017 +0100
+++ b/kallithea/templates/admin/user_groups/user_group_edit_perms.html	Fri Jan 06 01:43:50 2017 +0100
@@ -90,7 +90,7 @@
                     <td></td>'""")
                 %>
                 ## ADD HERE DYNAMICALLY NEW INPUTS FROM THE '_tmpl'
-                <tr class="new_members last_new_member" id="add_perm_input"></tr>
+                <tr class="new_members last_new_member" id="add_perm_input"><td colspan="6"></td></tr>
                 <tr>
                     <td colspan="6">
                         <span id="add_perm" class="btn">
--- a/kallithea/templates/base/perms_summary.html	Fri Jan 06 01:43:50 2017 +0100
+++ b/kallithea/templates/base/perms_summary.html	Fri Jan 06 01:43:50 2017 +0100
@@ -27,7 +27,7 @@
           %if section == 'global':
               <thead>
                 <tr>
-                  <th colspan="2" class="left">${_('Permission')}</th>
+                  <th class="left">${_('Permission')}</th>
                   %if actions:
                   <th class="left">${_('Edit Permission')}</th>
                   %endif
@@ -36,7 +36,7 @@
               <tbody>
               %for k in permissions[section]:
                   <tr>
-                      <td colspan="2">
+                      <td>
                           ${h.get_permission_name(k)}
                       </td>
                       %if actions:
@@ -89,7 +89,7 @@
                   </tr>
                   %endif
               %endfor
-              <tr id="empty_${section}" style="display: none"><td colspan="6">${_('No permission defined')}</td></tr>
+              <tr id="empty_${section}" style="display: none"><td colspan="${3 if actions else 2}">${_('No permission defined')}</td></tr>
               </tbody>
           %endif
          </table>