Skip to content

Commit aa7f775

Browse files
author
Till Brehm
committed
Merge branch '6836-highlight-inactive' into 'develop'
Inactive row highlighting for more then sites Closes #6836 See merge request ispconfig/ispconfig3!1995
2 parents bf5ffb4 + 73294a2 commit aa7f775

21 files changed

+21
-21
lines changed

‎interface/lib/classes/listform_actions.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ public function prepareDataRow($rec)
189189
//* substitute value for select fields
190190
if(is_array($app->listform->listDef['item']) && count($app->listform->listDef['item']) > 0) {
191191
foreach($app->listform->listDef['item'] as $field) {
192-
if(isset($rec['active']) && $rec['active'] == 'n') $rec['warn_inactive'] = 'y';
192+
if(isset($rec['active']) && strtolower($rec['active']) == 'n') $rec['warn_inactive'] = 'y';
193193
$key = $field['field'];
194194
if(isset($field['formtype']) && $field['formtype'] == 'SELECT') {
195195
if(strtolower($rec[$key]) == 'y' or strtolower($rec[$key]) == 'n') {

‎interface/web/dns/templates/dns_a_list.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
</thead>
8080
<tbody>
8181
<tmpl_loop name="records">
82-
<tr>
82+
<tr <tmpl_if name="warn_inactive"> class="danger" </tmpl_if> >
8383
<td><a href="#" data-load-content="dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
8484
<td><a href="#" data-load-content="dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}">{tmpl_var name="type"}</a></td>
8585
<td><a href="#" data-load-content="dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='name'}">{tmpl_var name="name"}</a></td>

‎interface/web/dns/templates/dns_slave_admin_list.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
5252
</thead>
5353
<tbody>
5454
<tmpl_loop name="records">
55-
<tr>
55+
<tr <tmpl_if name="warn_inactive"> class="danger" </tmpl_if> >
5656
<td><a href="#" data-load-content="dns/dns_slave_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
5757
<td><a href="#" data-load-content="dns/dns_slave_edit.php?id={tmpl_var name='id'}">{tmpl_var name="sys_groupid"}</a></td>
5858
<td><a href="#" data-load-content="dns/dns_slave_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>

‎interface/web/dns/templates/dns_slave_list.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
5050
</thead>
5151
<tbody>
5252
<tmpl_loop name="records">
53-
<tr>
53+
<tr <tmpl_if name="warn_inactive"> class="danger" </tmpl_if> >
5454
<td><a href="#" data-load-content="dns/dns_slave_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
5555
<td><a href="#" data-load-content="dns/dns_slave_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
5656
<td><a href="#" data-load-content="dns/dns_slave_edit.php?id={tmpl_var name='id'}">{tmpl_var name="origin"}</a></td>

‎interface/web/dns/templates/dns_soa_admin_list.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
5656
</thead>
5757
<tbody>
5858
<tmpl_loop name="records">
59-
<tr>
59+
<tr <tmpl_if name="warn_inactive"> class="danger" </tmpl_if> >
6060
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}&next_tab=dns_records">{tmpl_var name="active"}<tmpl_if name="dnssec_wanted" op="==" value="Y"><tmpl_if name="dnssec_initialized" op="==" value="Y"><i class="fa fa-key" aria-hidden="true"></i></tmpl_if></tmpl_if></td>
6161
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}&next_tab=dns_records">{tmpl_var name="sys_groupid"}</a></td>
6262
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}&next_tab=dns_records" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='server_id'}">{tmpl_var name="server_id"}</a></td>

‎interface/web/dns/templates/dns_soa_list.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
5454
</thead>
5555
<tbody>
5656
<tmpl_loop name="records">
57-
<tr>
57+
<tr <tmpl_if name="warn_inactive"> class="danger" </tmpl_if> >
5858
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}&next_tab=dns_records">{tmpl_var name="active"}<tmpl_if name="dnssec_wanted" op="==" value="Y"><tmpl_if name="dnssec_initialized" op="==" value="Y"><i class="fa fa-key" aria-hidden="true"></i></tmpl_if></tmpl_if></td>
5959
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}&next_tab=dns_records" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='server_id'}">{tmpl_var name="server_id"}</a></td>
6060
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}&next_tab=dns_records" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='origin'}">{tmpl_var name="origin"}</a></td>

‎interface/web/mail/templates/mail_alias_list.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
4848
</thead>
4949
<tbody>
5050
<tmpl_loop name="records">
51-
<tr>
51+
<tr <tmpl_if name="warn_inactive"> class="danger" </tmpl_if> >
5252
<td><a href="#" data-load-content="mail/mail_alias_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
5353
<td><a href="#" data-load-content="mail/mail_alias_edit.php?id={tmpl_var name='id'}">{tmpl_var name="source"}</a></td>
5454
<td><a href="#" data-load-content="mail/mail_alias_edit.php?id={tmpl_var name='id'}">{tmpl_var name="destination"}</a></td>

‎interface/web/mail/templates/mail_aliasdomain_list.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
4848
</thead>
4949
<tbody>
5050
<tmpl_loop name="records">
51-
<tr>
51+
<tr <tmpl_if name="warn_inactive"> class="danger" </tmpl_if> >
5252
<td><a href="#" data-load-content="mail/mail_aliasdomain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
5353
<td><a href="#" data-load-content="mail/mail_aliasdomain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="source"}</a></td>
5454
<td><a href="#" data-load-content="mail/mail_aliasdomain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="destination"}</a></td>

‎interface/web/mail/templates/mail_blacklist_list.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
5050
</thead>
5151
<tbody>
5252
<tmpl_loop name="records">
53-
<tr>
53+
<tr <tmpl_if name="warn_inactive"> class="danger" </tmpl_if> >
5454
<td><a href="#" data-load-content="mail/mail_blacklist_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
5555
<td><a href="#" data-load-content="mail/mail_blacklist_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
5656
<td><a href="#" data-load-content="mail/mail_blacklist_edit.php?id={tmpl_var name='id'}">{tmpl_var name="source"}</a></td>

‎interface/web/mail/templates/mail_content_filter_list.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
5050
</thead>
5151
<tbody>
5252
<tmpl_loop name="records">
53-
<tr>
53+
<tr <tmpl_if name="warn_inactive"> class="danger" </tmpl_if> >
5454
<td><a href="#" data-load-content="mail/mail_content_filter_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
5555
<td><a href="#" data-load-content="mail/mail_content_filter_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
5656
<td><a href="#" data-load-content="mail/mail_content_filter_edit.php?id={tmpl_var name='id'}">{tmpl_var name="pattern"}</a></td>

0 commit comments

Comments
 (0)