Merge branch 'master' of git.ispconfig.org:renky/ispconfig3

Dominik

2015-01-21 83aa23b76fbdca327c52bd14fc1a1bc62aa5b3ee

 interface/web/sites/templates/database_list.htm

@@ -32,13 +32,13 @@
<table class="table">
                <thead class="dark form-group-sm">
                    <tr>
                        <th class="tiny-col"><tmpl_var name="active_txt"></th>
                        <th class="tiny-col"><tmpl_var name="remote_access_txt"></th>
                        <th><tmpl_var name="type_txt"></th>
                        <th><tmpl_var name="server_id_txt"></th>
                  <th><tmpl_var name="parent_domain_id_txt"></th>
                        <th><tmpl_var name="database_user_txt"></th>
                        <th><tmpl_var name="database_name_txt"></th>
                        <th class="tiny-col" data-column="active"><tmpl_var name="active_txt"></th>
                        <th class="tiny-col" data-column="remote_access"><tmpl_var name="remote_access_txt"></th>
                        <th data-column="type"><tmpl_var name="type_txt"></th>
                        <th data-column="server_id"><tmpl_var name="server_id_txt"></th>
                  <th data-column="parent_domain_id"><tmpl_var name="parent_domain_id_txt"></th>
                        <th data-column="database_user"><tmpl_var name="database_user_txt"></th>
                        <th data-column="database_name"><tmpl_var name="database_name_txt"></th>
                        <th class="small-col text-right">{tmpl_var name='search_limit'}</th>
                    </tr>
                    <tr>
@@ -50,7 +50,7 @@
                        <td><select class="form-control" name="search_database_user_id">{tmpl_var name='search_database_user_id'}</select></td>
                        <td><input class="form-control" type="text" name="search_database_name" value="{tmpl_var name='search_database_name'}"/></td>
                        <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"}" onclick="submitForm('pageForm','sites/database_list.php');"><span class="icon icon-filter"></span></button>
                            <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_list.php"><span class="icon icon-filter"></span></button>
                        </td>
                    </tr>
                </thead>
@@ -69,7 +69,7 @@
                                    <a class="btn btn-default formbutton-default formbutton-narrow" href="sites/database_phpmyadmin.php?id={tmpl_var name='id'}" target="phpmyadmin"><span class="icon icon-dbadmin"></span></button>
                                </tmpl_if>
                                <a class="btn btn-default formbutton-default formbutton-narrow" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}"><span class="icon icon-edit"></span></button>
                                <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('sites/database_del.php?id={tmpl_var name='id'}&amp;phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
                                <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: ISPConfig.confirm_action('sites/database_del.php?id={tmpl_var name='id'}&amp;phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
                            </td>
                        </tr>
                    </tmpl_loop>