From 6ab3c5d3ce307699ce3ef27b87ee6582c96be55d Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Wed, 7 Jan 2015 10:01:21 +0100 Subject: [PATCH] - Layout fixes --- .../web/admin/templates/directive_snippets_list.htm | 2 +- interface/web/admin/templates/firewall_list.htm | 4 ++-- interface/web/admin/templates/groups_list.htm | 4 ++-- interface/web/admin/templates/remote_user_list.htm | 2 +- interface/web/admin/templates/server_config_list.htm | 2 +- interface/web/admin/templates/server_ip_list.htm | 4 ++-- interface/web/admin/templates/server_list.htm | 2 +- interface/web/admin/templates/server_php_list.htm | 2 +- interface/web/admin/templates/software_repo_list.htm | 4 ++-- interface/web/admin/templates/users_list.htm | 4 ++-- .../web/client/templates/client_circle_list.htm | 6 +++--- .../templates/client_message_template_list.htm | 2 +- .../web/client/templates/client_template_list.htm | 4 ++-- interface/web/client/templates/clients_list.htm | 12 ++++++------ interface/web/client/templates/domain_list.htm | 2 +- .../web/client/templates/message_template_list.htm | 2 +- interface/web/client/templates/resellers_list.htm | 12 ++++++------ interface/web/dashboard/templates/custom_menu.htm | 4 ++-- interface/web/dns/templates/dns_a_list.htm | 8 ++++---- interface/web/dns/templates/dns_slave_admin_list.htm | 4 ++-- interface/web/dns/templates/dns_slave_list.htm | 4 ++-- interface/web/dns/templates/dns_soa_admin_list.htm | 6 +++--- interface/web/dns/templates/dns_soa_list.htm | 6 +++--- interface/web/dns/templates/dns_template_list.htm | 2 +- .../web/help/templates/support_message_list.htm | 2 +- interface/web/js/scrigo.js.php | 1 + interface/web/mail/templates/mail_alias_list.htm | 4 ++-- .../web/mail/templates/mail_aliasdomain_list.htm | 4 ++-- interface/web/mail/templates/mail_blacklist_list.htm | 2 +- .../web/mail/templates/mail_content_filter_list.htm | 2 +- .../web/mail/templates/mail_domain_admin_list.htm | 2 +- .../web/mail/templates/mail_domain_catchall_list.htm | 4 ++-- interface/web/mail/templates/mail_domain_list.htm | 2 +- interface/web/mail/templates/mail_forward_list.htm | 4 ++-- interface/web/mail/templates/mail_get_list.htm | 6 +++--- .../web/mail/templates/mail_mailinglist_list.htm | 4 ++-- .../web/mail/templates/mail_relay_recipient_list.htm | 2 +- interface/web/mail/templates/mail_transport_list.htm | 6 +++--- .../web/mail/templates/mail_user_filter_list.htm | 2 +- interface/web/mail/templates/mail_user_list.htm | 6 +++--- .../web/mail/templates/mail_user_stats_list.htm | 2 +- interface/web/mail/templates/mail_whitelist_list.htm | 2 +- .../web/mail/templates/spamfilter_blacklist_list.htm | 2 +- .../web/mail/templates/spamfilter_config_list.htm | 2 +- .../web/mail/templates/spamfilter_policy_list.htm | 2 +- .../web/mail/templates/spamfilter_users_list.htm | 2 +- .../web/mail/templates/spamfilter_whitelist_list.htm | 2 +- .../web/mail/templates/user_quota_stats_list.htm | 4 ++-- .../web/mailuser/templates/mail_user_filter_list.htm | 2 +- interface/web/monitor/templates/datalog_list.htm | 2 +- interface/web/monitor/templates/syslog_list.htm | 2 +- interface/web/sites/templates/aps_instances_list.htm | 6 +++--- interface/web/sites/templates/aps_packages_list.htm | 4 ++-- interface/web/sites/templates/cron_list.htm | 12 ++++++------ .../web/sites/templates/database_admin_list.htm | 2 +- interface/web/sites/templates/database_list.htm | 2 +- .../sites/templates/database_quota_stats_list.htm | 2 +- .../web/sites/templates/database_user_admin_list.htm | 2 +- interface/web/sites/templates/database_user_list.htm | 2 +- interface/web/sites/templates/ftp_user_list.htm | 2 +- interface/web/sites/templates/shell_user_list.htm | 2 +- .../web/sites/templates/user_quota_stats_list.htm | 4 ++-- .../web/sites/templates/web_childdomain_list.htm | 2 +- interface/web/sites/templates/web_folder_list.htm | 2 +- .../web/sites/templates/web_folder_user_list.htm | 2 +- .../web/sites/templates/web_sites_stats_list.htm | 2 +- .../sites/templates/web_vhost_domain_admin_list.htm | 4 ++-- .../web/sites/templates/web_vhost_domain_list.htm | 4 ++-- interface/web/sites/templates/webdav_user_list.htm | 2 +- .../themes/default/assets/stylesheets/ispconfig.css | 4 ++++ .../default/assets/stylesheets/ispconfig.min.css | 2 +- interface/web/vm/templates/openvz_ip_list.htm | 2 +- .../web/vm/templates/openvz_ostemplate_list.htm | 4 ++-- interface/web/vm/templates/openvz_template_list.htm | 2 +- interface/web/vm/templates/openvz_vm_list.htm | 6 +++--- 75 files changed, 132 insertions(+), 127 deletions(-) diff --git a/interface/web/admin/templates/directive_snippets_list.htm b/interface/web/admin/templates/directive_snippets_list.htm index 2ce79f8a31..067856618d 100644 --- a/interface/web/admin/templates/directive_snippets_list.htm +++ b/interface/web/admin/templates/directive_snippets_list.htm @@ -25,7 +25,7 @@ </tr> <tr> <td><select name="search_active">{tmpl_var name='search_active'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></div></td> + <td><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td> <td><select name="search_type">{tmpl_var name='search_type'}</select></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/directive_snippets_list.php');">{tmpl_var name="filter_txt"}</button> diff --git a/interface/web/admin/templates/firewall_list.htm b/interface/web/admin/templates/firewall_list.htm index 108613fa19..97856910fa 100644 --- a/interface/web/admin/templates/firewall_list.htm +++ b/interface/web/admin/templates/firewall_list.htm @@ -27,8 +27,8 @@ <tr> <td><select name="search_active">{tmpl_var name='search_active'}</select></td> <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_tcp_port" value="{tmpl_var name='search_tcp_port'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_udp_port" value="{tmpl_var name='search_udp_port'}" /></div></td> + <td><input type="text" name="search_tcp_port" value="{tmpl_var name='search_tcp_port'}" /></td> + <td><input type="text" name="search_udp_port" value="{tmpl_var name='search_udp_port'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/firewall_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/admin/templates/groups_list.htm b/interface/web/admin/templates/groups_list.htm index cbb8d1951c..23c0da6ac6 100644 --- a/interface/web/admin/templates/groups_list.htm +++ b/interface/web/admin/templates/groups_list.htm @@ -24,8 +24,8 @@ <th> </th> </tr> <tr> - <td><div class="col-sm-9"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_description" value="{tmpl_var name='search_description'}" /></div></td> + <td><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td> + <td><input type="text" name="search_description" value="{tmpl_var name='search_description'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/groups_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/admin/templates/remote_user_list.htm b/interface/web/admin/templates/remote_user_list.htm index 8efe48d0c5..89faf2c117 100644 --- a/interface/web/admin/templates/remote_user_list.htm +++ b/interface/web/admin/templates/remote_user_list.htm @@ -23,7 +23,7 @@ </tr> <tr> <td> </td> - <td><div class="col-sm-9"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></div></td> + <td><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/remote_user_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/admin/templates/server_config_list.htm b/interface/web/admin/templates/server_config_list.htm index 8472971f68..bdadac8e82 100644 --- a/interface/web/admin/templates/server_config_list.htm +++ b/interface/web/admin/templates/server_config_list.htm @@ -13,7 +13,7 @@ <th>{tmpl_var name='search_limit'}</th> </tr> <tr> - <td><div class="col-sm-9"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></div></td> + <td><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/server_config_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/admin/templates/server_ip_list.htm b/interface/web/admin/templates/server_ip_list.htm index 211f721313..f406ce917f 100644 --- a/interface/web/admin/templates/server_ip_list.htm +++ b/interface/web/admin/templates/server_ip_list.htm @@ -29,9 +29,9 @@ <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td> <td><select name="search_client_id">{tmpl_var name='search_client_id'}</select></td> <td><select name="search_ip_type">{tmpl_var name='search_ip_type'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" /></div></td> + <td><input type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" /></td> <td><select name="search_virtualhost">{tmpl_var name='search_virtualhost'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_virtualhost_port" value="{tmpl_var name='search_virtualhost_port'}" /></div></td> + <td><input type="text" name="search_virtualhost_port" value="{tmpl_var name='search_virtualhost_port'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/server_ip_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/admin/templates/server_list.htm b/interface/web/admin/templates/server_list.htm index 666bc2b64a..bfdab005e8 100644 --- a/interface/web/admin/templates/server_list.htm +++ b/interface/web/admin/templates/server_list.htm @@ -19,7 +19,7 @@ <th>{tmpl_var name='search_limit'}</th> </tr> <tr> - <td><div class="col-sm-9"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></div></td> + <td><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></td> <td><select name="search_active">{tmpl_var name='search_mail_server'}</select></td> <td><select name="search_active">{tmpl_var name='search_web_server'}</select></td> <td><select name="search_active">{tmpl_var name='search_dns_server'}</select></td> diff --git a/interface/web/admin/templates/server_php_list.htm b/interface/web/admin/templates/server_php_list.htm index 2ed907f273..02f3d95c13 100644 --- a/interface/web/admin/templates/server_php_list.htm +++ b/interface/web/admin/templates/server_php_list.htm @@ -25,7 +25,7 @@ <tr> <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td> <td><select name="search_client_id">{tmpl_var name='search_client_id'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></div></td> + <td><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/server_php_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/admin/templates/software_repo_list.htm b/interface/web/admin/templates/software_repo_list.htm index b443ce6c1c..21c75e6814 100644 --- a/interface/web/admin/templates/software_repo_list.htm +++ b/interface/web/admin/templates/software_repo_list.htm @@ -25,8 +25,8 @@ </tr> <tr> <td><select name="search_active">{tmpl_var name='search_active'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_repo_name" value="{tmpl_var name='search_repo_name'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_repo_url" value="{tmpl_var name='search_repo_url'}" /></div></td> + <td><input type="text" name="search_repo_name" value="{tmpl_var name='search_repo_name'}" /></td> + <td><input type="text" name="search_repo_url" value="{tmpl_var name='search_repo_url'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/software_repo_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/admin/templates/users_list.htm b/interface/web/admin/templates/users_list.htm index 45fd9a7924..b5947d5790 100644 --- a/interface/web/admin/templates/users_list.htm +++ b/interface/web/admin/templates/users_list.htm @@ -26,9 +26,9 @@ <th>{tmpl_var name='search_limit'}</th> </tr> <tr> - <td><div class="col-sm-9"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></div></td> + <td><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></td> <td><select name="search_active">{tmpl_var name='search_active'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></div></td> + <td><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td> <td><select name="search_groups">{tmpl_var name='search_groups'}</select></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/users_list.php');">{tmpl_var name="filter_txt"}</button> diff --git a/interface/web/client/templates/client_circle_list.htm b/interface/web/client/templates/client_circle_list.htm index a9b3de4c02..fbef05499d 100644 --- a/interface/web/client/templates/client_circle_list.htm +++ b/interface/web/client/templates/client_circle_list.htm @@ -25,10 +25,10 @@ <th>{tmpl_var name='search_limit'}</th> </tr> <tr> - <td><div class="col-sm-9"><input type="text" name="search_circle_id" value="{tmpl_var name='search_circle_id'}" /></div></td> + <td><input type="text" name="search_circle_id" value="{tmpl_var name='search_circle_id'}" /></td> <td><select name="search_active">{tmpl_var name='search_active'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_circle_name" value="{tmpl_var name='search_circle_name'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_description" value="{tmpl_var name='search_description'}" /></div></td> + <td><input type="text" name="search_circle_name" value="{tmpl_var name='search_circle_name'}" /></td> + <td><input type="text" name="search_description" value="{tmpl_var name='search_description'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','client/client_circle_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/client/templates/client_message_template_list.htm b/interface/web/client/templates/client_message_template_list.htm index 01b741a623..d08dc98991 100644 --- a/interface/web/client/templates/client_message_template_list.htm +++ b/interface/web/client/templates/client_message_template_list.htm @@ -23,7 +23,7 @@ </tr> <tr> <td><select name="search_template_type" onChange="submitForm('pageForm','client/message_template_list.php');">{tmpl_var name='search_template_type'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></div></td> + <td><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></td> <td><div class="buttons"><button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','client/message_template_list.php');">{tmpl_var name="filter_txt"}</button></div></td> </tr> </thead> diff --git a/interface/web/client/templates/client_template_list.htm b/interface/web/client/templates/client_template_list.htm index bc5885b9e1..7068dcd75c 100644 --- a/interface/web/client/templates/client_template_list.htm +++ b/interface/web/client/templates/client_template_list.htm @@ -24,9 +24,9 @@ <th>{tmpl_var name='search_limit'}</th> </tr> <tr> - <td><div class="col-sm-9"><input type="text" name="search_template_id" value="{tmpl_var name='search_template_id'}" /></div></td> + <td><input type="text" name="search_template_id" value="{tmpl_var name='search_template_id'}" /></td> <td><select name="search_template_type">{tmpl_var name='search_template_type'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></div></td> + <td><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','client/client_template_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/client/templates/clients_list.htm b/interface/web/client/templates/clients_list.htm index d2a98e08d6..a9faacdc24 100644 --- a/interface/web/client/templates/clients_list.htm +++ b/interface/web/client/templates/clients_list.htm @@ -28,12 +28,12 @@ <th>{tmpl_var name='search_limit'}</th> </tr> <tr> - <td><div class="col-sm-9"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_company_name" value="{tmpl_var name='search_company_name'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_customer_no" value="{tmpl_var name='search_customer_no'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_city" value="{tmpl_var name='search_city'}" /></div></td> + <td><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></td> + <td><input type="text" name="search_company_name" value="{tmpl_var name='search_company_name'}" /></td> + <td><input type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" /></td> + <td><input type="text" name="search_customer_no" value="{tmpl_var name='search_customer_no'}" /></td> + <td><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td> + <td><input type="text" name="search_city" value="{tmpl_var name='search_city'}" /></td> <td><select name="search_country">{tmpl_var name='search_country'}</select></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','client/client_list.php');">{tmpl_var name="filter_txt"}</button> diff --git a/interface/web/client/templates/domain_list.htm b/interface/web/client/templates/domain_list.htm index e6a05d6f6c..ef3645a314 100644 --- a/interface/web/client/templates/domain_list.htm +++ b/interface/web/client/templates/domain_list.htm @@ -23,7 +23,7 @@ <th>{tmpl_var name='search_limit'}</th> </tr> <tr> - <td><div class="col-sm-9"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></div></td> + <td><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td> <td><select name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td> <td><button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name='filter_txt'}" onclick="submitForm('pageForm','client/domain_list.php');">{tmpl_var name="filter_txt"}</button></td> </tr> diff --git a/interface/web/client/templates/message_template_list.htm b/interface/web/client/templates/message_template_list.htm index ce2c50a0cc..e18d51f53a 100644 --- a/interface/web/client/templates/message_template_list.htm +++ b/interface/web/client/templates/message_template_list.htm @@ -23,7 +23,7 @@ </tr> <tr> <td><select name="search_template_type" onChange="submitForm('pageForm','billing/invoice_message_template_list.php');">{tmpl_var name='search_template_type'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></div></td> + <td><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></td> <td><div class="buttons"><button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','billing/invoice_message_template_list.php');">{tmpl_var name="filter_txt"}</button></div></td> </tr> </thead> diff --git a/interface/web/client/templates/resellers_list.htm b/interface/web/client/templates/resellers_list.htm index b465a8812d..4392abbcc9 100644 --- a/interface/web/client/templates/resellers_list.htm +++ b/interface/web/client/templates/resellers_list.htm @@ -28,12 +28,12 @@ <th>{tmpl_var name='search_limit'}</th> </tr> <tr> - <td><div class="col-sm-9"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_company_name" value="{tmpl_var name='search_company_name'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_customer_no" value="{tmpl_var name='search_customer_no'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_city" value="{tmpl_var name='search_city'}" /></div></td> + <td><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></td> + <td><input type="text" name="search_company_name" value="{tmpl_var name='search_company_name'}" /></td> + <td><input type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" /></td> + <td><input type="text" name="search_customer_no" value="{tmpl_var name='search_customer_no'}" /></td> + <td><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td> + <td><input type="text" name="search_city" value="{tmpl_var name='search_city'}" /></td> <td><select name="search_country">{tmpl_var name='search_country'}</select></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','client/reseller_list.php');">{tmpl_var name="filter_txt"}</button> diff --git a/interface/web/dashboard/templates/custom_menu.htm b/interface/web/dashboard/templates/custom_menu.htm index 4b06779659..05e2d4d7df 100644 --- a/interface/web/dashboard/templates/custom_menu.htm +++ b/interface/web/dashboard/templates/custom_menu.htm @@ -1,5 +1,5 @@ -<ul id="submenu"> - <li class="title"><a>{tmpl_var name='latest_news_txt'}</a></li> +<header>{tmpl_var name='latest_news_txt'}</header> +<ul> <tmpl_loop name="news"> <li> <a href="{tmpl_var name="link"}" target="_blank" style="margin-top:8px;padding-bottom:5px;"><b>{tmpl_var name="date"}</b><br /> diff --git a/interface/web/dns/templates/dns_a_list.htm b/interface/web/dns/templates/dns_a_list.htm index 84a81ae5a7..2d987abbc0 100644 --- a/interface/web/dns/templates/dns_a_list.htm +++ b/interface/web/dns/templates/dns_a_list.htm @@ -50,10 +50,10 @@ <tr> <td><select name="search_active">{tmpl_var name='search_active'}</select></td> <td><select name="search_type">{tmpl_var name='search_type'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_data" value="{tmpl_var name='search_data'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_aux" value="{tmpl_var name='search_aux'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_ttl" value="{tmpl_var name='search_ttl'}" /></div></td> + <td><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td> + <td><input type="text" name="search_data" value="{tmpl_var name='search_data'}" /></td> + <td><input type="text" name="search_aux" value="{tmpl_var name='search_aux'}" /></td> + <td><input type="text" name="search_ttl" value="{tmpl_var name='search_ttl'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="return changeTab('dns_records','dns/dns_soa_edit.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/dns/templates/dns_slave_admin_list.htm b/interface/web/dns/templates/dns_slave_admin_list.htm index 4cc4449636..a2fac305fe 100644 --- a/interface/web/dns/templates/dns_slave_admin_list.htm +++ b/interface/web/dns/templates/dns_slave_admin_list.htm @@ -45,8 +45,8 @@ <td><select name="search_active">{tmpl_var name='search_active'}</select></td> <td><select name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td> <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_origin" value="{tmpl_var name='search_origin'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_ns" value="{tmpl_var name='search_ns'}" /></div></td> + <td><input type="text" name="search_origin" value="{tmpl_var name='search_origin'}" /></td> + <td><input type="text" name="search_ns" value="{tmpl_var name='search_ns'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','dns/dns_slave_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/dns/templates/dns_slave_list.htm b/interface/web/dns/templates/dns_slave_list.htm index 7aff5cf519..093ea4b164 100644 --- a/interface/web/dns/templates/dns_slave_list.htm +++ b/interface/web/dns/templates/dns_slave_list.htm @@ -43,8 +43,8 @@ <tr> <td><select name="search_active">{tmpl_var name='search_active'}</select></td> <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_origin" value="{tmpl_var name='search_origin'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_ns" value="{tmpl_var name='search_ns'}" /></div></td> + <td><input type="text" name="search_origin" value="{tmpl_var name='search_origin'}" /></td> + <td><input type="text" name="search_ns" value="{tmpl_var name='search_ns'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','dns/dns_slave_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/dns/templates/dns_soa_admin_list.htm b/interface/web/dns/templates/dns_soa_admin_list.htm index 7395ee24d3..d7f27d0df4 100644 --- a/interface/web/dns/templates/dns_soa_admin_list.htm +++ b/interface/web/dns/templates/dns_soa_admin_list.htm @@ -46,9 +46,9 @@ <td><select name="search_active">{tmpl_var name='search_active'}</select></td> <td><select name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td> <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_origin" value="{tmpl_var name='search_origin'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_ns" value="{tmpl_var name='search_ns'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_mbox" value="{tmpl_var name='search_mbox'}" /></div></td> + <td><input type="text" name="search_origin" value="{tmpl_var name='search_origin'}" /></td> + <td><input type="text" name="search_ns" value="{tmpl_var name='search_ns'}" /></td> + <td><input type="text" name="search_mbox" value="{tmpl_var name='search_mbox'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','dns/dns_soa_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/dns/templates/dns_soa_list.htm b/interface/web/dns/templates/dns_soa_list.htm index b5bdb1a1d7..a6c3d1c647 100644 --- a/interface/web/dns/templates/dns_soa_list.htm +++ b/interface/web/dns/templates/dns_soa_list.htm @@ -44,9 +44,9 @@ <tr> <td><select name="search_active">{tmpl_var name='search_active'}</select></td> <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_origin" value="{tmpl_var name='search_origin'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_ns" value="{tmpl_var name='search_ns'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_mbox" value="{tmpl_var name='search_mbox'}" /></div></td> + <td><input type="text" name="search_origin" value="{tmpl_var name='search_origin'}" /></td> + <td><input type="text" name="search_ns" value="{tmpl_var name='search_ns'}" /></td> + <td><input type="text" name="search_mbox" value="{tmpl_var name='search_mbox'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','dns/dns_soa_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/dns/templates/dns_template_list.htm b/interface/web/dns/templates/dns_template_list.htm index 2d6b4a7767..507e53c62d 100644 --- a/interface/web/dns/templates/dns_template_list.htm +++ b/interface/web/dns/templates/dns_template_list.htm @@ -24,7 +24,7 @@ </tr> <tr> <td><select name="search_visible">{tmpl_var name='search_visible'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></div></td> + <td><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','dns/dns_template_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/help/templates/support_message_list.htm b/interface/web/help/templates/support_message_list.htm index a4ab0a64be..a893138f37 100644 --- a/interface/web/help/templates/support_message_list.htm +++ b/interface/web/help/templates/support_message_list.htm @@ -25,7 +25,7 @@ </tr> <tr> <td><select name="search_sender_id">{tmpl_var name='search_sender_id'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_subject" value="{tmpl_var name='search_subject'}" /></div></td> + <td><input type="text" name="search_subject" value="{tmpl_var name='search_subject'}" /></td> <td> </td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','help/support_message_list.php');">{tmpl_var name="filter_txt"}</button> diff --git a/interface/web/js/scrigo.js.php b/interface/web/js/scrigo.js.php index 404d46e365..83b8b5d47c 100644 --- a/interface/web/js/scrigo.js.php +++ b/interface/web/js/scrigo.js.php @@ -98,6 +98,7 @@ if($server_config_array['misc']['use_combobox'] == 'y'){ $('#pageContent').find("select:not(.chosen-select)").select2({ placeholder: '', width: 'element', + selectOnBlur: true, allowClear: true, }).on('change', function(e) { if (jQuery(".panel #Filter").length > 0) { diff --git a/interface/web/mail/templates/mail_alias_list.htm b/interface/web/mail/templates/mail_alias_list.htm index a289a52832..86db185fcd 100644 --- a/interface/web/mail/templates/mail_alias_list.htm +++ b/interface/web/mail/templates/mail_alias_list.htm @@ -41,8 +41,8 @@ </tr> <tr> <td><select name="search_active">{tmpl_var name='search_active'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></div></td> + <td><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td> + <td><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_alias_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/mail/templates/mail_aliasdomain_list.htm b/interface/web/mail/templates/mail_aliasdomain_list.htm index 7aa5d64518..4fe87e1413 100644 --- a/interface/web/mail/templates/mail_aliasdomain_list.htm +++ b/interface/web/mail/templates/mail_aliasdomain_list.htm @@ -41,8 +41,8 @@ </tr> <tr> <td><select name="search_active">{tmpl_var name='search_active'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></div></td> + <td><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td> + <td><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_aliasdomain_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/mail/templates/mail_blacklist_list.htm b/interface/web/mail/templates/mail_blacklist_list.htm index 06ef7cc42e..6f3dbad347 100644 --- a/interface/web/mail/templates/mail_blacklist_list.htm +++ b/interface/web/mail/templates/mail_blacklist_list.htm @@ -43,7 +43,7 @@ <tr> <td><select name="search_active">{tmpl_var name='search_active'}</select></td> <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></div></td> + <td><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td> <td><select name="search_type">{tmpl_var name='search_type'}</select></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_blacklist_list.php');">{tmpl_var name="filter_txt"}</button> diff --git a/interface/web/mail/templates/mail_content_filter_list.htm b/interface/web/mail/templates/mail_content_filter_list.htm index d2a4b44908..27e5cd8d75 100644 --- a/interface/web/mail/templates/mail_content_filter_list.htm +++ b/interface/web/mail/templates/mail_content_filter_list.htm @@ -43,7 +43,7 @@ <tr> <td><select name="search_active">{tmpl_var name='search_active'}</select></td> <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_pattern" value="{tmpl_var name='search_pattern'}" /></div></td> + <td><input type="text" name="search_pattern" value="{tmpl_var name='search_pattern'}" /></td> <td><select name="search_action">{tmpl_var name='search_action'}</select></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_content_filter_list.php');">{tmpl_var name="filter_txt"}</button> diff --git a/interface/web/mail/templates/mail_domain_admin_list.htm b/interface/web/mail/templates/mail_domain_admin_list.htm index c3204350cb..1215344c9e 100644 --- a/interface/web/mail/templates/mail_domain_admin_list.htm +++ b/interface/web/mail/templates/mail_domain_admin_list.htm @@ -27,7 +27,7 @@ <td><select name="search_active">{tmpl_var name='search_active'}</select></td> <td><select name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td> <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></div></td> + <td><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_domain_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/mail/templates/mail_domain_catchall_list.htm b/interface/web/mail/templates/mail_domain_catchall_list.htm index bdcda7dbff..6ac7ecef44 100644 --- a/interface/web/mail/templates/mail_domain_catchall_list.htm +++ b/interface/web/mail/templates/mail_domain_catchall_list.htm @@ -41,8 +41,8 @@ </tr> <tr> <td><select name="search_active">{tmpl_var name='search_active'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></div></td> + <td><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td> + <td><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_domain_catchall_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/mail/templates/mail_domain_list.htm b/interface/web/mail/templates/mail_domain_list.htm index 24fad5ce55..f5aa526661 100644 --- a/interface/web/mail/templates/mail_domain_list.htm +++ b/interface/web/mail/templates/mail_domain_list.htm @@ -42,7 +42,7 @@ <tr> <td><select name="search_active">{tmpl_var name='search_active'}</select></td> <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></div></td> + <td><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_domain_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/mail/templates/mail_forward_list.htm b/interface/web/mail/templates/mail_forward_list.htm index c68fa361f2..3dd6993b49 100644 --- a/interface/web/mail/templates/mail_forward_list.htm +++ b/interface/web/mail/templates/mail_forward_list.htm @@ -41,8 +41,8 @@ </tr> <tr> <td><select name="search_active">{tmpl_var name='search_active'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></div></td> + <td><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td> + <td><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_forward_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/mail/templates/mail_get_list.htm b/interface/web/mail/templates/mail_get_list.htm index 417da8adf0..380049a7d1 100644 --- a/interface/web/mail/templates/mail_get_list.htm +++ b/interface/web/mail/templates/mail_get_list.htm @@ -44,9 +44,9 @@ <tr> <td><select name="search_active">{tmpl_var name='search_active'}</select></td> <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_source_server" value="{tmpl_var name='search_source_server'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_source_username" value="{tmpl_var name='search_source_username'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></div></td> + <td><input type="text" name="search_source_server" value="{tmpl_var name='search_source_server'}" /></td> + <td><input type="text" name="search_source_username" value="{tmpl_var name='search_source_username'}" /></td> + <td><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_get_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/mail/templates/mail_mailinglist_list.htm b/interface/web/mail/templates/mail_mailinglist_list.htm index ff1c0c464e..d37c5d1ffe 100644 --- a/interface/web/mail/templates/mail_mailinglist_list.htm +++ b/interface/web/mail/templates/mail_mailinglist_list.htm @@ -38,8 +38,8 @@ <th>{tmpl_var name='search_limit'}</th> </tr> <tr> - <td><div class="col-sm-9"><input type="text" name="search_listname" value="{tmpl_var name='search_listname'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></div></td> + <td><input type="text" name="search_listname" value="{tmpl_var name='search_listname'}" /></td> + <td><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_mailinglist_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/mail/templates/mail_relay_recipient_list.htm b/interface/web/mail/templates/mail_relay_recipient_list.htm index aca3b6fec0..4f6e89b051 100644 --- a/interface/web/mail/templates/mail_relay_recipient_list.htm +++ b/interface/web/mail/templates/mail_relay_recipient_list.htm @@ -41,7 +41,7 @@ <tr> <td><select name="search_active">{tmpl_var name='search_active'}</select></td> <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></div></td> + <td><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_relay_recipient_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/mail/templates/mail_transport_list.htm b/interface/web/mail/templates/mail_transport_list.htm index 3dfed0aa9f..a788c8cb6b 100644 --- a/interface/web/mail/templates/mail_transport_list.htm +++ b/interface/web/mail/templates/mail_transport_list.htm @@ -44,9 +44,9 @@ <tr> <td><select name="search_active">{tmpl_var name='search_active'}</select></td> <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_transport" value="{tmpl_var name='search_transport'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_sort_order" value="{tmpl_var name='search_sort_order'}" /></div></td> + <td><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td> + <td><input type="text" name="search_transport" value="{tmpl_var name='search_transport'}" /></td> + <td><input type="text" name="search_sort_order" value="{tmpl_var name='search_sort_order'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_transport_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/mail/templates/mail_user_filter_list.htm b/interface/web/mail/templates/mail_user_filter_list.htm index 6b79ac0191..a45ddab25e 100644 --- a/interface/web/mail/templates/mail_user_filter_list.htm +++ b/interface/web/mail/templates/mail_user_filter_list.htm @@ -33,7 +33,7 @@ <th>{tmpl_var name='search_limit'}</th> </tr> <tr> - <td><div class="col-sm-9"><input type="text" name="search_rulename" value="{tmpl_var name='search_rulename'}" /></div></td> + <td><input type="text" name="search_rulename" value="{tmpl_var name='search_rulename'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="return changeTab('filter_records','mail/mail_user_edit.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/mail/templates/mail_user_list.htm b/interface/web/mail/templates/mail_user_list.htm index d0c9746b09..300fc3f1a9 100644 --- a/interface/web/mail/templates/mail_user_list.htm +++ b/interface/web/mail/templates/mail_user_list.htm @@ -45,9 +45,9 @@ <th>{tmpl_var name='search_limit'}</th> </tr> <tr> - <td><div class="col-sm-9"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></div></td> - <tmpl_if name="enable_custom_login"><td><div class="col-sm-9"><input type="text" name="search_login" value="{tmpl_var name='search_login'}" /></div></td></tmpl_if> - <td><div class="col-sm-9"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></div></td> + <td><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td> + <tmpl_if name="enable_custom_login"><td><input type="text" name="search_login" value="{tmpl_var name='search_login'}" /></td></tmpl_if> + <td><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td> <td><select name="search_autoresponder">{tmpl_var name='search_autoresponder'}</select></td> <td><select name="search_postfix">{tmpl_var name='search_postfix'}</select></th> <td><select name="search_disablesmtp">{tmpl_var name='search_disablesmtp'}</select></th> diff --git a/interface/web/mail/templates/mail_user_stats_list.htm b/interface/web/mail/templates/mail_user_stats_list.htm index 23b316366c..b97f621a19 100644 --- a/interface/web/mail/templates/mail_user_stats_list.htm +++ b/interface/web/mail/templates/mail_user_stats_list.htm @@ -17,7 +17,7 @@ <th>{tmpl_var name='search_limit'}</th> </tr> <tr> - <td><div class="col-sm-9"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></div></td> + <td><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td> <td></td> <td></td> <td></td> diff --git a/interface/web/mail/templates/mail_whitelist_list.htm b/interface/web/mail/templates/mail_whitelist_list.htm index d7ab68eb5f..0bb0a15cf4 100644 --- a/interface/web/mail/templates/mail_whitelist_list.htm +++ b/interface/web/mail/templates/mail_whitelist_list.htm @@ -27,7 +27,7 @@ <tr> <td><select name="search_active">{tmpl_var name='search_active'}</select></td> <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></div></td> + <td><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td> <td><select name="search_type">{tmpl_var name='search_type'}</select></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_whitelist_list.php');">{tmpl_var name="filter_txt"}</button> diff --git a/interface/web/mail/templates/spamfilter_blacklist_list.htm b/interface/web/mail/templates/spamfilter_blacklist_list.htm index 87cb73ab7d..f496e12f3c 100644 --- a/interface/web/mail/templates/spamfilter_blacklist_list.htm +++ b/interface/web/mail/templates/spamfilter_blacklist_list.htm @@ -30,7 +30,7 @@ <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td> <td><select name="search_priority">{tmpl_var name='search_priority'}</select></td> <td><select name="search_rid">{tmpl_var name='search_rid'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></div></td> + <td><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/spamfilter_blacklist_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/mail/templates/spamfilter_config_list.htm b/interface/web/mail/templates/spamfilter_config_list.htm index 64eef6c5ef..a056020c67 100644 --- a/interface/web/mail/templates/spamfilter_config_list.htm +++ b/interface/web/mail/templates/spamfilter_config_list.htm @@ -22,7 +22,7 @@ <th> </th> </tr> <tr> - <td><div class="col-sm-9"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></div></td> + <td><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/spamfilter_config_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/mail/templates/spamfilter_policy_list.htm b/interface/web/mail/templates/spamfilter_policy_list.htm index c7443b3222..e7788be47e 100644 --- a/interface/web/mail/templates/spamfilter_policy_list.htm +++ b/interface/web/mail/templates/spamfilter_policy_list.htm @@ -26,7 +26,7 @@ <th>{tmpl_var name='search_limit'}</th> </tr> <tr> - <td><div class="col-sm-9"><input type="text" name="search_policy_name" value="{tmpl_var name='search_policy_name'}" /></div></td> + <td><input type="text" name="search_policy_name" value="{tmpl_var name='search_policy_name'}" /></td> <td><select name="search_virus_lover">{tmpl_var name='search_virus_lover'}</select></td> <td><select name="search_spam_lover">{tmpl_var name='search_spam_lover'}</select></td> <td><select name="search_banned_files_lover">{tmpl_var name='search_banned_files_lover'}</select></td> diff --git a/interface/web/mail/templates/spamfilter_users_list.htm b/interface/web/mail/templates/spamfilter_users_list.htm index d62d9c0910..4f03774104 100644 --- a/interface/web/mail/templates/spamfilter_users_list.htm +++ b/interface/web/mail/templates/spamfilter_users_list.htm @@ -30,7 +30,7 @@ <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td> <td><select name="search_priority">{tmpl_var name='search_priority'}</select></td> <td><select name="search_policy_id">{tmpl_var name='search_policy_id'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_fullname" value="{tmpl_var name='search_fullname'}" /></div></td> + <td><input type="text" name="search_fullname" value="{tmpl_var name='search_fullname'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/spamfilter_users_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/mail/templates/spamfilter_whitelist_list.htm b/interface/web/mail/templates/spamfilter_whitelist_list.htm index 1d6af875fa..094a7d9a3d 100644 --- a/interface/web/mail/templates/spamfilter_whitelist_list.htm +++ b/interface/web/mail/templates/spamfilter_whitelist_list.htm @@ -30,7 +30,7 @@ <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td> <td><select name="search_priority">{tmpl_var name='search_priority'}</select></td> <td><select name="search_rid">{tmpl_var name='search_rid'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></div></td> + <td><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/spamfilter_whitelist_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/mail/templates/user_quota_stats_list.htm b/interface/web/mail/templates/user_quota_stats_list.htm index e01f571bff..1945ab0d65 100644 --- a/interface/web/mail/templates/user_quota_stats_list.htm +++ b/interface/web/mail/templates/user_quota_stats_list.htm @@ -16,8 +16,8 @@ <th>{tmpl_var name='search_limit'}</th> </tr> <tr> - <td><div class="col-sm-9"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_system_user" value="{tmpl_var name='search_name'}" /></div></td> + <td><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td> + <td><input type="text" name="search_system_user" value="{tmpl_var name='search_name'}" /></td> <td> </td> <td> </td> <td> </td> diff --git a/interface/web/mailuser/templates/mail_user_filter_list.htm b/interface/web/mailuser/templates/mail_user_filter_list.htm index 69d5a6c59e..e280daae3b 100644 --- a/interface/web/mailuser/templates/mail_user_filter_list.htm +++ b/interface/web/mailuser/templates/mail_user_filter_list.htm @@ -21,7 +21,7 @@ <th> </th> </tr> <tr> - <td><div class="col-sm-9"><input type="text" name="search_rulename" value="{tmpl_var name='search_rulename'}" /></div></td> + <td><input type="text" name="search_rulename" value="{tmpl_var name='search_rulename'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_user_edit.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/monitor/templates/datalog_list.htm b/interface/web/monitor/templates/datalog_list.htm index 2f4e1865db..8dd1e4c9de 100644 --- a/interface/web/monitor/templates/datalog_list.htm +++ b/interface/web/monitor/templates/datalog_list.htm @@ -19,7 +19,7 @@ <td> </td> <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td> <td><select name="search_action">{tmpl_var name='search_action'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_dbtable" value="{tmpl_var name='search_dbtable'}" /></div></td> + <td><input type="text" name="search_dbtable" value="{tmpl_var name='search_dbtable'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','monitor/datalog_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/monitor/templates/syslog_list.htm b/interface/web/monitor/templates/syslog_list.htm index 2458d14c45..d9e3b46e34 100644 --- a/interface/web/monitor/templates/syslog_list.htm +++ b/interface/web/monitor/templates/syslog_list.htm @@ -19,7 +19,7 @@ <td> </td> <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td> <td><select name="search_loglevel">{tmpl_var name='search_loglevel'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_message" value="{tmpl_var name='search_message'}" /></div></td> + <td><input type="text" name="search_message" value="{tmpl_var name='search_message'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','monitor/log_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/sites/templates/aps_instances_list.htm b/interface/web/sites/templates/aps_instances_list.htm index e5b4b255b2..4810e86e65 100644 --- a/interface/web/sites/templates/aps_instances_list.htm +++ b/interface/web/sites/templates/aps_instances_list.htm @@ -16,10 +16,10 @@ <th > </th> </tr> <tr> - <td><div class="col-sm-9"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_version" value="{tmpl_var name='search_version'}" /></div></td> + <td><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td> + <td><input type="text" name="search_version" value="{tmpl_var name='search_version'}" /></td> <tmpl_if name='is_noclient'> - <!--<td><div class="col-sm-9"><input type="text" name="search_customer_name" value="{tmpl_var name='search_customer_name'}" /></div></td>--> + <!--<td><input type="text" name="search_customer_name" value="{tmpl_var name='search_customer_name'}" /></td>--> </tmpl_if> <td> </td> <td><select name="search_instance_status" onChange="submitForm('pageForm','sites/aps_installedpackages_list.php');">{tmpl_var name='search_instance_status'}</select></td> diff --git a/interface/web/sites/templates/aps_packages_list.htm b/interface/web/sites/templates/aps_packages_list.htm index 26f65d16e4..60daf35392 100644 --- a/interface/web/sites/templates/aps_packages_list.htm +++ b/interface/web/sites/templates/aps_packages_list.htm @@ -15,8 +15,8 @@ <th> </th> </tr> <tr> - <td><div class="col-sm-9"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_version" value="{tmpl_var name='search_version'}" /></div></td> + <td><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td> + <td><input type="text" name="search_version" value="{tmpl_var name='search_version'}" /></td> <td><select name="search_category" onChange="submitForm('pageForm','sites/aps_availablepackages_list.php');">{tmpl_var name='search_category'}</select></td> <tmpl_if name='is_admin'> <td><select name="search_package_status" onChange="submitForm('pageForm','sites/aps_availablepackages_list.php');">{tmpl_var name='search_package_status'}</select></td> diff --git a/interface/web/sites/templates/cron_list.htm b/interface/web/sites/templates/cron_list.htm index 8b5b462cd2..3914beecc9 100644 --- a/interface/web/sites/templates/cron_list.htm +++ b/interface/web/sites/templates/cron_list.htm @@ -33,12 +33,12 @@ <td><select name="search_active">{tmpl_var name='search_active'}</select></td> <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td> <td><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_run_min" value="{tmpl_var name='search_run_min'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_run_hour" value="{tmpl_var name='search_run_hour'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_run_mday" value="{tmpl_var name='search_run_mday'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_run_month" value="{tmpl_var name='search_run_month'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_run_wday" value="{tmpl_var name='search_run_wday'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_command" value="{tmpl_var name='search_command'}" /></div></td> + <td><input type="text" name="search_run_min" value="{tmpl_var name='search_run_min'}" /></td> + <td><input type="text" name="search_run_hour" value="{tmpl_var name='search_run_hour'}" /></td> + <td><input type="text" name="search_run_mday" value="{tmpl_var name='search_run_mday'}" /></td> + <td><input type="text" name="search_run_month" value="{tmpl_var name='search_run_month'}" /></td> + <td><input type="text" name="search_run_wday" value="{tmpl_var name='search_run_wday'}" /></td> + <td><input type="text" name="search_command" value="{tmpl_var name='search_command'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/cron_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/sites/templates/database_admin_list.htm b/interface/web/sites/templates/database_admin_list.htm index 46dc57bdca..1ad0516fb8 100644 --- a/interface/web/sites/templates/database_admin_list.htm +++ b/interface/web/sites/templates/database_admin_list.htm @@ -35,7 +35,7 @@ <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td> <td><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td> <td><select name="search_database_user_id">{tmpl_var name='search_database_user_id'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_database_name" value="{tmpl_var name='search_database_name'}" /></div></td> + <td><input type="text" name="search_database_name" value="{tmpl_var name='search_database_name'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/database_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/sites/templates/database_list.htm b/interface/web/sites/templates/database_list.htm index a0ce5639c2..8c7082b6ad 100644 --- a/interface/web/sites/templates/database_list.htm +++ b/interface/web/sites/templates/database_list.htm @@ -50,7 +50,7 @@ <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td> <td><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td> <td><select name="search_database_user_id">{tmpl_var name='search_database_user_id'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_database_name" value="{tmpl_var name='search_database_name'}"/></div></td> + <td><input type="text" name="search_database_name" value="{tmpl_var name='search_database_name'}"/></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/database_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/sites/templates/database_quota_stats_list.htm b/interface/web/sites/templates/database_quota_stats_list.htm index 5a3185ab73..a9e5553e03 100644 --- a/interface/web/sites/templates/database_quota_stats_list.htm +++ b/interface/web/sites/templates/database_quota_stats_list.htm @@ -16,7 +16,7 @@ <th>{tmpl_var name='search_limit'}</th> </tr> <tr> - <td><div class="col-sm-9"><input type="text" name="search_database_name" value="{tmpl_var name='search_database_name'}" /></div></td> + <td><input type="text" name="search_database_name" value="{tmpl_var name='search_database_name'}" /></td> <td> </td> <td> </td> <td> </td> diff --git a/interface/web/sites/templates/database_user_admin_list.htm b/interface/web/sites/templates/database_user_admin_list.htm index 1efd45067c..bf411a8172 100644 --- a/interface/web/sites/templates/database_user_admin_list.htm +++ b/interface/web/sites/templates/database_user_admin_list.htm @@ -22,7 +22,7 @@ <th>{tmpl_var name='search_limit'}</th> </tr> <tr> - <td><div class="col-sm-9"><input type="text" name="search_database_user" value="{tmpl_var name='search_database_user'}"/></div></td> + <td><input type="text" name="search_database_user" value="{tmpl_var name='search_database_user'}"/></td> <td><button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/database_user_list.php');">{tmpl_var name="filter_txt"}</button></td> </tr> </thead> diff --git a/interface/web/sites/templates/database_user_list.htm b/interface/web/sites/templates/database_user_list.htm index 7e9a7ae423..84b2cd4e07 100644 --- a/interface/web/sites/templates/database_user_list.htm +++ b/interface/web/sites/templates/database_user_list.htm @@ -38,7 +38,7 @@ <th>{tmpl_var name='search_limit'}</th> </tr> <tr> - <td><div class="col-sm-9"><input type="text" name="search_database_user" value="{tmpl_var name='search_database_user'}"/></div></td> + <td><input type="text" name="search_database_user" value="{tmpl_var name='search_database_user'}"/></td> <td><button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/database_user_list.php');">{tmpl_var name="filter_txt"}</button></td> </tr> </thead> diff --git a/interface/web/sites/templates/ftp_user_list.htm b/interface/web/sites/templates/ftp_user_list.htm index aad13d0fd4..390d57d735 100644 --- a/interface/web/sites/templates/ftp_user_list.htm +++ b/interface/web/sites/templates/ftp_user_list.htm @@ -44,7 +44,7 @@ <td><select name="search_active">{tmpl_var name='search_active'}</select></td> <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td> <td><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></div></td> + <td><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/ftp_user_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/sites/templates/shell_user_list.htm b/interface/web/sites/templates/shell_user_list.htm index 48549476e3..a9033a22d6 100644 --- a/interface/web/sites/templates/shell_user_list.htm +++ b/interface/web/sites/templates/shell_user_list.htm @@ -44,7 +44,7 @@ <td><select name="search_active">{tmpl_var name='search_active'}</select></td> <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td> <td><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></div></td> + <td><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/shell_user_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/sites/templates/user_quota_stats_list.htm b/interface/web/sites/templates/user_quota_stats_list.htm index bc3bd0c123..5ef7ccb0ee 100644 --- a/interface/web/sites/templates/user_quota_stats_list.htm +++ b/interface/web/sites/templates/user_quota_stats_list.htm @@ -17,8 +17,8 @@ <th>{tmpl_var name='search_limit'}</th> </tr> <tr> - <td><div class="col-sm-9"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_system_user" value="{tmpl_var name='search_system_user'}" /></div></td> + <td><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td> + <td><input type="text" name="search_system_user" value="{tmpl_var name='search_system_user'}" /></td> <td> </td> <td> </td> <td> </td> diff --git a/interface/web/sites/templates/web_childdomain_list.htm b/interface/web/sites/templates/web_childdomain_list.htm index fa16ce81ad..575323457c 100644 --- a/interface/web/sites/templates/web_childdomain_list.htm +++ b/interface/web/sites/templates/web_childdomain_list.htm @@ -44,7 +44,7 @@ <td><select name="search_active">{tmpl_var name='search_active'}</select></td> <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td> <td><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></div></td> + <td><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/web_childdomain_list.php?type={tmpl_var name="childdomain_type"}');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/sites/templates/web_folder_list.htm b/interface/web/sites/templates/web_folder_list.htm index 0dfa379ddb..d568885831 100644 --- a/interface/web/sites/templates/web_folder_list.htm +++ b/interface/web/sites/templates/web_folder_list.htm @@ -43,7 +43,7 @@ <td><select name="search_active" onChange="submitForm('pageForm','sites/web_folder_list.php');">{tmpl_var name='search_active'}</select></td> <td><select name="search_server_id" onChange="submitForm('pageForm','sites/web_folder_list.php');">{tmpl_var name='search_server_id'}</select></td> <td><select name="search_parent_domain_id" onChange="submitForm('pageForm','sites/web_folder_list.php');">{tmpl_var name='search_parent_domain_id'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_path" value="{tmpl_var name='search_path'}" /></div></td> + <td><input type="text" name="search_path" value="{tmpl_var name='search_path'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/web_folder_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/sites/templates/web_folder_user_list.htm b/interface/web/sites/templates/web_folder_user_list.htm index ed499764b9..dc66f9482a 100644 --- a/interface/web/sites/templates/web_folder_user_list.htm +++ b/interface/web/sites/templates/web_folder_user_list.htm @@ -41,7 +41,7 @@ <tr> <td><select name="search_active" onChange="submitForm('pageForm','sites/web_folder_user_list.php');">{tmpl_var name='search_active'}</select></td> <td><select name="search_web_folder_id" onChange="submitForm('pageForm','sites/web_folder_user_list.php');">{tmpl_var name='search_web_folder_id'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></div></td> + <td><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/web_folder_user_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/sites/templates/web_sites_stats_list.htm b/interface/web/sites/templates/web_sites_stats_list.htm index 64fd474d44..ee6ffd61c5 100644 --- a/interface/web/sites/templates/web_sites_stats_list.htm +++ b/interface/web/sites/templates/web_sites_stats_list.htm @@ -17,7 +17,7 @@ <th>{tmpl_var name='search_limit'}</th> </tr> <tr> - <td><div class="col-sm-9"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></div></td> + <td><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td> <td></td> <td></td> <td></td> diff --git a/interface/web/sites/templates/web_vhost_domain_admin_list.htm b/interface/web/sites/templates/web_vhost_domain_admin_list.htm index c27caab47f..9044456853 100644 --- a/interface/web/sites/templates/web_vhost_domain_admin_list.htm +++ b/interface/web/sites/templates/web_vhost_domain_admin_list.htm @@ -26,12 +26,12 @@ <th>{tmpl_var name='search_limit'}</th> </tr> <tr> - <tmpl_if name="vhostdomain_type" value="domain"><td><div class="col-sm-9"><input type="text" name="search_domain_id" value="{tmpl_var name='search_domain_id'}" /></div></td></tmpl_if> + <tmpl_if name="vhostdomain_type" value="domain"><td><input type="text" name="search_domain_id" value="{tmpl_var name='search_domain_id'}" /></td></tmpl_if> <td><select name="search_active">{tmpl_var name='search_active'}</select></td> <td><select name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td> <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td> <tmpl_if name="vhostdomain_type" op="!=" value="domain"><td><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td></tmpl_if> - <td><div class="col-sm-9"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></div></td> + <td><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/web_vhost_domain_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/sites/templates/web_vhost_domain_list.htm b/interface/web/sites/templates/web_vhost_domain_list.htm index 5e39bb61bc..ca17bf3ff5 100644 --- a/interface/web/sites/templates/web_vhost_domain_list.htm +++ b/interface/web/sites/templates/web_vhost_domain_list.htm @@ -42,11 +42,11 @@ <th>{tmpl_var name='search_limit'}</th> </tr> <tr> - <tmpl_if name="vhostdomain_type" value="domain"><td><div class="col-sm-9"><input type="text" name="search_domain_id" value="{tmpl_var name='search_domain_id'}" /></div></td></tmpl_if> + <tmpl_if name="vhostdomain_type" value="domain"><td><input type="text" name="search_domain_id" value="{tmpl_var name='search_domain_id'}" /></td></tmpl_if> <td><select name="search_active">{tmpl_var name='search_active'}</select></td> <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td> <tmpl_if name="vhostdomain_type" op="!=" value="domain"><td><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td></tmpl_if> - <td><div class="col-sm-9"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></div></td> + <td><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/web_vhost_domain_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/sites/templates/webdav_user_list.htm b/interface/web/sites/templates/webdav_user_list.htm index 85478ee605..74350671cd 100644 --- a/interface/web/sites/templates/webdav_user_list.htm +++ b/interface/web/sites/templates/webdav_user_list.htm @@ -44,7 +44,7 @@ <td><select name="search_active">{tmpl_var name='search_active'}</select></td> <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td> <td><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></div></td> + <td><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/webdav_user_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/themes/default/assets/stylesheets/ispconfig.css b/interface/web/themes/default/assets/stylesheets/ispconfig.css index 0915b72ad2..5d3b189f2c 100644 --- a/interface/web/themes/default/assets/stylesheets/ispconfig.css +++ b/interface/web/themes/default/assets/stylesheets/ispconfig.css @@ -246,6 +246,10 @@ thead.dark th { line-height: 40px; font-weight: normal; } +thead.dark td input, +thead.dark td select { + width: 100%; } + #footer { margin: 20px 0; padding-top: 20px; diff --git a/interface/web/themes/default/assets/stylesheets/ispconfig.min.css b/interface/web/themes/default/assets/stylesheets/ispconfig.min.css index b4de7690fa..092cb73503 100644 --- a/interface/web/themes/default/assets/stylesheets/ispconfig.min.css +++ b/interface/web/themes/default/assets/stylesheets/ispconfig.min.css @@ -1 +1 @@ -body{overflow-y:scroll}.left{float:left}.right{float:right}.clear:after{content:"";display:table;clear:both}.marginTop15{margin-top:15px}.paddingX5{padding-left:5px !important;padding-right:5px !important}.width65{width:65px}.form-group input[type='checkbox']{margin-top:10px}.control-label{font-weight:normal}.control-label:after{content:":"}.formbutton-default{padding:6px 30px;border-bottom-style:solid;border-bottom-width:2px;font-size:12px;font-weight:bold;transition:all ease 500ms}.formbutton-success{padding:6px 30px;border-style:solid;border-width:1px;border-bottom-width:solid;font-size:12px;font-weight:bold;transition:all ease 500ms}#main-wrapper{margin:0 auto;width:950px}#logo{float:left;width:200px;height:65px;background:url("../images/logo.png") no-repeat}#logo a{display:block;width:100%;height:100%}#headerbar{float:right}#searchform{float:right;margin-top:16px}#searchform>div{position:relative;display:table}#searchform>div>div{display:table-cell;padding-right:8px;vertical-align:top}#searchform .icon{padding:0 2px;font-size:16px}#logout-button{float:right;margin-top:16px;margin-left:25px;border-bottom-style:solid;border-bottom-width:2px;transition:all ease 500ms}#main-navigation{margin-top:24px}#main-navigation a{padding:0 12px;height:70px;border-bottom-style:solid;botder-bottom-width:2px;transition:all ease 500ms}#main-navigation .icon{font-size:32px}#main-navigation .title{margin-top:2px;font-weight:bold}.btn-group-justified .btn{border-right-width:0}.btn-group-justified .btn:last-of-type{border-right-width:1px}#content{width:710px}#sidebar{margin-top:27px;width:215px;border-style:solid;border-width:1px;border-radius:4px}#sidebar header{margin:1px;padding:0 10px;height:40px;line-height:40px;font-weight:bold;border-top-left-radius:2px;border-top-right-radius:2px}#sidebar ul{margin:0;padding:0;list-style:none}#sidebar li{padding:10px;border-top-style:solid;border-top-width:1px;font-size:12px}#sidebar a{text-decoration:none;transition:color ease 500ms}.page-header{margin:20px 0;padding:0}.alert-notification a{font-weight:bold;text-decoration:none;transition:color ease 500ms}.alert-label,.alert-content{display:inline-block;vertical-align:top}.alert-label{width:60px}.modules{margin:0;padding:0;list-style:none}.modules li{float:left;margin-right:15px;margin-bottom:15px;padding:8px;width:200px;border-radius:4px;border-style:solid;border-width:1px}.modules .icon{float:left;margin-right:15px;font-size:50px}.modules .left{margin-top:5px}.modules .title{margin-top:6px;margin-left:20px;font-size:16px;font-weight:bold}.modules .button{margin-top:10px;width:100%;border-bottom-style:solid;border-bottom-width:2px;font-size:12px;font-weight:bold;transition:all ease 500ms}.modules a{text-decoration:none}.table-wrapper{margin-bottom:20px;border-radius:4px;border-style:solid;border-width:1px}.table{margin-bottom:1px}.table caption{padding:5px 10px;text-align:left;font-weight:bold;font-size:18px;border-bottom-style:solid;border-bottom-width:1px}.table tbody tr{border-top-style:solid;border-top-width:1px;transition:background ease 500ms}.table tbody tr:last-child{border-radius:4px}.tfooter{margin-top:-1px;height:40px;border-top-style:solid;border-top-width:1px}.progress{display:inline-block;margin-bottom:0;width:150px;height:10px}.content-tab-wrapper{border-style:solid;border-width:1px;border-radius:4px}.content-tab-wrapper .nav-tabs>li>a{border-radius:0;border:none !important;border-right-style:solid !important;border-right-width:1px !important;outline:0;font-weight:bold;transition:background ease 500ms}.content-tab-wrapper .nav-tabs li:not(:first-child) a{margin-left:-2px}.tab-content{padding:25px 10px}.input-group-btn .icon-calendar{font-size:18px}thead.dark th{height:40px;line-height:40px;font-weight:normal}#footer{margin:20px 0;padding-top:20px;border-top-style:solid;border-top-width:1px;text-align:center;font-size:10px}.menu-btn{display:none;cursor:pointer}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#logo{background-image:url("../images/logo@2x.png");background-size:200px 65px}} \ No newline at end of file +body{overflow-y:scroll}.left{float:left}.right{float:right}.clear:after{content:"";display:table;clear:both}.marginTop15{margin-top:15px}.paddingX5{padding-left:5px !important;padding-right:5px !important}.width65{width:65px}.form-group input[type='checkbox']{margin-top:10px}.control-label{font-weight:normal}.control-label:after{content:":"}.formbutton-default{padding:6px 30px;border-bottom-style:solid;border-bottom-width:2px;font-size:12px;font-weight:bold;transition:all ease 500ms}.formbutton-success{padding:6px 30px;border-style:solid;border-width:1px;border-bottom-width:solid;font-size:12px;font-weight:bold;transition:all ease 500ms}#main-wrapper{margin:0 auto;width:950px}#logo{float:left;width:200px;height:65px;background:url("../images/logo.png") no-repeat}#logo a{display:block;width:100%;height:100%}#headerbar{float:right}#searchform{float:right;margin-top:16px}#searchform>div{position:relative;display:table}#searchform>div>div{display:table-cell;padding-right:8px;vertical-align:top}#searchform .icon{padding:0 2px;font-size:16px}#logout-button{float:right;margin-top:16px;margin-left:25px;border-bottom-style:solid;border-bottom-width:2px;transition:all ease 500ms}#main-navigation{margin-top:24px}#main-navigation a{padding:0 12px;height:70px;border-bottom-style:solid;botder-bottom-width:2px;transition:all ease 500ms}#main-navigation .icon{font-size:32px}#main-navigation .title{margin-top:2px;font-weight:bold}.btn-group-justified .btn{border-right-width:0}.btn-group-justified .btn:last-of-type{border-right-width:1px}#content{width:710px}#sidebar{margin-top:27px;width:215px;border-style:solid;border-width:1px;border-radius:4px}#sidebar header{margin:1px;padding:0 10px;height:40px;line-height:40px;font-weight:bold;border-top-left-radius:2px;border-top-right-radius:2px}#sidebar ul{margin:0;padding:0;list-style:none}#sidebar li{padding:10px;border-top-style:solid;border-top-width:1px;font-size:12px}#sidebar a{text-decoration:none;transition:color ease 500ms}.page-header{margin:20px 0;padding:0}.alert-notification a{font-weight:bold;text-decoration:none;transition:color ease 500ms}.alert-label,.alert-content{display:inline-block;vertical-align:top}.alert-label{width:60px}.modules{margin:0;padding:0;list-style:none}.modules li{float:left;margin-right:15px;margin-bottom:15px;padding:8px;width:200px;border-radius:4px;border-style:solid;border-width:1px}.modules .icon{float:left;margin-right:15px;font-size:50px}.modules .left{margin-top:5px}.modules .title{margin-top:6px;margin-left:20px;font-size:16px;font-weight:bold}.modules .button{margin-top:10px;width:100%;border-bottom-style:solid;border-bottom-width:2px;font-size:12px;font-weight:bold;transition:all ease 500ms}.modules a{text-decoration:none}.table-wrapper{margin-bottom:20px;border-radius:4px;border-style:solid;border-width:1px}.table{margin-bottom:1px}.table caption{padding:5px 10px;text-align:left;font-weight:bold;font-size:18px;border-bottom-style:solid;border-bottom-width:1px}.table tbody tr{border-top-style:solid;border-top-width:1px;transition:background ease 500ms}.table tbody tr:last-child{border-radius:4px}.tfooter{margin-top:-1px;height:40px;border-top-style:solid;border-top-width:1px}.progress{display:inline-block;margin-bottom:0;width:150px;height:10px}.content-tab-wrapper{border-style:solid;border-width:1px;border-radius:4px}.content-tab-wrapper .nav-tabs>li>a{border-radius:0;border:none !important;border-right-style:solid !important;border-right-width:1px !important;outline:0;font-weight:bold;transition:background ease 500ms}.content-tab-wrapper .nav-tabs li:not(:first-child) a{margin-left:-2px}.tab-content{padding:25px 10px}.input-group-btn .icon-calendar{font-size:18px}thead.dark th{height:40px;line-height:40px;font-weight:normal}thead.dark td input,thead.dark td select{width: 100%}#footer{margin:20px 0;padding-top:20px;border-top-style:solid;border-top-width:1px;text-align:center;font-size:10px}.menu-btn{display:none;cursor:pointer}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#logo{background-image:url("../images/logo@2x.png");background-size:200px 65px}} \ No newline at end of file diff --git a/interface/web/vm/templates/openvz_ip_list.htm b/interface/web/vm/templates/openvz_ip_list.htm index 0091e0d51c..861d4a33af 100644 --- a/interface/web/vm/templates/openvz_ip_list.htm +++ b/interface/web/vm/templates/openvz_ip_list.htm @@ -26,7 +26,7 @@ <tr> <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td> <td><select name="search_vm_id">{tmpl_var name='search_vm_id'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" /></div></td> + <td><input type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" /></td> <td><select name="search_reserved">{tmpl_var name='search_reserved'}</select></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','vm/openvz_ip_list.php');">{tmpl_var name="filter_txt"}</button> diff --git a/interface/web/vm/templates/openvz_ostemplate_list.htm b/interface/web/vm/templates/openvz_ostemplate_list.htm index c64ca8a44a..6a2a93a9ee 100644 --- a/interface/web/vm/templates/openvz_ostemplate_list.htm +++ b/interface/web/vm/templates/openvz_ostemplate_list.htm @@ -26,8 +26,8 @@ </tr> <tr> <td><select name="search_active">{tmpl_var name='search_active'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_ostemplate_id" value="{tmpl_var name='search_ostemplate_id'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></div></td> + <td><input type="text" name="search_ostemplate_id" value="{tmpl_var name='search_ostemplate_id'}" /></td> + <td><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></td> <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td> <td><select name="search_allservers">{tmpl_var name='search_allservers'}</select></td> <td> diff --git a/interface/web/vm/templates/openvz_template_list.htm b/interface/web/vm/templates/openvz_template_list.htm index 693272da1a..aa26ebb407 100644 --- a/interface/web/vm/templates/openvz_template_list.htm +++ b/interface/web/vm/templates/openvz_template_list.htm @@ -23,7 +23,7 @@ </tr> <tr> <td><select name="search_active">{tmpl_var name='search_active'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></div></td> + <td><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','vm/openvz_template_list.php');">{tmpl_var name="filter_txt"}</button> </td> diff --git a/interface/web/vm/templates/openvz_vm_list.htm b/interface/web/vm/templates/openvz_vm_list.htm index 73fdc017f6..0b5251db19 100644 --- a/interface/web/vm/templates/openvz_vm_list.htm +++ b/interface/web/vm/templates/openvz_vm_list.htm @@ -27,13 +27,13 @@ <th>{tmpl_var name='search_limit'}</th> </tr> <tr> - <td><div class="col-sm-9"><input type="text" name="search_veid" value="{tmpl_var name='search_veid'}" /></div></td> + <td><input type="text" name="search_veid" value="{tmpl_var name='search_veid'}" /></td> <td><select name="search_active">{tmpl_var name='search_active'}</select></td> <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td> <td><select name="search_ostemplate_id">{tmpl_var name='search_ostemplate_id'}</select></td> <td><select name="search_template_id">{tmpl_var name='search_template_id'}</select></td> - <td><div class="col-sm-9"><input type="text" name="search_hostname" value="{tmpl_var name='search_hostname'}" /></div></td> - <td><div class="col-sm-9"><input type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" /></div></td> + <td><input type="text" name="search_hostname" value="{tmpl_var name='search_hostname'}" /></td> + <td><input type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" /></td> <td> <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','vm/openvz_vm_list.php');">{tmpl_var name="filter_txt"}</button> </td> -- GitLab