Skip to content

Commit dcb1f40

Browse files
committed
Merge branch 'merge/directive_snippets-add_selection' into 'master'
Merge/directive snippets add selection See merge request !148
2 parents 551989a + 8e4f4d3 commit dcb1f40

File tree

4 files changed

+16
-2
lines changed

4 files changed

+16
-2
lines changed

interface/web/admin/lib/lang/de_directive_snippets_list.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ $wb['active_txt'] = 'Aktiv';
44
$wb['name_txt'] = 'Name des Schnipsels';
55
$wb['type_txt'] = 'Typ';
66
$wb['add_new_record_txt'] = 'Direktiven Schnipsel hinzufügen';
7+
$wb['customer_viewable_txt'] = 'Sichtbar für Kunden';
78
?>

interface/web/admin/lib/lang/en_directive_snippets_list.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ $wb["active_txt"] = 'Active';
44
$wb["name_txt"] = 'Name of Snippet';
55
$wb["type_txt"] = 'Type';
66
$wb["add_new_record_txt"] = 'Add Directive Snippet';
7+
$wb['customer_viewable_txt'] = 'Customer viewable';
78
?>

interface/web/admin/list/directive_snippets.list.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,14 @@
7474
'suffix' => "",
7575
'width' => "",
7676
'value' => array('apache' => 'Apache', 'nginx' => 'nginx', 'php' => 'PHP', 'proxy' => 'Proxy'));
77+
78+
$liste["item"][] = array( 'field' => "customer_viewable",
79+
'datatype' => "VARCHAR",
80+
'formtype' => "SELECT",
81+
'op' => "=",
82+
'prefix' => "",
83+
'suffix' => "",
84+
'width' => "",
85+
'value' => array('y' => "<div id=\"ir-Yes\" class=\"swap\"><span>Yes</span></div>", 'n' => "<div class=\"swap\" id=\"ir-No\"><span>No</span></div>"));
7786

7887
?>

interface/web/admin/templates/directive_snippets_list.htm

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,14 @@ <h2><tmpl_var name="list_head_txt"></h2>
2121
<th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
2222
<th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
2323
<th class="tbl_col_type" scope="col"><tmpl_var name="type_txt"></th>
24+
<th class="tbl_col_customer_viewable" scope="col" style="width:120px"><tmpl_var name="customer_viewable_txt"></th>
2425
<th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
2526
</tr>
2627
<tr class="filter">
2728
<td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
2829
<td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
2930
<td class="tbl_col_type"><select name="search_type">{tmpl_var name='search_type'}</select></td>
31+
<td class="tbl_col_customer_viewable" style="text-align:center"><select name="search_customer_viewable">{tmpl_var name='search_customer_viewable'}</select></td>
3032
<td class="tbl_col_buttons">
3133
<button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/directive_snippets_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
3234
</td>
@@ -38,21 +40,22 @@ <h2><tmpl_var name="list_head_txt"></h2>
3840
<td class="tbl_col_active"><a href="#" onclick="loadContent('admin/directive_snippets_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
3941
<td class="tbl_col_name"><a href="#" onclick="loadContent('admin/directive_snippets_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
4042
<td class="tbl_col_type"><a href="#" onclick="loadContent('admin/directive_snippets_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="type"}</a></td>
43+
<td class="tbl_col_customer_viewable"><a href="#" onclick="loadContent('admin/directive_snippets_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="customer_viewable"}</a></td>
4144
<td class="tbl_col_buttons">
4245
<a class="button icons16 icoDelete" href="javascript: del_record('admin/directive_snippets_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
4346
</td>
4447
</tr>
4548
</tmpl_loop>
4649
<tmpl_unless name="records">
4750
<tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
48-
<td colspan="4">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
51+
<td colspan="5">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
4952
</tr>
5053
</tmpl_unless>
5154
</tbody>
5255

5356
<tfoot>
5457
<tr>
55-
<td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
58+
<td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
5659
</tr>
5760
</tfoot>
5861
</table>

0 commit comments

Comments
 (0)