Skip to content

Commit 76c5153

Browse files
author
Till Brehm
committed
Merge branch '5827-visual-list' into 'develop'
Fix column amount (#5827) Closes #5827 See merge request ispconfig/ispconfig3!1269
2 parents 5fa7543 + 323d670 commit 76c5153

File tree

3 files changed

+19
-21
lines changed

3 files changed

+19
-21
lines changed

‎interface/web/client/templates/clients_list.htm‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ <h1><tmpl_var name="list_head_txt"></h1>
55

66

77
<p class="fieldset-legend">{tmpl_var name="toolsarea_head_txt"}</p>
8-
8+
99
<button class="btn btn-default formbutton-success" type="button" data-load-content="client/client_edit.php">{tmpl_var name="add_new_record_txt"}</button>
10-
11-
1210

13-
11+
12+
13+
1414
<p class="fieldset-legend"><tmpl_var name="list_head_txt"></p>
1515
<div class="table-wrapper marginTop15">
1616
<table class="table">
@@ -74,13 +74,13 @@ <h1><tmpl_var name="list_head_txt"></h1>
7474
</tmpl_loop>
7575
<tmpl_unless name="records">
7676
<tr class="tbl_row_noresults tbl_row_{tmpl_if name='__EVEN__'}even{tmpl_else}uneven{/tmpl_if}">
77-
<td colspan="{tmpl_if name="has_robot"}9{tmpl_else}8{/tmpl_if}">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
77+
<td colspan="{tmpl_if name="has_robot"}10{tmpl_else}9{/tmpl_if}">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
7878
</tr>
7979
</tmpl_unless>
8080
</tbody>
8181
<tfoot>
8282
<tr>
83-
<td colspan="{tmpl_if name="has_robot"}9{tmpl_else}8{/tmpl_if}"><tmpl_var name="paging"></td>
83+
<td colspan="{tmpl_if name="has_robot"}10{tmpl_else}9{/tmpl_if}"><tmpl_var name="paging"></td>
8484
</tr>
8585
</tfoot>
8686
</table>

‎interface/web/sites/templates/database_admin_list.htm‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ <h1><tmpl_var name="list_head_txt"></h1>
44

55

66
<p class="fieldset-legend">{tmpl_var name="toolsarea_head_txt"}</p>
7-
7+
88
<button class="btn btn-default formbutton-success" type="button" data-load-content="sites/database_edit.php">{tmpl_var name="add_new_record_txt"}</button>
9-
10-
119

12-
10+
11+
12+
1313
<p class="fieldset-legend"><tmpl_var name="list_head_txt"></p>
1414
<div class="table-wrapper marginTop15">
1515
<table class="table">
@@ -67,7 +67,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
6767
</tmpl_loop>
6868
<tmpl_unless name="records">
6969
<tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
70-
<td colspan="9">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
70+
<td colspan="8">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
7171
</tr>
7272
</tmpl_unless>
7373
</tbody>

‎interface/web/sites/templates/database_user_admin_list.htm‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ <h1><tmpl_var name="list_head_txt"></h1>
55

66

77
<p class="fieldset-legend">{tmpl_var name="toolsarea_head_txt"}</p>
8-
8+
99
<button class="btn btn-default formbutton-success" type="button" data-load-content="sites/database_user_edit.php">{tmpl_var name="add_new_record_txt"}</button>
10-
11-
1210

13-
11+
12+
13+
1414
<p class="fieldset-legend"><tmpl_var name="list_head_txt"></p>
1515
<div class="table-wrapper marginTop15">
1616
<table class="table">
@@ -22,15 +22,15 @@ <h1><tmpl_var name="list_head_txt"></h1>
2222
</tr>
2323
<tr>
2424
<td><input class="form-control" type="text" name="search_database_user" value="{tmpl_var name='search_database_user'}"/></td>
25-
<td><select class="form-control" name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
25+
<td><select class="form-control" name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
2626
<td class="text-right"><button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" data-submit-form="pageForm" data-form-action="sites/database_user_list.php"><span class="icon icon-filter"></span></button></td>
2727
</tr>
2828
</thead>
2929
<tbody>
3030
<tmpl_loop name="records">
3131
<tr>
3232
<td><a href="#" data-load-content="sites/database_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="database_user"}</a></td>
33-
<td><a href="#" data-load-content="sites/database_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="sys_groupid"}</a></td>
33+
<td><a href="#" data-load-content="sites/database_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="sys_groupid"}</a></td>
3434
<td class="text-right">
3535
<a class="btn btn-default formbutton-default formbutton-narrow" data-load-content="sites/database_user_edit.php?id={tmpl_var name='id'}"><span class="icon icon-edit"></span></a>
3636
<a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: ISPConfig.confirm_action('sites/database_user_del.php?id={tmpl_var name='id'}&_csrf_id={tmpl_var name='csrf_id'}&_csrf_key={tmpl_var name='csrf_key'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></a>
@@ -39,16 +39,14 @@ <h1><tmpl_var name="list_head_txt"></h1>
3939
</tmpl_loop>
4040
<tmpl_unless name="records">
4141
<tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
42-
<td colspan="2">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
42+
<td colspan="3">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
4343
</tr>
4444
</tmpl_unless>
4545
</tbody>
4646
<tfoot>
4747
<tr>
48-
<td colspan="2"><tmpl_var name="paging"></td>
48+
<td colspan="3"><tmpl_var name="paging"></td>
4949
</tr>
5050
</tfoot>
5151
</table>
5252
</div>
53-
54-

0 commit comments

Comments
 (0)