Merge branch 'merge/directive_snippets-add_selection' into 'master'

Falko Timme

2015-01-06 dcb1f40c0b4059ca191756b38eb153e5693b4c2c

Merge branch 'merge/directive_snippets-add_selection' into 'master'

Merge/directive snippets add selection

See merge request !148

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

@@ -4,4 +4,5 @@
$wb['name_txt'] = 'Name des Schnipsels';
$wb['type_txt'] = 'Typ';
$wb['add_new_record_txt'] = 'Direktiven Schnipsel hinzufügen';
$wb['customer_viewable_txt'] = 'Sichtbar für Kunden';
?>

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

@@ -4,4 +4,5 @@
$wb["name_txt"] = 'Name of Snippet';
$wb["type_txt"] = 'Type';
$wb["add_new_record_txt"] = 'Add Directive Snippet';
$wb['customer_viewable_txt'] = 'Customer viewable';
?>

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

@@ -74,5 +74,14 @@
    'suffix' => "",
    'width'  => "",
    'value'  => array('apache' => 'Apache', 'nginx' => 'nginx', 'php' => 'PHP', 'proxy' => 'Proxy'));
	
$liste["item"][] = array( 'field'  => "customer_viewable",
    'datatype' => "VARCHAR",
    'formtype' => "SELECT",
    'op'  => "=",
    'prefix' => "",
    'suffix' => "",
    'width'  => "",
    'value'  => array('y' => "<div id=\"ir-Yes\" class=\"swap\"><span>Yes</span></div>", 'n' => "<div class=\"swap\" id=\"ir-No\"><span>No</span></div>"));

?>

 interface/web/admin/templates/directive_snippets_list.htm

@@ -21,12 +21,14 @@
                        <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
                        <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
                        <th class="tbl_col_type" scope="col"><tmpl_var name="type_txt"></th>
                        <th class="tbl_col_customer_viewable" scope="col" style="width:120px"><tmpl_var name="customer_viewable_txt"></th>
                        <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
                    </tr>
                    <tr class="filter">
                        <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
                        <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
                        <td class="tbl_col_type"><select name="search_type">{tmpl_var name='search_type'}</select></td>
                        <td class="tbl_col_customer_viewable" style="text-align:center"><select name="search_customer_viewable">{tmpl_var name='search_customer_viewable'}</select></td>
                        <td class="tbl_col_buttons">
                            <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>
                        </td>
@@ -38,6 +40,7 @@
                            <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>
                            <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>
                            <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>
                            <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>
                            <td class="tbl_col_buttons">
                                <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>
                            </td>
@@ -45,14 +48,14 @@
                    </tmpl_loop>
                    <tmpl_unless name="records">
                        <tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
                            <td colspan="4">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
                            <td colspan="5">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
                        </tr>
                    </tmpl_unless>
                </tbody>

                <tfoot>
                    <tr>
                    <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
                    <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
                    </tr>
                </tfoot>
            </table>