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

Dominik

2015-01-21 83aa23b76fbdca327c52bd14fc1a1bc62aa5b3ee

 interface/web/sites/templates/aps_instances_list.htm

@@ -22,9 +22,9 @@
                        <!--<td><input class="form-control" type="text" name="search_customer_name" value="{tmpl_var name='search_customer_name'}" /></td>-->
                        </tmpl_if>
                        <td>&nbsp;</td>
                        <td><select class="form-control" name="search_instance_status" onChange="submitForm('pageForm','sites/aps_installedpackages_list.php');">{tmpl_var name='search_instance_status'}</select></td>
                        <td><select class="form-control" name="search_instance_status" onChange="ISPConfig.submitForm('pageForm','sites/aps_installedpackages_list.php');">{tmpl_var name='search_instance_status'}</select></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/aps_installedpackages_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/aps_installedpackages_list.php"><span class="icon icon-filter"></span></button>
                        </td>
                    </tr>
                </thead>
@@ -40,7 +40,7 @@
                            <td><span id="status_content{tmpl_var name='__ROWNUM__'}">{tmpl_var name='instance_status'}</span></td>
                            <td class="text-right">
                                <tmpl_if name='delete_possible'>
                                    <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('sites/aps_do_operation.php?action=delete_instance&id={tmpl_var name='id'}','{tmpl_var name='pkg_delete_confirmation'}')"><span class="icon icon-delete"></span></button>
                                    <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: ISPConfig.confirm_action('sites/aps_do_operation.php?action=delete_instance&id={tmpl_var name='id'}','{tmpl_var name='pkg_delete_confirmation'}')"><span class="icon icon-delete"></span></button>
                                </tmpl_if>
                            </td>        
                        </tr>