From 8ceb0824027750b720f7788e44ed0deb87be6f08 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 07 Jan 2015 07:52:03 -0500
Subject: [PATCH] - Layout fixes - Included new icons and buttons - Layout scaling improved (up to 1260px width)
---
interface/web/sites/templates/shell_user_list.htm | 14
interface/web/client/templates/resellers_list.htm | 22
interface/web/mail/templates/user_quota_stats_list.htm | 8
interface/web/admin/templates/server_config_list.htm | 8
interface/web/sites/templates/ftp_user_list.htm | 16
interface/web/themes/default/assets/stylesheets/select2.png | 0
interface/web/admin/templates/software_update_list.htm | 2
interface/web/mail/templates/spamfilter_config_getmail_edit.htm | 2
interface/web/admin/templates/server_ip_list.htm | 18
interface/web/client/templates/client_edit_address.htm | 2
interface/web/mail/templates/mail_transport_edit.htm | 2
interface/web/help/templates/help_faq_sections_list.htm | 6
interface/web/mail/templates/mail_aliasdomain_list.htm | 12
interface/web/mail/templates/spamfilter_policy_list.htm | 16
interface/web/client/templates/domain_list.htm | 10
interface/web/admin/templates/firewall_list.htm | 14
interface/web/client/templates/client_circle_edit.htm | 2
interface/web/sites/templates/aps_packages_list.htm | 12
interface/web/dns/templates/dns_slave_admin_list.htm | 16
interface/web/admin/templates/server_list.htm | 20
interface/web/help/templates/faq_manage_questions_list.htm | 6
interface/web/mail/templates/mail_user_filter_list.htm | 8
interface/web/mail/templates/spamfilter_users_list.htm | 16
interface/web/admin/templates/server_php_list.htm | 12
interface/web/themes/default/assets/fonts/ispconfig.svg | 45 +
interface/web/dns/templates/dns_soa_list.htm | 16
interface/web/mail/templates/spamfilter_config_list.htm | 8
interface/web/mail/templates/mail_domain_admin_list.htm | 14
interface/web/sites/templates/web_vhost_domain_advanced.htm | 8
interface/web/themes/default/assets/stylesheets/themes/default/theme.css | 11
interface/web/mail/templates/mail_user_filter_edit.htm | 6
interface/web/themes/default_no_navimg/templates/main.tpl.htm | 4
interface/web/admin/templates/system_config_domains_edit.htm | 2
interface/web/sites/templates/database_user_list.htm | 10
interface/web/sites/templates/cron_list.htm | 24
interface/web/client/templates/client_del.htm | 2
interface/web/sites/templates/shell_user_edit.htm | 2
interface/web/client/templates/client_template_list.htm | 12
interface/web/mail/templates/spamfilter_config_mail_edit.htm | 24
interface/web/mail/templates/mail_alias_list.htm | 12
interface/web/vm/templates/openvz_ip_list.htm | 14
interface/web/admin/templates/language_import.htm | 4
interface/web/themes/default/assets/stylesheets/ispconfig.css | 11
interface/web/tools/templates/resync.htm | 24
interface/web/sites/templates/web_childdomain_list.htm | 14
interface/web/sites/templates/database_admin_list.htm | 26
interface/web/client/templates/reseller_edit_address.htm | 2
interface/web/sites/templates/web_vhost_domain_ssl.htm | 8
interface/web/help/templates/support_message_list.htm | 10
interface/web/vm/templates/openvz_vm_edit.htm | 2
interface/web/admin/templates/server_edit_config.htm | 2
interface/web/tools/templates/import_ispconfig.htm | 18
interface/web/vm/templates/openvz_action.htm | 8
interface/web/vm/templates/openvz_ostemplate_list.htm | 16
interface/web/mail/templates/mail_user_list.htm | 22
interface/web/tools/templates/import_vpopmail.htm | 10
interface/web/mail/templates/mail_user_autoresponder_edit.htm | 6
interface/web/sites/templates/aps_install_package.htm | 4
interface/web/mail/templates/mail_domain_list.htm | 12
interface/web/sites/templates/web_vhost_domain_admin_list.htm | 20
interface/web/mail/templates/mail_user_custom_rules_edit.htm | 2
interface/web/dns/templates/dns_slave_list.htm | 14
interface/web/themes/default/assets/stylesheets/themes/dark/theme.min.css | 2
interface/web/mail/templates/mail_blacklist_list.htm | 14
interface/web/sites/templates/database_list.htm | 24
interface/web/sites/templates/web_backup_list.htm | 2
interface/web/client/templates/client_edit_limits.htm | 2
interface/web/dns/templates/dns_soa_admin_list.htm | 18
interface/web/sites/templates/web_vhost_domain_redirect.htm | 2
interface/web/sites/templates/aps_packagedetails_show.htm | 2
interface/web/themes/default_combobox/templates/main.tpl.htm | 6
interface/web/admin/templates/software_package_list.htm | 6
interface/web/help/templates/help_faq_list.htm | 2
interface/web/sites/templates/web_childdomain_advanced.htm | 2
interface/web/tools/templates/dns_import_tupa.htm | 8
interface/web/vm/templates/openvz_ostemplate_edit.htm | 2
interface/web/dashboard/dashlets/templates/limits.htm | 2
interface/web/dns/templates/dns_template_edit.htm | 2
interface/web/mail/templates/spamfilter_config_server_edit.htm | 10
interface/web/mailuser/templates/mail_user_filter_edit.htm | 6
interface/web/vm/templates/openvz_template_list.htm | 10
interface/web/sites/templates/web_folder_user_list.htm | 12
interface/web/admin/templates/users_list.htm | 16
interface/web/monitor/templates/datalog_list.htm | 12
interface/web/mail/templates/mail_user_stats_list.htm | 6
interface/web/mail/templates/spamfilter_whitelist_list.htm | 16
interface/web/sites/templates/web_sites_stats_list.htm | 6
interface/web/mail/templates/mail_forward_list.htm | 12
interface/web/monitor/templates/syslog_list.htm | 14
interface/web/client/templates/message_template.htm | 2
interface/web/admin/templates/language_edit.htm | 2
interface/web/dns/templates/dns_a_list.htm | 18
interface/web/vm/templates/openvz_template_edit.htm | 2
interface/web/themes/default/assets/stylesheets/themes/default/theme.min.css | 2
interface/web/sites/templates/user_quota_stats_list.htm | 8
interface/web/themes/default/assets/fonts/ispconfig.ttf | 0
interface/web/dashboard/dashlets/templates/mailquota.htm | 2
interface/web/mail/templates/mail_content_filter_list.htm | 14
interface/web/themes/default/assets/stylesheets/select2-spinner.gif | 0
interface/web/mail/templates/mail_user_backup_list.htm | 2
interface/web/sites/templates/web_vhost_domain_list.htm | 18
interface/web/js/scrigo.js.php | 4
interface/web/sites/templates/webdav_user_list.htm | 14
interface/web/mail/templates/mail_relay_recipient_list.htm | 12
interface/web/login/templates/index.htm | 2
interface/web/themes/default_64_navimg/templates/main.tpl.htm | 4
interface/web/mail/templates/mail_mailinglist_list.htm | 10
interface/web/admin/templates/software_repo_list.htm | 12
interface/web/admin/templates/directive_snippets_edit.htm | 2
interface/web/mailuser/templates/mail_user_filter_list.htm | 8
interface/web/admin/templates/groups_list.htm | 10
interface/web/themes/default/assets/fonts/ispconfig.eot | 0
interface/web/help/templates/faq_edit.htm | 2
interface/web/sites/templates/database_user_admin_list.htm | 10
interface/web/admin/templates/iptables_list.htm | 14
interface/web/mail/templates/spamfilter_blacklist_list.htm | 16
interface/web/dns/templates/dns_dkim_edit.htm | 2
interface/web/themes/default/assets/stylesheets/fonts.css | 24
interface/web/mailuser/templates/mail_user_autoresponder_edit.htm | 6
interface/web/themes/default/assets/stylesheets/fonts.min.css | 71 --
interface/web/dns/templates/dns_template_list.htm | 10
interface/web/admin/templates/directive_snippets_list.htm | 12
interface/web/dashboard/dashlets/templates/quota.htm | 2
interface/web/mail/templates/mail_get_list.htm | 16
interface/web/sites/templates/aps_instances_list.htm | 14
interface/lib/classes/listform.inc.php | 28
interface/web/client/templates/client_circle_list.htm | 14
interface/web/sites/templates/database_quota_stats_list.htm | 6
interface/web/sites/templates/web_folder_list.htm | 14
interface/web/admin/templates/language_list.htm | 2
interface/web/mail/templates/mail_domain_catchall_list.htm | 12
interface/web/themes/blue/templates/main.tpl.htm | 6
interface/web/client/templates/clients_list.htm | 24
interface/web/themes/default/assets/stylesheets/themes/dark/theme.css | 11
interface/web/tools/templates/import_plesk.htm | 16
interface/web/help/templates/support_message_edit.htm | 2
interface/web/vm/templates/openvz_vm_list.htm | 22
interface/web/themes/default/assets/stylesheets/ispconfig.min.css | 2
interface/web/mail/templates/mail_domain_edit.htm | 6
interface/web/admin/templates/remote_user_list.htm | 8
interface/web/mail/templates/mail_whitelist_list.htm | 14
interface/web/themes/default/assets/fonts/ispconfig.woff | 0
interface/web/admin/templates/groups_edit.htm | 2
interface/web/client/templates/message_template_list.htm | 10
interface/web/client/templates/client_message.htm | 2
interface/web/client/templates/client_message_template_list.htm | 10
interface/web/mail/templates/mail_transport_list.htm | 16
147 files changed, 740 insertions(+), 743 deletions(-)
diff --git a/interface/lib/classes/listform.inc.php b/interface/lib/classes/listform.inc.php
index 1b613a9..ef4d088 100644
--- a/interface/lib/classes/listform.inc.php
+++ b/interface/lib/classes/listform.inc.php
@@ -348,29 +348,33 @@
sort($show_pages);
$show_pages = array_unique($show_pages);
-
+
+ $content = '<nav>
+ <ul class="pagination">';
+
//* Show Back
if(isset($vars['show_page_back']) && $vars['show_page_back'] == 1){
- $content = '<a class="btn-page first-page" href="'."javascript:loadContent('".$vars['list_file'].'?page=0'.$vars['page_params']."');".'">'
- .'<img src="themes/'.$_SESSION['s']['theme'].'/icons/x16/arrow_stop_180.png"></a> ';
- $content .= '<a class="btn-page previous-page" href="'."javascript:loadContent('".$vars['list_file'].'?page='.$vars['last_page'].$vars['page_params']."');".'">'
- .'<img src="themes/'.$_SESSION['s']['theme'].'/icons/x16/arrow_180.png"></a> ';
+ $content .= '<li><a href="'."javascript:loadContent('".$vars['list_file'].'?page=0'.$vars['page_params']."');".'" aria-label="First">
+ <span aria-hidden="true">«</span></a></li>';
+ $content .= '<li><a href="'."javascript:loadContent('".$vars['list_file'].'?page='.$vars['last_page'].$vars['page_params']."');".'" aria-label="Previous">
+ <span aria-hidden="true">‹</span></a></li>';
}
- $content .= ' '.$this->lng('page_txt').' ';
$prev = -1;
foreach($show_pages as $p) {
- if($prev != -1 && $p > $prev + 1) $content .= '<span class="page-spacer">...</span>';
- $content .= '<a class="link-page' . ($p == $vars['page'] ? ' current-page' : '') . '" href="'."javascript:loadContent('".$vars['list_file'].'?page='.$p.$vars['page_params']."');".'">'. ($p+1) .'</a>';
+ if($prev != -1 && $p > $prev + 1) $content .= '<li class="disabled"><a href="#">…</a></li>';
+ $content .= '<li' . ($p == $vars['page'] ? ' class="active"' : '') . '><a href="'."javascript:loadContent('".$vars['list_file'].'?page='.$p.$vars['page_params']."');".'">'. ($p+1) .'</a></li>';
$prev = $p;
}
//.$vars['next_page'].' '.$this->lng('page_of_txt').' '.$vars['max_pages'].' ';
//* Show Next
if(isset($vars['show_page_next']) && $vars['show_page_next'] == 1){
- $content .= '<a class="btn-page next-page" href="'."javascript:loadContent('".$vars['list_file'].'?page='.$vars['next_page'].$vars['page_params']."');".'">'
- .'<img src="themes/'.$_SESSION['s']['theme'].'/icons/x16/arrow.png"></a> ';
- $content .= '<a class="btn-page last-page" href="'."javascript:loadContent('".$vars['list_file'].'?page='.$vars['pages'].$vars['page_params']."');".'">'
- .'<img src="themes/'.$_SESSION['s']['theme'].'/icons/x16/arrow_stop.png"></a>';
+ $content .= '<li><a href="'."javascript:loadContent('".$vars['list_file'].'?page='.$vars['next_page'].$vars['page_params']."');".'" aria-label="Next">
+ <span aria-hidden="true">›</span></a></li>';
+ $content .= '<li><a href="'."javascript:loadContent('".$vars['list_file'].'?page='.$vars['pages'].$vars['page_params']."');".'" aria-label="Last">
+ <span aria-hidden="true">»</span></a></li>';
}
+ $content .= '</ul></nav>';
+
return $content;
}
diff --git a/interface/web/admin/templates/directive_snippets_edit.htm b/interface/web/admin/templates/directive_snippets_edit.htm
index 204f60d..1b3d89a 100644
--- a/interface/web/admin/templates/directive_snippets_edit.htm
+++ b/interface/web/admin/templates/directive_snippets_edit.htm
@@ -17,7 +17,7 @@
</div></div>
<div class="form-group">
<label for="snippet" class="col-sm-3 control-label">{tmpl_var name='snippet_txt'}</label>
- <div class="col-sm-9"><textarea name="snippet" id="snippet" rows='10' cols='50' style="width:400px;">{tmpl_var name='snippet'}</textarea></div><span class="nginx"> {tmpl_var name='variables_txt'}: </span><a href="javascript:void(0);" class="addPlaceholder nginx">{DOCROOT}</a><span class="nginx">, </span><a href="javascript:void(0);" class="addPlaceholder nginx">{FASTCGIPASS}</a>
+ <div class="col-sm-9"><textarea class="form-control" name="snippet" id="snippet" rows='10' cols='50' style="width:400px;">{tmpl_var name='snippet'}</textarea></div><span class="nginx"> {tmpl_var name='variables_txt'}: </span><a href="javascript:void(0);" class="addPlaceholder nginx">{DOCROOT}</a><span class="nginx">, </span><a href="javascript:void(0);" class="addPlaceholder nginx">{FASTCGIPASS}</a>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='customer_viewable_txt'}</label>
diff --git a/interface/web/admin/templates/directive_snippets_list.htm b/interface/web/admin/templates/directive_snippets_list.htm
index 49d931a..e2fbf05 100644
--- a/interface/web/admin/templates/directive_snippets_list.htm
+++ b/interface/web/admin/templates/directive_snippets_list.htm
@@ -14,7 +14,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="active_txt"></th>
<th><tmpl_var name="name_txt"></th>
@@ -22,11 +22,11 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <td><select name="search_active">{tmpl_var name='search_active'}</select></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><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><input class="form-control" type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
+ <td><select class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/directive_snippets_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -37,7 +37,7 @@
<td><a href="#" data-load-content="admin/directive_snippets_edit.php?id={tmpl_var name='id'}">{tmpl_var name="name"}</a></td>
<td><a href="#" data-load-content="admin/directive_snippets_edit.php?id={tmpl_var name='id'}">{tmpl_var name="type"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('admin/directive_snippets_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('admin/directive_snippets_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/admin/templates/firewall_list.htm b/interface/web/admin/templates/firewall_list.htm
index 836443a..8d07ba8 100644
--- a/interface/web/admin/templates/firewall_list.htm
+++ b/interface/web/admin/templates/firewall_list.htm
@@ -14,7 +14,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="active_txt"></th>
<th><tmpl_var name="server_id_txt"></th>
@@ -23,12 +23,12 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<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><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><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><input class="form-control" type="text" name="search_tcp_port" value="{tmpl_var name='search_tcp_port'}" /></td>
+ <td><input class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/firewall_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -40,7 +40,7 @@
<td><a href="#" data-load-content="admin/firewall_edit.php?id={tmpl_var name='id'}">{tmpl_var name="tcp_port"}</a></td>
<td><a href="#" data-load-content="admin/firewall_edit.php?id={tmpl_var name='id'}">{tmpl_var name="udp_port"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('admin/firewall_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('admin/firewall_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/admin/templates/groups_edit.htm b/interface/web/admin/templates/groups_edit.htm
index 757c7f0..3ec77e6 100644
--- a/interface/web/admin/templates/groups_edit.htm
+++ b/interface/web/admin/templates/groups_edit.htm
@@ -11,7 +11,7 @@
</div></div>
<div class="form-group">
<label for="description" class="col-sm-3 control-label">{tmpl_var name='description_txt'}</label>
- <div class="col-sm-9"><textarea name="description" id="description" rows='5' cols='30'>{tmpl_var name='description'}</textarea></div>
+ <div class="col-sm-9"><textarea class="form-control" name="description" id="description" rows='5' cols='30'>{tmpl_var name='description'}</textarea></div>
</div>
diff --git a/interface/web/admin/templates/groups_list.htm b/interface/web/admin/templates/groups_list.htm
index c9048dd..3478b87 100644
--- a/interface/web/admin/templates/groups_list.htm
+++ b/interface/web/admin/templates/groups_list.htm
@@ -15,17 +15,17 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="name_txt"></th>
<th><tmpl_var name="description_txt"></th>
<th> </th>
</tr>
<tr>
- <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><input class="form-control" type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
+ <td><input class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/groups_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -35,7 +35,7 @@
<td><a href="#" data-load-content="admin/groups_edit.php?id={tmpl_var name='id'}">{tmpl_var name="name"}</a></td>
<td><a href="#" data-load-content="admin/groups_edit.php?id={tmpl_var name='id'}">{tmpl_var name="description"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('admin/groups_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('admin/groups_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/admin/templates/iptables_list.htm b/interface/web/admin/templates/iptables_list.htm
index 4e386ad..6612176 100644
--- a/interface/web/admin/templates/iptables_list.htm
+++ b/interface/web/admin/templates/iptables_list.htm
@@ -13,7 +13,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="active_txt"></th>
<th><tmpl_var name="server_id_txt"></th>
@@ -26,16 +26,16 @@
<th> </th>
</tr>
<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><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
<td></td>
- <td><select name="search_protocol">{tmpl_var name='search_protocol'}</select></td>
+ <td><select class="form-control" name="search_protocol">{tmpl_var name='search_protocol'}</select></td>
<td></td>
<td></td>
<td></td>
- <td><select name="search_target">{tmpl_var name='search_target'}</select></td>
+ <td><select class="form-control" name="search_target">{tmpl_var name='search_target'}</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/iptables_list.php');">{tmpl_var name="filter_txt"}filter_txt</button>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/iptables_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -51,7 +51,7 @@
<td><a href="#" data-load-content="admin/iptables_edit.php?id={tmpl_var name='id'}">{tmpl_var name="state"}</a></td>
<td><a href="#" data-load-content="admin/iptables_edit.php?id={tmpl_var name='id'}">{tmpl_var name="target"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('admin/iptables_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('admin/iptables_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/admin/templates/language_edit.htm b/interface/web/admin/templates/language_edit.htm
index 0ae325f..91ab9a3 100644
--- a/interface/web/admin/templates/language_edit.htm
+++ b/interface/web/admin/templates/language_edit.htm
@@ -9,7 +9,7 @@
<tmpl_loop name="records">
<span class="wf_oneField">
<label for="records[{tmpl_var name="key"}]" class="wf_preField">{tmpl_var name="key"}</label>
- <div class="col-sm-9"><input type="text" id="records[{tmpl_var name="key"}]" name="records[{tmpl_var name="key"}]" value="{tmpl_var name='val'}" >
+ <div class="col-sm-9"><input class="form-control" type="text" id="records[{tmpl_var name="key"}]" name="records[{tmpl_var name="key"}]" value="{tmpl_var name='val'}" >
</div></span>
</tmpl_loop>
</span>
diff --git a/interface/web/admin/templates/language_import.htm b/interface/web/admin/templates/language_import.htm
index ee32ff7..0dfc3a0 100644
--- a/interface/web/admin/templates/language_import.htm
+++ b/interface/web/admin/templates/language_import.htm
@@ -12,13 +12,13 @@
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='language_overwrite_txt'}</label>
<div class="col-sm-9">
- <div class="col-sm-9"><input type="checkbox" id="overwrite" value="1" name="overwrite"/>
+ <div class="col-sm-9"><input class="form-control" type="checkbox" id="overwrite" value="1" name="overwrite"/>
</div></div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='ignore_version_txt'}</label>
<div class="col-sm-9">
- <div class="col-sm-9"><input type="checkbox" id="ignore_version" value="1" name="ignore_version"/>
+ <div class="col-sm-9"><input class="form-control" type="checkbox" id="ignore_version" value="1" name="ignore_version"/>
</div></div>
</div>
diff --git a/interface/web/admin/templates/language_list.htm b/interface/web/admin/templates/language_list.htm
index 0109fa8..8021391 100644
--- a/interface/web/admin/templates/language_list.htm
+++ b/interface/web/admin/templates/language_list.htm
@@ -20,7 +20,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="module_txt"></th>
<th><tmpl_var name="lang_file_txt"></th>
diff --git a/interface/web/admin/templates/remote_user_list.htm b/interface/web/admin/templates/remote_user_list.htm
index f35cdc1..719ef05 100644
--- a/interface/web/admin/templates/remote_user_list.htm
+++ b/interface/web/admin/templates/remote_user_list.htm
@@ -13,7 +13,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="parent_remote_userid_txt"></th>
<th><tmpl_var name="username_txt"></th>
@@ -21,9 +21,9 @@
</tr>
<tr>
<td> </td>
- <td><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
+ <td><input class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/remote_user_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -33,7 +33,7 @@
<td><a href="#" data-load-content="admin/remote_user_edit.php?id={tmpl_var name='remote_userid'}">{tmpl_var name="remote_userid"}</a></td>
<td><a href="#" data-load-content="admin/remote_user_edit.php?id={tmpl_var name='remote_userid'}">{tmpl_var name="remote_username"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('admin/remote_user_del.php?id={tmpl_var name='remote_userid'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('admin/remote_user_del.php?id={tmpl_var name='remote_userid'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/admin/templates/server_config_list.htm b/interface/web/admin/templates/server_config_list.htm
index cc35e07..d0a22c0 100644
--- a/interface/web/admin/templates/server_config_list.htm
+++ b/interface/web/admin/templates/server_config_list.htm
@@ -7,15 +7,15 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="server_name_txt"></th>
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <td><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></td>
+ <td><input class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/server_config_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -24,7 +24,7 @@
<tr>
<td><a href="#" data-load-content="admin/server_config_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_name"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('admin/server_config_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('admin/server_config_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/admin/templates/server_edit_config.htm b/interface/web/admin/templates/server_edit_config.htm
index aa3f34f..2ce1bcb 100644
--- a/interface/web/admin/templates/server_edit_config.htm
+++ b/interface/web/admin/templates/server_edit_config.htm
@@ -7,7 +7,7 @@
<div class="form-group">
<label for="config" class="col-sm-3 control-label">{tmpl_var name='config_txt'}</label>
- <div class="col-sm-9"><textarea name="config" id="config" rows='20' cols='40'>{tmpl_var name='config'}</textarea></div>
+ <div class="col-sm-9"><textarea class="form-control" name="config" id="config" rows='20' cols='40'>{tmpl_var name='config'}</textarea></div>
</div>
diff --git a/interface/web/admin/templates/server_ip_list.htm b/interface/web/admin/templates/server_ip_list.htm
index 130eb71..0ec6ddb 100644
--- a/interface/web/admin/templates/server_ip_list.htm
+++ b/interface/web/admin/templates/server_ip_list.htm
@@ -13,7 +13,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="server_id_txt"></th>
<th><tmpl_var name="client_id_txt"></th>
@@ -24,14 +24,14 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<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><select name="search_ip_type">{tmpl_var name='search_ip_type'}</select></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><input type="text" name="search_virtualhost_port" value="{tmpl_var name='search_virtualhost_port'}" /></td>
+ <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><select class="form-control" name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
+ <td><select class="form-control" name="search_ip_type">{tmpl_var name='search_ip_type'}</select></td>
+ <td><input class="form-control" type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" /></td>
+ <td><select class="form-control" name="search_virtualhost">{tmpl_var name='search_virtualhost'}</select></td>
+ <td><input class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/server_ip_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -45,7 +45,7 @@
<td><a href="#" data-load-content="admin/server_ip_edit.php?id={tmpl_var name='id'}">{tmpl_var name="virtualhost"}</a></td>
<td><a href="#" data-load-content="admin/server_ip_edit.php?id={tmpl_var name='id'}">{tmpl_var name="virtualhost_port"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('admin/server_ip_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('admin/server_ip_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/admin/templates/server_list.htm b/interface/web/admin/templates/server_list.htm
index 0885f36..1660c0e 100644
--- a/interface/web/admin/templates/server_list.htm
+++ b/interface/web/admin/templates/server_list.htm
@@ -7,7 +7,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="server_name_txt"></th>
<th><tmpl_var name="mail_server_txt"></th>
@@ -19,15 +19,15 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <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>
- <td><select name="search_active">{tmpl_var name='search_file_server'}</select></td>
- <td><select name="search_active">{tmpl_var name='search_db_server'}</select></td>
- <td><select name="search_active">{tmpl_var name='search_vserver_server'}</select></td>
+ <td><input class="form-control" type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></td>
+ <td><select class="form-control" name="search_active">{tmpl_var name='search_mail_server'}</select></td>
+ <td><select class="form-control" name="search_active">{tmpl_var name='search_web_server'}</select></td>
+ <td><select class="form-control" name="search_active">{tmpl_var name='search_dns_server'}</select></td>
+ <td><select class="form-control" name="search_active">{tmpl_var name='search_file_server'}</select></td>
+ <td><select class="form-control" name="search_active">{tmpl_var name='search_db_server'}</select></td>
+ <td><select class="form-control" name="search_active">{tmpl_var name='search_vserver_server'}</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/server_list.php');">{tmpl_var name="filter_txt"}</button>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/server_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -42,7 +42,7 @@
<td>{tmpl_var name="db_server"}</td>
<td>{tmpl_var name="vserver_server"}</td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('admin/server_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('admin/server_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/admin/templates/server_php_list.htm b/interface/web/admin/templates/server_php_list.htm
index 5f3b9c8..3151a82 100644
--- a/interface/web/admin/templates/server_php_list.htm
+++ b/interface/web/admin/templates/server_php_list.htm
@@ -13,7 +13,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="server_id_txt"></th>
<th><tmpl_var name="client_id_txt"></th>
@@ -21,11 +21,11 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<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><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
+ <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><select class="form-control" name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
+ <td><input class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/server_php_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -36,7 +36,7 @@
<td><a href="#" data-load-content="admin/server_php_edit.php?id={tmpl_var name='id'}">{tmpl_var name="client_id"}</a></td>
<td><a href="#" data-load-content="admin/server_php_edit.php?id={tmpl_var name='id'}">{tmpl_var name="name"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('admin/server_php_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('admin/server_php_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/admin/templates/software_package_list.htm b/interface/web/admin/templates/software_package_list.htm
index 5d8e4b9..4a2d241 100644
--- a/interface/web/admin/templates/software_package_list.htm
+++ b/interface/web/admin/templates/software_package_list.htm
@@ -14,7 +14,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="installed_txt"></th>
<th><tmpl_var name="package_title_txt"></th>
@@ -32,8 +32,8 @@
<td>{tmpl_var name="package_description"}</td>
<td>ispapp{tmpl_var name="package_id"}</td>
<td>
- <a class="btn btn-default formbutton-default" data-load-content="admin/software_package_edit.php?id={tmpl_var name='package_id'}">{tmpl_var name='edit_txt'}</button>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('admin/software_package_del.php?software_update_inst_id={tmpl_var name='software_update_inst_id'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-default formbutton-narrow" data-load-content="admin/software_package_edit.php?id={tmpl_var name='package_id'}"><span class="icon icon-edit"></span></button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('admin/software_package_del.php?software_update_inst_id={tmpl_var name='software_update_inst_id'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_if>
diff --git a/interface/web/admin/templates/software_repo_list.htm b/interface/web/admin/templates/software_repo_list.htm
index eb71fab..794465e 100644
--- a/interface/web/admin/templates/software_repo_list.htm
+++ b/interface/web/admin/templates/software_repo_list.htm
@@ -14,7 +14,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="active_txt"></th>
<th><tmpl_var name="repo_name_txt"></th>
@@ -22,11 +22,11 @@
<th> </th>
</tr>
<tr>
- <td><select name="search_active">{tmpl_var name='search_active'}</select></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><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><input class="form-control" type="text" name="search_repo_name" value="{tmpl_var name='search_repo_name'}" /></td>
+ <td><input class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/software_repo_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -37,7 +37,7 @@
<td><a href="#" data-load-content="admin/software_repo_edit.php?id={tmpl_var name='id'}">{tmpl_var name="repo_name"}</a></td>
<td><a href="#" data-load-content="admin/software_repo_edit.php?id={tmpl_var name='id'}">{tmpl_var name="repo_url"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('admin/software_repo_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('admin/software_repo_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/admin/templates/software_update_list.htm b/interface/web/admin/templates/software_update_list.htm
index 4adcda3..60ee779 100644
--- a/interface/web/admin/templates/software_update_list.htm
+++ b/interface/web/admin/templates/software_update_list.htm
@@ -22,7 +22,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="installed_txt"></th>
<th><tmpl_var name="update_title_txt"></th>
diff --git a/interface/web/admin/templates/system_config_domains_edit.htm b/interface/web/admin/templates/system_config_domains_edit.htm
index db1853f..da384d4 100644
--- a/interface/web/admin/templates/system_config_domains_edit.htm
+++ b/interface/web/admin/templates/system_config_domains_edit.htm
@@ -17,7 +17,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='new_domain_txt'}</label>
<div class="col-sm-9">
- <div class="col-sm-9"><textarea name="new_domain_html" id="new_domain_html" style="width: 500px; height: 250px">{tmpl_var name='new_domain_html'}</textarea></div>
+ <div class="col-sm-9"><textarea class="form-control" name="new_domain_html" id="new_domain_html" style="width: 500px; height: 250px">{tmpl_var name='new_domain_html'}</textarea></div>
</div>
</div>
diff --git a/interface/web/admin/templates/users_list.htm b/interface/web/admin/templates/users_list.htm
index 746daa1..b96ed7a 100644
--- a/interface/web/admin/templates/users_list.htm
+++ b/interface/web/admin/templates/users_list.htm
@@ -15,7 +15,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="client_id_txt"></th>
<th><tmpl_var name="active_txt"></th>
@@ -24,12 +24,12 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <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><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><input class="form-control" type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></td>
+ <td><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><input class="form-control" type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
+ <td><select class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/users_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -42,8 +42,8 @@
<td>{tmpl_var name="groups"}</td>
<td>
<tmpl_if name="username" op="!=" value="admin">
- <a class="btn btn-default formbutton-default" data-load-content="login/login_as.php?cid={tmpl_var name='client_id'}">{tmpl_var name='login_as_txt'}</button>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('admin/users_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-success formbutton-narrow" data-load-content="login/login_as.php?cid={tmpl_var name='client_id'}"><span class="icon icon-loginas"></span></button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('admin/users_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</tmpl_if>
</td>
</tr>
diff --git a/interface/web/client/templates/client_circle_edit.htm b/interface/web/client/templates/client_circle_edit.htm
index e8d58d9..3438b73 100644
--- a/interface/web/client/templates/client_circle_edit.htm
+++ b/interface/web/client/templates/client_circle_edit.htm
@@ -17,7 +17,7 @@
</div>
<div class="form-group">
<label for="description" class="col-sm-3 control-label">{tmpl_var name='description_txt'}</label>
- <div class="col-sm-9"><textarea name="description" id="description" rows='10' cols='30'>{tmpl_var name='description'}</textarea></div>
+ <div class="col-sm-9"><textarea class="form-control" name="description" id="description" rows='10' cols='30'>{tmpl_var name='description'}</textarea></div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
diff --git a/interface/web/client/templates/client_circle_list.htm b/interface/web/client/templates/client_circle_list.htm
index e45aa67..60257f2 100644
--- a/interface/web/client/templates/client_circle_list.htm
+++ b/interface/web/client/templates/client_circle_list.htm
@@ -14,7 +14,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="circle_id_txt"></th>
<th><tmpl_var name="active_txt"></th>
@@ -23,12 +23,12 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <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><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><input class="form-control" type="text" name="search_circle_id" value="{tmpl_var name='search_circle_id'}" /></td>
+ <td><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><input class="form-control" type="text" name="search_circle_name" value="{tmpl_var name='search_circle_name'}" /></td>
+ <td><input class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','client/client_circle_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -40,7 +40,7 @@
<td><a href="#" data-load-content="client/client_circle_edit.php?id={tmpl_var name='id'}">{tmpl_var name="circle_name"}</a></td>
<td><a href="#" data-load-content="client/client_circle_edit.php?id={tmpl_var name='id'}">{tmpl_var name="description"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('client/client_circle_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('client/client_circle_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/client/templates/client_del.htm b/interface/web/client/templates/client_del.htm
index 9351f6e..7a435f0 100644
--- a/interface/web/client/templates/client_del.htm
+++ b/interface/web/client/templates/client_del.htm
@@ -16,7 +16,7 @@
</tmpl_if>
</div>
- <div class="col-sm-9"><input type="checkbox" name="confirm" value="yes" /> </div><b><tmpl_var name="confirm_action_txt"></b>
+ <div class="col-sm-9"><input class="form-control" type="checkbox" name="confirm" value="yes" /> </div><b><tmpl_var name="confirm_action_txt"></b>
<input type="hidden" name="id" value="{tmpl_var name='id'}">
diff --git a/interface/web/client/templates/client_edit_address.htm b/interface/web/client/templates/client_edit_address.htm
index 00b40e1..3ff897c 100644
--- a/interface/web/client/templates/client_edit_address.htm
+++ b/interface/web/client/templates/client_edit_address.htm
@@ -151,7 +151,7 @@
</div></div>
<div class="form-group">
<label for="notes" class="col-sm-3 control-label">{tmpl_var name='notes_txt'}</label>
- <div class="col-sm-9"><textarea name="notes" id="notes" rows='10' cols='30'>{tmpl_var name='notes'}</textarea></div>
+ <div class="col-sm-9"><textarea class="form-control" name="notes" id="notes" rows='10' cols='30'>{tmpl_var name='notes'}</textarea></div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='locked_txt'}</label>
diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm
index c01523b..e643b5d 100644
--- a/interface/web/client/templates/client_edit_limits.htm
+++ b/interface/web/client/templates/client_edit_limits.htm
@@ -48,7 +48,7 @@
</div></div>
<div class="form-group">
<label for="reseller" class="col-sm-3 control-label">{tmpl_var name='reseller_txt'}</label>
- <div class="col-sm-9"><input type="checkbox" name="reseller" value="1" id="reseller" />
+ <div class="col-sm-9"><input class="form-control" type="checkbox" name="reseller" value="1" id="reseller" />
</div></div>
</tmpl_if>
<div class="subsectiontoggle"><span class="showing"></span>{tmpl_var name='web_limits_txt'}<em class="showing"></em></div>
diff --git a/interface/web/client/templates/client_message.htm b/interface/web/client/templates/client_message.htm
index 9652d29..72432f8 100644
--- a/interface/web/client/templates/client_message.htm
+++ b/interface/web/client/templates/client_message.htm
@@ -27,7 +27,7 @@
</div></div>
<div class="form-group">
<label for="message" class="col-sm-3 control-label">{tmpl_var name='message_txt'}</label>
- <div class="col-sm-9"><textarea name="message" id="message" rows='' cols='' style="width:500px">{tmpl_var name='message'}</textarea></div> {tmpl_var name="variables_txt"} {tmpl_var name="message_variables"}
+ <div class="col-sm-9"><textarea class="form-control" name="message" id="message" rows='' cols='' style="width:500px">{tmpl_var name='message'}</textarea></div> {tmpl_var name="variables_txt"} {tmpl_var name="message_variables"}
</div>
<div class="clear"><div class="right">
diff --git a/interface/web/client/templates/client_message_template_list.htm b/interface/web/client/templates/client_message_template_list.htm
index ed31a1c..a7ab5cd 100644
--- a/interface/web/client/templates/client_message_template_list.htm
+++ b/interface/web/client/templates/client_message_template_list.htm
@@ -13,16 +13,16 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="template_type_txt"></th>
<th><tmpl_var name="template_name_txt"></th>
<th> </th>
</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><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>
+ <td><select class="form-control" name="search_template_type" onChange="submitForm('pageForm','client/message_template_list.php');">{tmpl_var name='search_template_type'}</select></td>
+ <td><input class="form-control" 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-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','client/message_template_list.php');"><span class="icon icon-filter"></span></button></div></td>
</tr>
</thead>
<tbody>
@@ -32,7 +32,7 @@
<td><a href="#" data-load-content="client/message_template_edit.php?id={tmpl_var name='id'}">{tmpl_var name="template_name"}</a></td>
<td>
<div class="buttons icons16">
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('client/message_template_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('client/message_template_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</div>
</td>
</tr>
diff --git a/interface/web/client/templates/client_template_list.htm b/interface/web/client/templates/client_template_list.htm
index 26c9ed3..fa0eb67 100644
--- a/interface/web/client/templates/client_template_list.htm
+++ b/interface/web/client/templates/client_template_list.htm
@@ -14,7 +14,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="template_id_txt"></th>
<th><tmpl_var name="template_type_txt"></th>
@@ -22,11 +22,11 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <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><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></td>
+ <td><input class="form-control" type="text" name="search_template_id" value="{tmpl_var name='search_template_id'}" /></td>
+ <td><select class="form-control" name="search_template_type">{tmpl_var name='search_template_type'}</select></td>
+ <td><input class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','client/client_template_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -37,7 +37,7 @@
<td><a href="#" data-load-content="client/client_template_edit.php?id={tmpl_var name='id'}">{tmpl_var name="template_type"}</a></td>
<td><a href="#" data-load-content="client/client_template_edit.php?id={tmpl_var name='id'}">{tmpl_var name="template_name"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('client/client_template_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('client/client_template_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/client/templates/clients_list.htm b/interface/web/client/templates/clients_list.htm
index b1b54db..8070020 100644
--- a/interface/web/client/templates/clients_list.htm
+++ b/interface/web/client/templates/clients_list.htm
@@ -14,7 +14,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="client_id_txt"></th>
<th><tmpl_var name="company_name_txt"></th>
@@ -26,15 +26,15 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <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><input class="form-control" type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></td>
+ <td><input class="form-control" type="text" name="search_company_name" value="{tmpl_var name='search_company_name'}" /></td>
+ <td><input class="form-control" type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" /></td>
+ <td><input class="form-control" type="text" name="search_customer_no" value="{tmpl_var name='search_customer_no'}" /></td>
+ <td><input class="form-control" type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
+ <td><input class="form-control" type="text" name="search_city" value="{tmpl_var name='search_city'}" /></td>
+ <td><select class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','client/client_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -50,11 +50,11 @@
<td><a href="#" data-load-content="client/client_edit.php?id={tmpl_var name='id'}"><div class="country-{tmpl_var name="countryiso"}" style="float:left"></div>{tmpl_var name="country"}</a></td>
<td>
<tmpl_if name="is_admin">
- <a class="btn btn-default formbutton-default" data-load-content="login/login_as.php?cid={tmpl_var name='id'}">{tmpl_var name='login_as_txt'}</button>
+ <a class="btn btn-default formbutton-success formbutton-narrow" data-load-content="login/login_as.php?cid={tmpl_var name='id'}"><span class="icon icon-loginas"></span></button>
<tmpl_elseif name="is_reseller">
- <a class="btn btn-default formbutton-default" data-load-content="login/login_as.php?cid={tmpl_var name='id'}">{tmpl_var name='login_as_txt'}</button>
+ <a class="btn btn-default formbutton-success formbutton-narrow" data-load-content="login/login_as.php?cid={tmpl_var name='id'}"><span class="icon icon-loginas"></span></button>
</tmpl_if>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('client/client_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('client/client_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/client/templates/domain_list.htm b/interface/web/client/templates/domain_list.htm
index 39940ad..d3fb7f7 100644
--- a/interface/web/client/templates/domain_list.htm
+++ b/interface/web/client/templates/domain_list.htm
@@ -14,16 +14,16 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="domain_txt"></th>
<th><tmpl_var name="user_txt"></th>
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <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>
+ <td><input class="form-control" type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+ <td><select class="form-control" name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
+ <td><button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name='filter_txt'}" onclick="submitForm('pageForm','client/domain_list.php');"><span class="icon icon-filter"></span></button></td>
</tr>
</thead>
<tbody>
@@ -32,7 +32,7 @@
<td><a href="#" data-load-content="client/domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="domain"}</a></td>
<td><a href="#" data-load-content="client/domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="sys_groupid"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('client/domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('client/domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/client/templates/message_template.htm b/interface/web/client/templates/message_template.htm
index 39dc876..b2b15ce 100644
--- a/interface/web/client/templates/message_template.htm
+++ b/interface/web/client/templates/message_template.htm
@@ -24,7 +24,7 @@
</div>
<div class="form-group">
<label for="message" class="col-sm-3 control-label">{tmpl_var name='message_txt'}</label>
- <div class="col-sm-9"><textarea name="message" id="message" rows='' cols='' style="width:500px">{tmpl_var name='message'}</textarea></div>
+ <div class="col-sm-9"><textarea class="form-control" name="message" id="message" rows='' cols='' style="width:500px">{tmpl_var name='message'}</textarea></div>
<br clear="all">{tmpl_var name='variables_txt'}: {tmpl_var name="message_variables"} <br />{tmpl_var name='variables_description_txt'}
</div>
<div class="clear"><div class="right">
diff --git a/interface/web/client/templates/message_template_list.htm b/interface/web/client/templates/message_template_list.htm
index 3e98e7b..8696459 100644
--- a/interface/web/client/templates/message_template_list.htm
+++ b/interface/web/client/templates/message_template_list.htm
@@ -13,16 +13,16 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="template_type_txt"></th>
<th><tmpl_var name="template_name_txt"></th>
<th> </th>
</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><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>
+ <td><select class="form-control" name="search_template_type" onChange="submitForm('pageForm','billing/invoice_message_template_list.php');">{tmpl_var name='search_template_type'}</select></td>
+ <td><input class="form-control" 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-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','billing/invoice_message_template_list.php');"><span class="icon icon-filter"></span></button></div></td>
</tr>
</thead>
<tbody>
@@ -32,7 +32,7 @@
<td><a href="#" data-load-content="billing/invoice_message_template_edit.php?id={tmpl_var name='id'}">{tmpl_var name="template_name"}</a></td>
<td>
<div class="buttons icons16">
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('billing/invoice_message_template_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('billing/invoice_message_template_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</div>
</td>
</tr>
diff --git a/interface/web/client/templates/reseller_edit_address.htm b/interface/web/client/templates/reseller_edit_address.htm
index 8cf5e2a..ef62e31 100644
--- a/interface/web/client/templates/reseller_edit_address.htm
+++ b/interface/web/client/templates/reseller_edit_address.htm
@@ -151,7 +151,7 @@
</div></div>
<div class="form-group">
<label for="notes" class="col-sm-3 control-label">{tmpl_var name='notes_txt'}</label>
- <div class="col-sm-9"><textarea name="notes" id="notes" rows='10' cols='30'>{tmpl_var name='notes'}</textarea></div>
+ <div class="col-sm-9"><textarea class="form-control" name="notes" id="notes" rows='10' cols='30'>{tmpl_var name='notes'}</textarea></div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='locked_txt'}</label>
diff --git a/interface/web/client/templates/resellers_list.htm b/interface/web/client/templates/resellers_list.htm
index 9a91dfb..b255648 100644
--- a/interface/web/client/templates/resellers_list.htm
+++ b/interface/web/client/templates/resellers_list.htm
@@ -14,7 +14,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="client_id_txt"></th>
<th><tmpl_var name="company_name_txt"></th>
@@ -26,15 +26,15 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <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><input class="form-control" type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></td>
+ <td><input class="form-control" type="text" name="search_company_name" value="{tmpl_var name='search_company_name'}" /></td>
+ <td><input class="form-control" type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" /></td>
+ <td><input class="form-control" type="text" name="search_customer_no" value="{tmpl_var name='search_customer_no'}" /></td>
+ <td><input class="form-control" type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
+ <td><input class="form-control" type="text" name="search_city" value="{tmpl_var name='search_city'}" /></td>
+ <td><select class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','client/reseller_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -49,8 +49,8 @@
<td><a href="#" data-load-content="client/reseller_edit.php?id={tmpl_var name='id'}">{tmpl_var name="city"}</a></td>
<td><a href="#" data-load-content="client/reseller_edit.php?id={tmpl_var name='id'}"><div class="country-{tmpl_var name="countryiso"}" style="float:left"></div>{tmpl_var name="country"}</a></td>
<td>
- <a class="btn btn-default formbutton-default" data-load-content="login/login_as.php?cid={tmpl_var name='id'}">{tmpl_var name='login_as_txt'}</button>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('client/reseller_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-success formbutton-narrow" data-load-content="login/login_as.php?cid={tmpl_var name='id'}"><span class="icon icon-loginas"></span></button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('client/reseller_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/dashboard/dashlets/templates/limits.htm b/interface/web/dashboard/dashlets/templates/limits.htm
index 35445ab..145d54a 100644
--- a/interface/web/dashboard/dashlets/templates/limits.htm
+++ b/interface/web/dashboard/dashlets/templates/limits.htm
@@ -1,7 +1,7 @@
<div class='table-wrapper'>
<table class='table'>
<caption>{tmpl_var name='limits_txt'}</caption>
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th> </th>
<th colspan='2'> </th>
diff --git a/interface/web/dashboard/dashlets/templates/mailquota.htm b/interface/web/dashboard/dashlets/templates/mailquota.htm
index a4b87a3..3c3bd2c 100644
--- a/interface/web/dashboard/dashlets/templates/mailquota.htm
+++ b/interface/web/dashboard/dashlets/templates/mailquota.htm
@@ -1,7 +1,7 @@
<div class='table-wrapper'>
<table class='table'>
<caption>{tmpl_var name='mailquota_txt'}</caption>
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th>{tmpl_var name='email_txt'}</th>
<th>{tmpl_var name='name_txt'}</th>
diff --git a/interface/web/dashboard/dashlets/templates/quota.htm b/interface/web/dashboard/dashlets/templates/quota.htm
index 823de6f..09895a6 100644
--- a/interface/web/dashboard/dashlets/templates/quota.htm
+++ b/interface/web/dashboard/dashlets/templates/quota.htm
@@ -1,7 +1,7 @@
<div class='table-wrapper'>
<table class='table'>
<caption>{tmpl_var name='quota_txt'}</caption>
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th>{tmpl_var name='domain_txt'}</th>
<th>{tmpl_var name='used_txt'}</th>
diff --git a/interface/web/dns/templates/dns_a_list.htm b/interface/web/dns/templates/dns_a_list.htm
index 3693d7d..fb70e86 100644
--- a/interface/web/dns/templates/dns_a_list.htm
+++ b/interface/web/dns/templates/dns_a_list.htm
@@ -37,7 +37,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="active_txt"></th>
<th><tmpl_var name="type_txt"></th>
@@ -48,14 +48,14 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<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><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><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select class="form-control" name="search_type">{tmpl_var name='search_type'}</select></td>
+ <td><input class="form-control" type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
+ <td><input class="form-control" type="text" name="search_data" value="{tmpl_var name='search_data'}" /></td>
+ <td><input class="form-control" type="text" name="search_aux" value="{tmpl_var name='search_aux'}" /></td>
+ <td><input class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="return changeTab('dns_records','dns/dns_soa_edit.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -69,7 +69,7 @@
<td><a href="#" data-load-content="dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}">{tmpl_var name="aux"}</a></td>
<td><a href="#" data-load-content="dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}">{tmpl_var name="ttl"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('dns/dns_rr_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('dns/dns_rr_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/dns/templates/dns_dkim_edit.htm b/interface/web/dns/templates/dns_dkim_edit.htm
index 4391f16..a73f506 100644
--- a/interface/web/dns/templates/dns_dkim_edit.htm
+++ b/interface/web/dns/templates/dns_dkim_edit.htm
@@ -7,7 +7,7 @@
<div class="form-group">
<label for="data" class="col-sm-3 control-label">{tmpl_var name='public_key_txt'}</label>
- <div class="col-sm-9"><textarea readonly name="data" id="data" >{tmpl_var name='public_key'}</textarea></div>
+ <div class="col-sm-9"><textarea class="form-control" readonly name="data" id="data" >{tmpl_var name='public_key'}</textarea></div>
</div>
<div class="form-group">
<label for="selector" class="col-sm-3 control-label">{tmpl_var name='selector_txt'}</label>
diff --git a/interface/web/dns/templates/dns_slave_admin_list.htm b/interface/web/dns/templates/dns_slave_admin_list.htm
index 0b6929c..0ca821a 100644
--- a/interface/web/dns/templates/dns_slave_admin_list.htm
+++ b/interface/web/dns/templates/dns_slave_admin_list.htm
@@ -30,7 +30,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="active_txt"></th>
<th><tmpl_var name="sys_groupid_txt"></th>
@@ -40,13 +40,13 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <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><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><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select class="form-control" name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
+ <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><input class="form-control" type="text" name="search_origin" value="{tmpl_var name='search_origin'}" /></td>
+ <td><input class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','dns/dns_slave_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -59,7 +59,7 @@
<td><a href="#" data-load-content="dns/dns_slave_edit.php?id={tmpl_var name='id'}">{tmpl_var name="origin"}</a></td>
<td><a href="#" data-load-content="dns/dns_slave_edit.php?id={tmpl_var name='id'}">{tmpl_var name="ns"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('dns/dns_slave_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('dns/dns_slave_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/dns/templates/dns_slave_list.htm b/interface/web/dns/templates/dns_slave_list.htm
index 6adeef1..6a16229 100644
--- a/interface/web/dns/templates/dns_slave_list.htm
+++ b/interface/web/dns/templates/dns_slave_list.htm
@@ -30,7 +30,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="active_txt"></th>
<th><tmpl_var name="server_id_txt"></th>
@@ -39,12 +39,12 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<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><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><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><input class="form-control" type="text" name="search_origin" value="{tmpl_var name='search_origin'}" /></td>
+ <td><input class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','dns/dns_slave_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -56,7 +56,7 @@
<td><a href="#" data-load-content="dns/dns_slave_edit.php?id={tmpl_var name='id'}">{tmpl_var name="origin"}</a></td>
<td><a href="#" data-load-content="dns/dns_slave_edit.php?id={tmpl_var name='id'}">{tmpl_var name="ns"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('dns/dns_slave_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('dns/dns_slave_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/dns/templates/dns_soa_admin_list.htm b/interface/web/dns/templates/dns_soa_admin_list.htm
index 97f6178..4fae01e 100644
--- a/interface/web/dns/templates/dns_soa_admin_list.htm
+++ b/interface/web/dns/templates/dns_soa_admin_list.htm
@@ -32,7 +32,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="active_txt"></th>
<th><tmpl_var name="sys_groupid_txt"></th>
@@ -43,14 +43,14 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <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><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><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select class="form-control" name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
+ <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><input class="form-control" type="text" name="search_origin" value="{tmpl_var name='search_origin'}" /></td>
+ <td><input class="form-control" type="text" name="search_ns" value="{tmpl_var name='search_ns'}" /></td>
+ <td><input class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','dns/dns_soa_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -64,7 +64,7 @@
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}">{tmpl_var name="ns"}</a></td>
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}">{tmpl_var name="mbox"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('dns/dns_soa_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('dns/dns_soa_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/dns/templates/dns_soa_list.htm b/interface/web/dns/templates/dns_soa_list.htm
index 44dccd7..161727b 100644
--- a/interface/web/dns/templates/dns_soa_list.htm
+++ b/interface/web/dns/templates/dns_soa_list.htm
@@ -32,7 +32,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="active_txt"></th>
<th><tmpl_var name="server_id_txt"></th>
@@ -42,13 +42,13 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<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><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><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><input class="form-control" type="text" name="search_origin" value="{tmpl_var name='search_origin'}" /></td>
+ <td><input class="form-control" type="text" name="search_ns" value="{tmpl_var name='search_ns'}" /></td>
+ <td><input class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','dns/dns_soa_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -61,7 +61,7 @@
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}">{tmpl_var name="ns"}</a></td>
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}">{tmpl_var name="mbox"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('dns/dns_soa_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('dns/dns_soa_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/dns/templates/dns_template_edit.htm b/interface/web/dns/templates/dns_template_edit.htm
index d9fbb97..e19bc56 100644
--- a/interface/web/dns/templates/dns_template_edit.htm
+++ b/interface/web/dns/templates/dns_template_edit.htm
@@ -17,7 +17,7 @@
</div>
<div class="form-group">
<label for="template" class="col-sm-3 control-label">{tmpl_var name='template_txt'}</label>
- <div class="col-sm-9"><textarea name="template" id="template" rows='15' cols='40'>{tmpl_var name='template'}</textarea></div>
+ <div class="col-sm-9"><textarea class="form-control" name="template" id="template" rows='15' cols='40'>{tmpl_var name='template'}</textarea></div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='visible_txt'}</label>
diff --git a/interface/web/dns/templates/dns_template_list.htm b/interface/web/dns/templates/dns_template_list.htm
index fc6a2fb..699190d 100644
--- a/interface/web/dns/templates/dns_template_list.htm
+++ b/interface/web/dns/templates/dns_template_list.htm
@@ -14,17 +14,17 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="visible_txt"></th>
<th><tmpl_var name="name_txt"></th>
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <td><select name="search_visible">{tmpl_var name='search_visible'}</select></td>
- <td><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
+ <td><select class="form-control" name="search_visible">{tmpl_var name='search_visible'}</select></td>
+ <td><input class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','dns/dns_template_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -34,7 +34,7 @@
<td><a href="#" data-load-content="dns/dns_template_edit.php?id={tmpl_var name='id'}">{tmpl_var name="visible"}</a></td>
<td><a href="#" data-load-content="dns/dns_template_edit.php?id={tmpl_var name='id'}">{tmpl_var name="name"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('dns/dns_template_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('dns/dns_template_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/help/templates/faq_edit.htm b/interface/web/help/templates/faq_edit.htm
index b49b39a..a241d25 100644
--- a/interface/web/help/templates/faq_edit.htm
+++ b/interface/web/help/templates/faq_edit.htm
@@ -12,7 +12,7 @@
</div></div>
<div class="form-group">
<label for="hf_answer" class="col-sm-3 control-label">{tmpl_var name='faq_answer_txt'}</label>
- <div class="col-sm-9"><textarea name="hf_answer" id="hf_answer" rows='10' cols='30'>{tmpl_var name='hf_answer'}</textarea></div>
+ <div class="col-sm-9"><textarea class="form-control" name="hf_answer" id="hf_answer" rows='10' cols='30'>{tmpl_var name='hf_answer'}</textarea></div>
</div>
diff --git a/interface/web/help/templates/faq_manage_questions_list.htm b/interface/web/help/templates/faq_manage_questions_list.htm
index ab720a4..b920e4f 100644
--- a/interface/web/help/templates/faq_manage_questions_list.htm
+++ b/interface/web/help/templates/faq_manage_questions_list.htm
@@ -10,7 +10,7 @@
<p><tmpl_var name="faq_sections_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th>{tmpl_var name="faq_question_txt"}</th>
<th>{tmpl_var name="faq_section_name_txt"}</th>
@@ -24,10 +24,10 @@
<td width="60%">{tmpl_var name='hf_question'}</td>
<td width="30%">{tmpl_var name='hf_section'}</td>
<td width="5%">
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('help/faq_delete.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name="faq_delete_txt"}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('help/faq_delete.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
<td width="5%">
- <a class="btn btn-default formbutton-default" data-load-content="help/faq_edit.php?id={tmpl_var name='id'}">{tmpl_var name="faq_edit_txt"}</button>
+ <a class="btn btn-default formbutton-default formbutton-narrow" data-load-content="help/faq_edit.php?id={tmpl_var name='id'}"><span class="icon icon-edit"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/help/templates/help_faq_list.htm b/interface/web/help/templates/help_faq_list.htm
index 64d8f57..f5d7684 100644
--- a/interface/web/help/templates/help_faq_list.htm
+++ b/interface/web/help/templates/help_faq_list.htm
@@ -5,7 +5,7 @@
{tmpl_var name='hf_answer'}
</p>
<tmpl_if name='is_admin'>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('help/faq_delete.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name="delete_txt"}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('help/faq_delete.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
<a href="#" data-load-content="help/faq_edit.php?id={tmpl_var name='id'}">{tmpl_var name="edit_txt"}</a>
<br/>
<br/>
diff --git a/interface/web/help/templates/help_faq_sections_list.htm b/interface/web/help/templates/help_faq_sections_list.htm
index c8d1a0c..906237e 100644
--- a/interface/web/help/templates/help_faq_sections_list.htm
+++ b/interface/web/help/templates/help_faq_sections_list.htm
@@ -14,7 +14,7 @@
<p><tmpl_var name="faq_sections_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th>{tmpl_var name="faq_section_name_txt"}</th>
<th>{tmpl_var name="faq_delete_txt"}</th>
@@ -26,10 +26,10 @@
<tr>
<td><b>{tmpl_var name='hfs_name'}</b></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('help/faq_sections_delete.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name="faq_delete_txt"}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('help/faq_sections_delete.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
<td>
- <a class="btn btn-default formbutton-default" data-load-content="help/faq_sections_edit.php?id={tmpl_var name='id'}">{tmpl_var name="faq_edit_txt"}</button>
+ <a class="btn btn-default formbutton-default formbutton-narrow" data-load-content="help/faq_sections_edit.php?id={tmpl_var name='id'}"><span class="icon icon-edit"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/help/templates/support_message_edit.htm b/interface/web/help/templates/support_message_edit.htm
index 6b7923e..ea0c729 100644
--- a/interface/web/help/templates/support_message_edit.htm
+++ b/interface/web/help/templates/support_message_edit.htm
@@ -17,7 +17,7 @@
</div></div>
<div class="form-group">
<label for="message" class="col-sm-3 control-label">{tmpl_var name='message_txt'}</label>
- <div class="col-sm-9"><textarea name="message" id="message" rows='10' cols='30'>{tmpl_var name='message'}</textarea></div>
+ <div class="col-sm-9"><textarea class="form-control" name="message" id="message" rows='10' cols='30'>{tmpl_var name='message'}</textarea></div>
</div>
diff --git a/interface/web/help/templates/support_message_list.htm b/interface/web/help/templates/support_message_list.htm
index ca01e46..f9739ba 100644
--- a/interface/web/help/templates/support_message_list.htm
+++ b/interface/web/help/templates/support_message_list.htm
@@ -14,7 +14,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="sender_id_txt"></th>
<th><tmpl_var name="subject_txt"></th>
@@ -22,11 +22,11 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <td><select name="search_sender_id">{tmpl_var name='search_sender_id'}</select></td>
- <td><input type="text" name="search_subject" value="{tmpl_var name='search_subject'}" /></td>
+ <td><select class="form-control" name="search_sender_id">{tmpl_var name='search_sender_id'}</select></td>
+ <td><input class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','help/support_message_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -37,7 +37,7 @@
<td><a href="#" data-load-content="help/support_message_edit.php?id={tmpl_var name='id'}">{tmpl_var name="subject"}</a></td>
<td><a href="#" data-load-content="help/support_message_edit.php?id={tmpl_var name='id'}">{tmpl_var name="tstamp"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('help/support_message_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('help/support_message_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/js/scrigo.js.php b/interface/web/js/scrigo.js.php
index 83b8b5d..1445353 100644
--- a/interface/web/js/scrigo.js.php
+++ b/interface/web/js/scrigo.js.php
@@ -101,8 +101,8 @@
selectOnBlur: true,
allowClear: true,
}).on('change', function(e) {
- if (jQuery(".panel #Filter").length > 0) {
- jQuery(".panel #Filter").trigger('click');
+ if (jQuery("#pageForm .table #Filter").length > 0) {
+ jQuery("#pageForm .table #Filter").trigger('click');
}
});
/* TODO: find a better way! */
diff --git a/interface/web/login/templates/index.htm b/interface/web/login/templates/index.htm
index 946cbfc..ebe94ef 100644
--- a/interface/web/login/templates/index.htm
+++ b/interface/web/login/templates/index.htm
@@ -26,7 +26,7 @@
<tmpl_if name="session_allow_endless" value="y">
<div class="form-group">
<label for="passwort" class="col-sm-3 control-label">{tmpl_var name='stay_logged_in_txt'}</label>
- <div class="col-sm-9"><input type="checkbox" name="stay" id="stay" value="1" onkeypress="if (event.keyCode && event.keyCode == 13) {submitLoginForm('pageForm'); return false;};" />
+ <div class="col-sm-9"><input class="form-control" type="checkbox" name="stay" id="stay" value="1" onkeypress="if (event.keyCode && event.keyCode == 13) {submitLoginForm('pageForm'); return false;};" />
</div></div>
</tmpl_if>
</tmpl_if>
diff --git a/interface/web/mail/templates/mail_alias_list.htm b/interface/web/mail/templates/mail_alias_list.htm
index dabf15d..4745e28 100644
--- a/interface/web/mail/templates/mail_alias_list.htm
+++ b/interface/web/mail/templates/mail_alias_list.htm
@@ -30,7 +30,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="active_txt"></th>
<th><tmpl_var name="source_txt"></th>
@@ -38,11 +38,11 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <td><select name="search_active">{tmpl_var name='search_active'}</select></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><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><input class="form-control" type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
+ <td><input class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_alias_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -53,7 +53,7 @@
<td><a href="#" data-load-content="mail/mail_alias_edit.php?id={tmpl_var name='id'}">{tmpl_var name="source"}</a></td>
<td><a href="#" data-load-content="mail/mail_alias_edit.php?id={tmpl_var name='id'}">{tmpl_var name="destination"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('mail/mail_alias_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('mail/mail_alias_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/mail/templates/mail_aliasdomain_list.htm b/interface/web/mail/templates/mail_aliasdomain_list.htm
index e33ed94..aa8cfee 100644
--- a/interface/web/mail/templates/mail_aliasdomain_list.htm
+++ b/interface/web/mail/templates/mail_aliasdomain_list.htm
@@ -30,7 +30,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="active_txt"></th>
<th><tmpl_var name="source_txt"></th>
@@ -38,11 +38,11 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <td><select name="search_active">{tmpl_var name='search_active'}</select></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><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><input class="form-control" type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
+ <td><input class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_aliasdomain_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -53,7 +53,7 @@
<td><a href="#" data-load-content="mail/mail_aliasdomain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="source"}</a></td>
<td><a href="#" data-load-content="mail/mail_aliasdomain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="destination"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('mail/mail_aliasdomain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('mail/mail_aliasdomain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/mail/templates/mail_blacklist_list.htm b/interface/web/mail/templates/mail_blacklist_list.htm
index a62ac14..d315558 100644
--- a/interface/web/mail/templates/mail_blacklist_list.htm
+++ b/interface/web/mail/templates/mail_blacklist_list.htm
@@ -30,7 +30,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="active_txt"></th>
<th><tmpl_var name="server_id_txt"></th>
@@ -39,12 +39,12 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<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><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><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><input class="form-control" type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
+ <td><select class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_blacklist_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -56,7 +56,7 @@
<td><a href="#" data-load-content="mail/mail_blacklist_edit.php?id={tmpl_var name='id'}">{tmpl_var name="source"}</a></td>
<td><a href="#" data-load-content="mail/mail_blacklist_edit.php?id={tmpl_var name='id'}">{tmpl_var name="type"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('mail/mail_blacklist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('mail/mail_blacklist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/mail/templates/mail_content_filter_list.htm b/interface/web/mail/templates/mail_content_filter_list.htm
index dbdcba2..cf17024 100644
--- a/interface/web/mail/templates/mail_content_filter_list.htm
+++ b/interface/web/mail/templates/mail_content_filter_list.htm
@@ -30,7 +30,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="active_txt"></th>
<th><tmpl_var name="server_id_txt"></th>
@@ -39,12 +39,12 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<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><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><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><input class="form-control" type="text" name="search_pattern" value="{tmpl_var name='search_pattern'}" /></td>
+ <td><select class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_content_filter_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -56,7 +56,7 @@
<td><a href="#" data-load-content="mail/mail_content_filter_edit.php?id={tmpl_var name='id'}">{tmpl_var name="pattern"}</a></td>
<td><a href="#" data-load-content="mail/mail_content_filter_edit.php?id={tmpl_var name='id'}">{tmpl_var name="action"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('mail/mail_content_filter_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('mail/mail_content_filter_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/mail/templates/mail_domain_admin_list.htm b/interface/web/mail/templates/mail_domain_admin_list.htm
index 08ad17a..872e1f7 100644
--- a/interface/web/mail/templates/mail_domain_admin_list.htm
+++ b/interface/web/mail/templates/mail_domain_admin_list.htm
@@ -13,7 +13,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="active_txt"></th>
<th><tmpl_var name="sys_groupid_txt"></th>
@@ -22,12 +22,12 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <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><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+ <td><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select class="form-control" name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
+ <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><input class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_domain_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -39,7 +39,7 @@
<td><a href="#" data-load-content="mail/mail_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
<td><a href="#" data-load-content="mail/mail_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="domain"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('mail/mail_domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('mail/mail_domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/mail/templates/mail_domain_catchall_list.htm b/interface/web/mail/templates/mail_domain_catchall_list.htm
index 5a78e38..82d5102 100644
--- a/interface/web/mail/templates/mail_domain_catchall_list.htm
+++ b/interface/web/mail/templates/mail_domain_catchall_list.htm
@@ -30,7 +30,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="active_txt"></th>
<th><tmpl_var name="source_txt"></th>
@@ -38,11 +38,11 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <td><select name="search_active">{tmpl_var name='search_active'}</select></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><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><input class="form-control" type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
+ <td><input class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_domain_catchall_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -53,7 +53,7 @@
<td><a href="#" data-load-content="mail/mail_domain_catchall_edit.php?id={tmpl_var name='id'}">{tmpl_var name="source"}</a></td>
<td><a href="#" data-load-content="mail/mail_domain_catchall_edit.php?id={tmpl_var name='id'}">{tmpl_var name="destination"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('mail/mail_domain_catchall_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('mail/mail_domain_catchall_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/mail/templates/mail_domain_edit.htm b/interface/web/mail/templates/mail_domain_edit.htm
index 471aa6a..8ab90c3 100644
--- a/interface/web/mail/templates/mail_domain_edit.htm
+++ b/interface/web/mail/templates/mail_domain_edit.htm
@@ -101,16 +101,16 @@
</div></div>
<div class="form-group">
<label for="dkim_private" class="col-sm-3 control-label">{tmpl_var name='dkim_private_txt'}</label>
- <div class="col-sm-9"><textarea name="dkim_private" id="dkim_private" rows='10' cols='30'>{tmpl_var name='dkim_private'}</textarea></div>
+ <div class="col-sm-9"><textarea class="form-control" name="dkim_private" id="dkim_private" rows='10' cols='30'>{tmpl_var name='dkim_private'}</textarea></div>
<a href="javascript:setRequest('create')">{tmpl_var name='dkim_generate_txt'}</a>
</div>
<div class="form-group">
- <div class="col-sm-9"><textarea name="dkim_public" style="display:none;" id="dkim_public" rows='5' cols='30' readonly>{tmpl_var name='dkim_public'}</textarea></div>
+ <div class="col-sm-9"><textarea class="form-control" name="dkim_public" style="display:none;" id="dkim_public" rows='5' cols='30' readonly>{tmpl_var name='dkim_public'}</textarea></div>
</div>
<div class="form-group">
<label for="dns_record" class="col-sm-3 control-label">{tmpl_var name='dkim_dns_txt'}</label>
- <div class="col-sm-9"><textarea name="dns_record" id="dns_record" rows='10' cols='30' readonly>{tmpl_var name='dns_record'}</textarea></div>
+ <div class="col-sm-9"><textarea class="form-control" name="dns_record" id="dns_record" rows='10' cols='30' readonly>{tmpl_var name='dns_record'}</textarea></div>
</div>
</div>
diff --git a/interface/web/mail/templates/mail_domain_list.htm b/interface/web/mail/templates/mail_domain_list.htm
index be37a3e..cf5402c 100644
--- a/interface/web/mail/templates/mail_domain_list.htm
+++ b/interface/web/mail/templates/mail_domain_list.htm
@@ -30,7 +30,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="active_txt"></th>
<th><tmpl_var name="server_id_txt"></th>
@@ -38,11 +38,11 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<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><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+ <td><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><input class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_domain_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -53,7 +53,7 @@
<td><a href="#" data-load-content="mail/mail_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
<td><a href="#" data-load-content="mail/mail_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="domain"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('mail/mail_domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('mail/mail_domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/mail/templates/mail_forward_list.htm b/interface/web/mail/templates/mail_forward_list.htm
index d8bf33e..8306373 100644
--- a/interface/web/mail/templates/mail_forward_list.htm
+++ b/interface/web/mail/templates/mail_forward_list.htm
@@ -30,7 +30,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="active_txt"></th>
<th><tmpl_var name="source_txt"></th>
@@ -38,11 +38,11 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <td><select name="search_active">{tmpl_var name='search_active'}</select></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><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><input class="form-control" type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
+ <td><input class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_forward_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -53,7 +53,7 @@
<td><a href="#" data-load-content="mail/mail_forward_edit.php?id={tmpl_var name='id'}">{tmpl_var name="source"}</a></td>
<td><a href="#" data-load-content="mail/mail_forward_edit.php?id={tmpl_var name='id'}">{tmpl_var name="destination"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('mail/mail_forward_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('mail/mail_forward_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/mail/templates/mail_get_list.htm b/interface/web/mail/templates/mail_get_list.htm
index 054c67d..b90ee97 100644
--- a/interface/web/mail/templates/mail_get_list.htm
+++ b/interface/web/mail/templates/mail_get_list.htm
@@ -30,7 +30,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="active_txt"></th>
<th><tmpl_var name="server_id_txt"></th>
@@ -40,13 +40,13 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<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><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><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><input class="form-control" type="text" name="search_source_server" value="{tmpl_var name='search_source_server'}" /></td>
+ <td><input class="form-control" type="text" name="search_source_username" value="{tmpl_var name='search_source_username'}" /></td>
+ <td><input class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_get_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -59,7 +59,7 @@
<td><a href="#" data-load-content="mail/mail_get_edit.php?id={tmpl_var name='id'}">{tmpl_var name="source_username"}</a></td>
<td><a href="#" data-load-content="mail/mail_get_edit.php?id={tmpl_var name='id'}">{tmpl_var name="destination"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('mail/mail_get_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('mail/mail_get_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/mail/templates/mail_mailinglist_list.htm b/interface/web/mail/templates/mail_mailinglist_list.htm
index 230bb7e..a75d1f4 100644
--- a/interface/web/mail/templates/mail_mailinglist_list.htm
+++ b/interface/web/mail/templates/mail_mailinglist_list.htm
@@ -29,17 +29,17 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="listname_txt"></th>
<th><tmpl_var name="domain_txt"></th>
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <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><input class="form-control" type="text" name="search_listname" value="{tmpl_var name='search_listname'}" /></td>
+ <td><input class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_mailinglist_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -52,7 +52,7 @@
<tmpl_if name="mailmailinglist_link">
<a class="btn btn-default formbutton-default" href="mail/mailinglist.php?id={tmpl_var name='id'}" target="mailmailinglist">{tmpl_var name='mailinglist_txt'}</button>
</tmpl_if>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('mail/mail_mailinglist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('mail/mail_mailinglist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/mail/templates/mail_relay_recipient_list.htm b/interface/web/mail/templates/mail_relay_recipient_list.htm
index c05240a..8c201de 100644
--- a/interface/web/mail/templates/mail_relay_recipient_list.htm
+++ b/interface/web/mail/templates/mail_relay_recipient_list.htm
@@ -29,7 +29,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="active_txt"></th>
<th><tmpl_var name="server_id_txt"></th>
@@ -37,11 +37,11 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<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><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
+ <td><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><input class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_relay_recipient_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -52,7 +52,7 @@
<td><a href="#" data-load-content="mail/mail_relay_recipient_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
<td><a href="#" data-load-content="mail/mail_relay_recipient_edit.php?id={tmpl_var name='id'}">{tmpl_var name="source"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('mail/mail_relay_recipient_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('mail/mail_relay_recipient_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/mail/templates/mail_transport_edit.htm b/interface/web/mail/templates/mail_transport_edit.htm
index 4a09c24..fe02054 100644
--- a/interface/web/mail/templates/mail_transport_edit.htm
+++ b/interface/web/mail/templates/mail_transport_edit.htm
@@ -24,7 +24,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='mx_txt'}</label>
<div class="col-sm-9">
- <div class="col-sm-9"><input type="checkbox" value="y" id="mx" name="mx" {tmpl_var name='mx'} />
+ <div class="col-sm-9"><input class="form-control" type="checkbox" value="y" id="mx" name="mx" {tmpl_var name='mx'} />
</div></div>
</div>
<div class="form-group">
diff --git a/interface/web/mail/templates/mail_transport_list.htm b/interface/web/mail/templates/mail_transport_list.htm
index 2b2d89b..fa69541 100644
--- a/interface/web/mail/templates/mail_transport_list.htm
+++ b/interface/web/mail/templates/mail_transport_list.htm
@@ -30,7 +30,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="active_txt"></th>
<th><tmpl_var name="server_id_txt"></th>
@@ -40,13 +40,13 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<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><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><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><input class="form-control" type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+ <td><input class="form-control" type="text" name="search_transport" value="{tmpl_var name='search_transport'}" /></td>
+ <td><input class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_transport_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -59,7 +59,7 @@
<td><a href="#" data-load-content="mail/mail_transport_edit.php?id={tmpl_var name='id'}">{tmpl_var name="transport"}</a></td>
<td><a href="#" data-load-content="mail/mail_transport_edit.php?id={tmpl_var name='id'}">{tmpl_var name="sort_order"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('mail/mail_transport_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('mail/mail_transport_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/mail/templates/mail_user_autoresponder_edit.htm b/interface/web/mail/templates/mail_user_autoresponder_edit.htm
index 794158c..132400e 100644
--- a/interface/web/mail/templates/mail_user_autoresponder_edit.htm
+++ b/interface/web/mail/templates/mail_user_autoresponder_edit.htm
@@ -7,15 +7,15 @@
<div class="form-group">
<label for="autoresponder_subject" class="col-sm-3 control-label">{tmpl_var name='autoresponder_subject_txt'}</label>
- <div class="col-sm-9"><input type="text" name="autoresponder_subject" id="autoresponder_subject" value="{tmpl_var name='autoresponder_subject'}" />
+ <div class="col-sm-9"><input class="form-control" type="text" name="autoresponder_subject" id="autoresponder_subject" value="{tmpl_var name='autoresponder_subject'}" />
</div></div>
<div class="form-group">
<label for="autoresponder_text" class="col-sm-3 control-label">{tmpl_var name='autoresponder_text_txt'}</label>
- <div class="col-sm-9"><textarea name="autoresponder_text" id="autoresponder_text" rows='15' cols='30'>{tmpl_var name='autoresponder_text'}</textarea></div>
+ <div class="col-sm-9"><textarea class="form-control" name="autoresponder_text" id="autoresponder_text" rows='15' cols='30'>{tmpl_var name='autoresponder_text'}</textarea></div>
</div>
<div class="form-group">
<label for="autoresponder" class="col-sm-3 control-label">{tmpl_var name='autoresponder_active'}</label>
- <div class="col-sm-9"><input type="checkbox" value="y" id="autoresponder" name="autoresponder"
+ <div class="col-sm-9"><input class="form-control" type="checkbox" value="y" id="autoresponder" name="autoresponder"
onclick="AR_ResetDates();" {tmpl_var name='ar_active'} />
</div></div>
<div class="form-group">
diff --git a/interface/web/mail/templates/mail_user_backup_list.htm b/interface/web/mail/templates/mail_user_backup_list.htm
index 3cee7c2..8b2e1d6 100644
--- a/interface/web/mail/templates/mail_user_backup_list.htm
+++ b/interface/web/mail/templates/mail_user_backup_list.htm
@@ -10,7 +10,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="date_txt"></th>
<th><tmpl_var name="filename_txt"></th>
diff --git a/interface/web/mail/templates/mail_user_custom_rules_edit.htm b/interface/web/mail/templates/mail_user_custom_rules_edit.htm
index 268211f..653d17c 100644
--- a/interface/web/mail/templates/mail_user_custom_rules_edit.htm
+++ b/interface/web/mail/templates/mail_user_custom_rules_edit.htm
@@ -7,7 +7,7 @@
<div class="form-group">
<label for="custom_mailfilter" class="col-sm-3 control-label">{tmpl_var name='custom_mailfilter_txt'}</label>
- <div class="col-sm-9"><textarea name="custom_mailfilter" id="custom_mailfilter" rows='15' cols='30'>{tmpl_var name='custom_mailfilter'}</textarea></div>
+ <div class="col-sm-9"><textarea class="form-control" name="custom_mailfilter" id="custom_mailfilter" rows='15' cols='30'>{tmpl_var name='custom_mailfilter'}</textarea></div>
</div>
diff --git a/interface/web/mail/templates/mail_user_filter_edit.htm b/interface/web/mail/templates/mail_user_filter_edit.htm
index a88b180..d60ed92 100644
--- a/interface/web/mail/templates/mail_user_filter_edit.htm
+++ b/interface/web/mail/templates/mail_user_filter_edit.htm
@@ -11,13 +11,13 @@
</div></div>
<div class="form-group">
<label for="source" class="col-sm-3 control-label">{tmpl_var name='source_txt'}</label>
- <select id="source" name="source" class="textInput formLengthHalf">{tmpl_var name='source'}</select>
- <select id="op" name="op" class="textInput formLengthHalf">{tmpl_var name='op'}</select><br><br>
+ <div class="col-sm-9"><select id="source" name="source" class="form-control">{tmpl_var name='source'}</select></div>
+ <div class="col-sm-9"><select id="op" name="op" class="form-control">{tmpl_var name='op'}</select></div><br><br>
<div><label></label><div class="col-sm-9"><input type="text" id="searchterm" name="searchterm" value="{tmpl_var name='searchterm'}" class="form-control"></div></div>
</div>
<div class="form-group">
<label for="action" class="col-sm-3 control-label">{tmpl_var name='action_txt'}</label>
- <select id="action" name="action" class="textInput formLengthHalf">{tmpl_var name='action'}</select><br><br>
+ <div class="col-sm-9"><select id="action" name="action" class="form-control">{tmpl_var name='action'}</select></div><br><br>
<div><label></label><div class="col-sm-9"><input type="text" id="target" name="target" value="{tmpl_var name='target'}" class="form-control"></div></div>
</div>
<div class="form-group">
diff --git a/interface/web/mail/templates/mail_user_filter_list.htm b/interface/web/mail/templates/mail_user_filter_list.htm
index 61440b8..c97fc6b 100644
--- a/interface/web/mail/templates/mail_user_filter_list.htm
+++ b/interface/web/mail/templates/mail_user_filter_list.htm
@@ -25,15 +25,15 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="rulename_txt"></th>
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <td><input type="text" name="search_rulename" value="{tmpl_var name='search_rulename'}" /></td>
+ <td><input class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="return changeTab('filter_records','mail/mail_user_edit.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -42,7 +42,7 @@
<tr>
<td><a href="#" data-load-content="mail/mail_user_filter_edit.php?id={tmpl_var name='id'}">{tmpl_var name="rulename"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('mail/mail_user_filter_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('mail/mail_user_filter_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/mail/templates/mail_user_list.htm b/interface/web/mail/templates/mail_user_list.htm
index 24c4c97..445cb30 100644
--- a/interface/web/mail/templates/mail_user_list.htm
+++ b/interface/web/mail/templates/mail_user_list.htm
@@ -30,7 +30,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="email_txt"></th>
<tmpl_if name="enable_custom_login"><th><tmpl_var name="login_txt"></th></tmpl_if>
@@ -43,16 +43,16 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <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>
- <td><select name="search_disableimap">{tmpl_var name='search_disableimap'}</select></th>
- <td><select name="search_disablepop3">{tmpl_var name='search_disablepop3'}</select></th>
+ <td><input class="form-control" type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
+ <tmpl_if name="enable_custom_login"><td><input class="form-control" type="text" name="search_login" value="{tmpl_var name='search_login'}" /></td></tmpl_if>
+ <td><input class="form-control" type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
+ <td><select class="form-control" name="search_autoresponder">{tmpl_var name='search_autoresponder'}</select></td>
+ <td><div class="col-sm-9"><select class="form-control" name="search_postfix">{tmpl_var name='search_postfix'}</select></div></th>
+ <td><div class="col-sm-9"><select class="form-control" name="search_disablesmtp">{tmpl_var name='search_disablesmtp'}</select></div></th>
+ <td><div class="col-sm-9"><select class="form-control" name="search_disableimap">{tmpl_var name='search_disableimap'}</select></div></th>
+ <td><div class="col-sm-9"><select class="form-control" name="search_disablepop3">{tmpl_var name='search_disablepop3'}</select></div></th>
<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_list.php');">{tmpl_var name="filter_txt"}</button>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_user_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -75,7 +75,7 @@
<tmpl_if name="mailboxlist_webmail_link">
<a class="btn btn-default formbutton-default" href="mail/webmailer.php?id={tmpl_var name='id'}" target="webmail">{tmpl_var name="webmail_txt"}</button>
</tmpl_if>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('mail/mail_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('mail/mail_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/mail/templates/mail_user_stats_list.htm b/interface/web/mail/templates/mail_user_stats_list.htm
index 80267e6..f946bc3 100644
--- a/interface/web/mail/templates/mail_user_stats_list.htm
+++ b/interface/web/mail/templates/mail_user_stats_list.htm
@@ -7,7 +7,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="email_txt"></th>
<th><tmpl_var name="this_month_txt"></th>
@@ -17,13 +17,13 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <td><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
+ <td><input class="form-control" type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
<td></td>
<td></td>
<td></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','mail/mail_user_stats.php');">{tmpl_var name="filter_txt"}</button>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_user_stats.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
diff --git a/interface/web/mail/templates/mail_whitelist_list.htm b/interface/web/mail/templates/mail_whitelist_list.htm
index fd3d718..8424206 100644
--- a/interface/web/mail/templates/mail_whitelist_list.htm
+++ b/interface/web/mail/templates/mail_whitelist_list.htm
@@ -14,7 +14,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="active_txt"></th>
<th><tmpl_var name="server_id_txt"></th>
@@ -23,12 +23,12 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<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><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><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><input class="form-control" type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
+ <td><select class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_whitelist_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -40,7 +40,7 @@
<td><a href="#" data-load-content="mail/mail_whitelist_edit.php?id={tmpl_var name='id'}">{tmpl_var name="source"}</a></td>
<td><a href="#" data-load-content="mail/mail_whitelist_edit.php?id={tmpl_var name='id'}">{tmpl_var name="type"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('mail/mail_whitelist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('mail/mail_whitelist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/mail/templates/spamfilter_blacklist_list.htm b/interface/web/mail/templates/spamfilter_blacklist_list.htm
index 65d76d7..79745d9 100644
--- a/interface/web/mail/templates/spamfilter_blacklist_list.htm
+++ b/interface/web/mail/templates/spamfilter_blacklist_list.htm
@@ -14,7 +14,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="active_txt"></th>
<th><tmpl_var name="server_id_txt"></th>
@@ -24,13 +24,13 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<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><select name="search_priority">{tmpl_var name='search_priority'}</select></td>
- <td><select name="search_rid">{tmpl_var name='search_rid'}</select></td>
- <td><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
+ <td><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><select class="form-control" name="search_priority">{tmpl_var name='search_priority'}</select></td>
+ <td><select class="form-control" name="search_rid">{tmpl_var name='search_rid'}</select></td>
+ <td><input class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/spamfilter_blacklist_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -43,7 +43,7 @@
<td><a href="#" data-load-content="mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}">{tmpl_var name="rid"}</a></td>
<td><a href="#" data-load-content="mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}">{tmpl_var name="email"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('mail/spamfilter_blacklist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('mail/spamfilter_blacklist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/mail/templates/spamfilter_config_getmail_edit.htm b/interface/web/mail/templates/spamfilter_config_getmail_edit.htm
index ea5f6e9..2133441 100644
--- a/interface/web/mail/templates/spamfilter_config_getmail_edit.htm
+++ b/interface/web/mail/templates/spamfilter_config_getmail_edit.htm
@@ -7,7 +7,7 @@
<fieldset id="wf_area_spamfilter_config">
<span class="wf_oneField">
<label for="getmail_config_dir" class="col-sm-3 control-label">{tmpl_var name='getmail_config_dir_txt'}</label>
- <div class="col-sm-9"><input type="text" id="getmail_config_dir" name="getmail_config_dir" value="{tmpl_var name='getmail_config_dir'}">
+ <div class="col-sm-9"><input class="form-control" type="text" id="getmail_config_dir" name="getmail_config_dir" value="{tmpl_var name='getmail_config_dir'}">
</div></span>
</fieldset>
diff --git a/interface/web/mail/templates/spamfilter_config_list.htm b/interface/web/mail/templates/spamfilter_config_list.htm
index 5ef5f8e..97566a6 100644
--- a/interface/web/mail/templates/spamfilter_config_list.htm
+++ b/interface/web/mail/templates/spamfilter_config_list.htm
@@ -14,15 +14,15 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="server_name_txt"></th>
<th> </th>
</tr>
<tr>
- <td><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></td>
+ <td><input class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/spamfilter_config_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -31,7 +31,7 @@
<tr>
<td><a href="#" data-load-content="mail/spamfilter_config_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_name"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('mail/spamfilter_config_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('mail/spamfilter_config_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/mail/templates/spamfilter_config_mail_edit.htm b/interface/web/mail/templates/spamfilter_config_mail_edit.htm
index 1dfe747..5858c8e 100644
--- a/interface/web/mail/templates/spamfilter_config_mail_edit.htm
+++ b/interface/web/mail/templates/spamfilter_config_mail_edit.htm
@@ -7,51 +7,51 @@
<fieldset id="wf_area_spamfilter_config">
<span class="wf_oneField">
<label for="module" class="col-sm-3 control-label">{tmpl_var name='module_txt'}</label>
- <select id="module" name="module">{tmpl_var name='module'}</select>
+ <div class="col-sm-9"><select class="form-control" id="module" name="module">{tmpl_var name='module'}</select></div>
</span>
<span class="wf_oneField">
<label for="maildir_path" class="col-sm-3 control-label">{tmpl_var name='maildir_path_txt'}</label>
- <div class="col-sm-9"><input type="text" id="maildir_path" name="maildir_path" value="{tmpl_var name='maildir_path'}">
+ <div class="col-sm-9"><input class="form-control" type="text" id="maildir_path" name="maildir_path" value="{tmpl_var name='maildir_path'}">
</div></span>
<span class="wf_oneField">
<label for="homedir_path" class="col-sm-3 control-label">{tmpl_var name='homedir_path_txt'}</label>
- <div class="col-sm-9"><input type="text" id="homedir_path" name="homedir_path" value="{tmpl_var name='homedir_path'}">
+ <div class="col-sm-9"><input class="form-control" type="text" id="homedir_path" name="homedir_path" value="{tmpl_var name='homedir_path'}">
</div></span>
<span class="wf_oneField">
<label for="mailuser_uid" class="col-sm-3 control-label">{tmpl_var name='mailuser_uid_txt'}</label>
- <div class="col-sm-9"><input type="text" id="mailuser_uid" name="mailuser_uid" value="{tmpl_var name='mailuser_uid'}">
+ <div class="col-sm-9"><input class="form-control" type="text" id="mailuser_uid" name="mailuser_uid" value="{tmpl_var name='mailuser_uid'}">
</div></span>
<span class="wf_oneField">
<label for="mailuser_gid" class="col-sm-3 control-label">{tmpl_var name='mailuser_gid_txt'}</label>
- <div class="col-sm-9"><input type="text" id="mailuser_gid" name="mailuser_gid" value="{tmpl_var name='mailuser_gid'}">
+ <div class="col-sm-9"><input class="form-control" type="text" id="mailuser_gid" name="mailuser_gid" value="{tmpl_var name='mailuser_gid'}">
</div></span>
<span class="wf_oneField">
<label for="mailuser_name" class="col-sm-3 control-label">{tmpl_var name='mailuser_name_txt'}</label>
- <div class="col-sm-9"><input type="text" id="mailuser_name" name="mailuser_name" value="{tmpl_var name='mailuser_name'}">
+ <div class="col-sm-9"><input class="form-control" type="text" id="mailuser_name" name="mailuser_name" value="{tmpl_var name='mailuser_name'}">
</div></span>
<span class="wf_oneField">
<label for="mailuser_group" class="col-sm-3 control-label">{tmpl_var name='mailuser_group_txt'}</label>
- <div class="col-sm-9"><input type="text" id="mailuser_group" name="mailuser_group" value="{tmpl_var name='mailuser_group'}">
+ <div class="col-sm-9"><input class="form-control" type="text" id="mailuser_group" name="mailuser_group" value="{tmpl_var name='mailuser_group'}">
</div></span>
<span class="wf_oneField">
<label for="relayhost" class="col-sm-3 control-label">{tmpl_var name='relayhost_txt'}</label>
- <div class="col-sm-9"><input type="text" id="relayhost" name="relayhost" value="{tmpl_var name='relayhost'}">
+ <div class="col-sm-9"><input class="form-control" type="text" id="relayhost" name="relayhost" value="{tmpl_var name='relayhost'}">
</div></span>
<span class="wf_oneField">
<label for="relayhost_user" class="col-sm-3 control-label">{tmpl_var name='relayhost_user_txt'}</label>
- <div class="col-sm-9"><input type="text" id="relayhost_user" name="relayhost_user" value="{tmpl_var name='relayhost_user'}">
+ <div class="col-sm-9"><input class="form-control" type="text" id="relayhost_user" name="relayhost_user" value="{tmpl_var name='relayhost_user'}">
</div></span>
<span class="wf_oneField">
<label for="relayhost_password" class="col-sm-3 control-label">{tmpl_var name='relayhost_password_txt'}</label>
- <div class="col-sm-9"><input type="text" id="relayhost_password" name="relayhost_password" value="{tmpl_var name='relayhost_password'}">
+ <div class="col-sm-9"><input class="form-control" type="text" id="relayhost_password" name="relayhost_password" value="{tmpl_var name='relayhost_password'}">
</div></span>
<span class="wf_oneField">
<label for="mailbox_size_limit" class="col-sm-3 control-label">{tmpl_var name='mailbox_size_limit_txt'}</label>
- <div class="col-sm-9"><input type="text" id="mailbox_size_limit" name="mailbox_size_limit" value="{tmpl_var name='mailbox_size_limit'}">
+ <div class="col-sm-9"><input class="form-control" type="text" id="mailbox_size_limit" name="mailbox_size_limit" value="{tmpl_var name='mailbox_size_limit'}">
</div></span>
<span class="wf_oneField">
<label for="message_size_limit" class="col-sm-3 control-label">{tmpl_var name='message_size_limit_txt'}</label>
- <div class="col-sm-9"><input type="text" id="message_size_limit" name="message_size_limit" value="{tmpl_var name='message_size_limit'}">
+ <div class="col-sm-9"><input class="form-control" type="text" id="message_size_limit" name="message_size_limit" value="{tmpl_var name='message_size_limit'}">
</div></span>
</fieldset>
diff --git a/interface/web/mail/templates/spamfilter_config_server_edit.htm b/interface/web/mail/templates/spamfilter_config_server_edit.htm
index fcd80d4..aa061bd 100644
--- a/interface/web/mail/templates/spamfilter_config_server_edit.htm
+++ b/interface/web/mail/templates/spamfilter_config_server_edit.htm
@@ -7,23 +7,23 @@
<fieldset id="wf_area_spamfilter_config">
<span class="wf_oneField">
<label for="ip_address" class="col-sm-3 control-label">{tmpl_var name='ip_address_txt'}</label>
- <div class="col-sm-9"><input type="text" id="ip_address" name="ip_address" value="{tmpl_var name='ip_address'}">
+ <div class="col-sm-9"><input class="form-control" type="text" id="ip_address" name="ip_address" value="{tmpl_var name='ip_address'}">
</div></span>
<span class="wf_oneField">
<label for="netmask" class="col-sm-3 control-label">{tmpl_var name='netmask_txt'}</label>
- <div class="col-sm-9"><input type="text" id="netmask" name="netmask" value="{tmpl_var name='netmask'}">
+ <div class="col-sm-9"><input class="form-control" type="text" id="netmask" name="netmask" value="{tmpl_var name='netmask'}">
</div></span>
<span class="wf_oneField">
<label for="gateway" class="col-sm-3 control-label">{tmpl_var name='gateway_txt'}</label>
- <div class="col-sm-9"><input type="text" id="gateway" name="gateway" value="{tmpl_var name='gateway'}">
+ <div class="col-sm-9"><input class="form-control" type="text" id="gateway" name="gateway" value="{tmpl_var name='gateway'}">
</div></span>
<span class="wf_oneField">
<label for="hostname" class="col-sm-3 control-label">{tmpl_var name='hostname_txt'}</label>
- <div class="col-sm-9"><input type="text" id="hostname" name="hostname" value="{tmpl_var name='hostname'}">
+ <div class="col-sm-9"><input class="form-control" type="text" id="hostname" name="hostname" value="{tmpl_var name='hostname'}">
</div></span>
<span class="wf_oneField">
<label for="nameservers" class="col-sm-3 control-label">{tmpl_var name='nameservers_txt'}</label>
- <div class="col-sm-9"><input type="text" id="nameservers" name="nameservers" value="{tmpl_var name='nameservers'}">
+ <div class="col-sm-9"><input class="form-control" type="text" id="nameservers" name="nameservers" value="{tmpl_var name='nameservers'}">
</div></span>
</fieldset>
diff --git a/interface/web/mail/templates/spamfilter_policy_list.htm b/interface/web/mail/templates/spamfilter_policy_list.htm
index 8ed6e5c..1df9880 100644
--- a/interface/web/mail/templates/spamfilter_policy_list.htm
+++ b/interface/web/mail/templates/spamfilter_policy_list.htm
@@ -14,7 +14,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="policy_name_txt"></th>
<th><tmpl_var name="virus_lover_txt"></th>
@@ -24,13 +24,13 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <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>
- <td><select name="search_bad_header_lover">{tmpl_var name='search_bad_header_lover'}</select></td>
+ <td><input class="form-control" type="text" name="search_policy_name" value="{tmpl_var name='search_policy_name'}" /></td>
+ <td><select class="form-control" name="search_virus_lover">{tmpl_var name='search_virus_lover'}</select></td>
+ <td><select class="form-control" name="search_spam_lover">{tmpl_var name='search_spam_lover'}</select></td>
+ <td><select class="form-control" name="search_banned_files_lover">{tmpl_var name='search_banned_files_lover'}</select></td>
+ <td><select class="form-control" name="search_bad_header_lover">{tmpl_var name='search_bad_header_lover'}</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/spamfilter_policy_list.php');">{tmpl_var name="filter_txt"}</button>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/spamfilter_policy_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -43,7 +43,7 @@
<td><a href="#" data-load-content="mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}">{tmpl_var name="banned_files_lover"}</a></td>
<td><a href="#" data-load-content="mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}">{tmpl_var name="bad_header_lover"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('mail/spamfilter_policy_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('mail/spamfilter_policy_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/mail/templates/spamfilter_users_list.htm b/interface/web/mail/templates/spamfilter_users_list.htm
index afe49cd..b06c38f 100644
--- a/interface/web/mail/templates/spamfilter_users_list.htm
+++ b/interface/web/mail/templates/spamfilter_users_list.htm
@@ -14,7 +14,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="local_txt"></th>
<th><tmpl_var name="server_id_txt"></th>
@@ -24,13 +24,13 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <td><select name="search_local">{tmpl_var name='search_local'}</select></td>
- <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><input type="text" name="search_fullname" value="{tmpl_var name='search_fullname'}" /></td>
+ <td><select class="form-control" name="search_local">{tmpl_var name='search_local'}</select></td>
+ <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><select class="form-control" name="search_priority">{tmpl_var name='search_priority'}</select></td>
+ <td><select class="form-control" name="search_policy_id">{tmpl_var name='search_policy_id'}</select></td>
+ <td><input class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/spamfilter_users_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -43,7 +43,7 @@
<td><a href="#" data-load-content="mail/spamfilter_users_edit.php?id={tmpl_var name='id'}">{tmpl_var name="policy_id"}</a></td>
<td><a href="#" data-load-content="mail/spamfilter_users_edit.php?id={tmpl_var name='id'}">{tmpl_var name="fullname"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('mail/spamfilter_users_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('mail/spamfilter_users_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/mail/templates/spamfilter_whitelist_list.htm b/interface/web/mail/templates/spamfilter_whitelist_list.htm
index a2b08e3..61eb8b5 100644
--- a/interface/web/mail/templates/spamfilter_whitelist_list.htm
+++ b/interface/web/mail/templates/spamfilter_whitelist_list.htm
@@ -14,7 +14,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="active_txt"></th>
<th><tmpl_var name="server_id_txt"></th>
@@ -24,13 +24,13 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<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><select name="search_priority">{tmpl_var name='search_priority'}</select></td>
- <td><select name="search_rid">{tmpl_var name='search_rid'}</select></td>
- <td><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
+ <td><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><select class="form-control" name="search_priority">{tmpl_var name='search_priority'}</select></td>
+ <td><select class="form-control" name="search_rid">{tmpl_var name='search_rid'}</select></td>
+ <td><input class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/spamfilter_whitelist_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -43,7 +43,7 @@
<td><a href="#" data-load-content="mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}">{tmpl_var name="rid"}</a></td>
<td><a href="#" data-load-content="mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}">{tmpl_var name="email"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('mail/spamfilter_whitelist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('mail/spamfilter_whitelist_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/mail/templates/user_quota_stats_list.htm b/interface/web/mail/templates/user_quota_stats_list.htm
index b07845e..78e3873 100644
--- a/interface/web/mail/templates/user_quota_stats_list.htm
+++ b/interface/web/mail/templates/user_quota_stats_list.htm
@@ -6,7 +6,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="email_txt"></th>
<th><tmpl_var name="name_txt"></th>
@@ -16,13 +16,13 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <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><input class="form-control" type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
+ <td><input class="form-control" type="text" name="search_system_user" value="{tmpl_var name='search_name'}" /></td>
<td> </td>
<td> </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','mail/user_quota_stats.php');">{tmpl_var name="filter_txt"}</button>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/user_quota_stats.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
diff --git a/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm b/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm
index 484f4ad..136d1eb 100644
--- a/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm
+++ b/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm
@@ -7,15 +7,15 @@
<div class="form-group">
<label for="autoresponder_subject" class="col-sm-3 control-label">{tmpl_var name='autoresponder_subject_txt'}</label>
- <div class="col-sm-9"><input type="text" name="autoresponder_subject" id="autoresponder_subject" value="{tmpl_var name='autoresponder_subject'}" />
+ <div class="col-sm-9"><input class="form-control" type="text" name="autoresponder_subject" id="autoresponder_subject" value="{tmpl_var name='autoresponder_subject'}" />
</div></div>
<div class="form-group">
<label for="autoresponder_text" class="col-sm-3 control-label">{tmpl_var name='autoresponder_text_txt'}</label>
- <div class="col-sm-9"><textarea name="autoresponder_text" id="autoresponder_text" rows='15' cols='30'>{tmpl_var name='autoresponder_text'}</textarea></div>
+ <div class="col-sm-9"><textarea class="form-control" name="autoresponder_text" id="autoresponder_text" rows='15' cols='30'>{tmpl_var name='autoresponder_text'}</textarea></div>
</div>
<div class="form-group">
<label for="autoresponder" class="col-sm-3 control-label">{tmpl_var name='autoresponder_active'}</label>
- <div class="col-sm-9"><input type="checkbox" value="y" id="autoresponder" name="autoresponder" onclick="AR_ResetDates();" {tmpl_var name='ar_active'} />
+ <div class="col-sm-9"><input class="form-control" type="checkbox" value="y" id="autoresponder" name="autoresponder" onclick="AR_ResetDates();" {tmpl_var name='ar_active'} />
</div></div>
<div class="form-group">
<label for="autoresponder_start_date" class="col-sm-3 control-label">{tmpl_var name='autoresponder_start_date_txt'}</label>
diff --git a/interface/web/mailuser/templates/mail_user_filter_edit.htm b/interface/web/mailuser/templates/mail_user_filter_edit.htm
index 73ef2a9..deed911 100644
--- a/interface/web/mailuser/templates/mail_user_filter_edit.htm
+++ b/interface/web/mailuser/templates/mail_user_filter_edit.htm
@@ -11,13 +11,13 @@
</div></div>
<div class="form-group">
<label for="source" class="col-sm-3 control-label">{tmpl_var name='source_txt'}</label>
- <select id="source" name="source" class="textInput formLengthHalf">{tmpl_var name='source'}</select>
- <select id="op" name="op" class="textInput formLengthHalf">{tmpl_var name='op'}</select>
+ <div class="col-sm-9"><select id="source" name="source" class="form-control">{tmpl_var name='source'}</select></div>
+ <div class="col-sm-9"><select id="op" name="op" class="form-control">{tmpl_var name='op'}</select></div>
<div class="col-sm-9"><input type="text" id="searchterm" name="searchterm" value="{tmpl_var name='searchterm'}" class="form-control">
</div></div>
<div class="form-group">
<label for="action" class="col-sm-3 control-label">{tmpl_var name='action_txt'}</label>
- <select id="action" name="action" class="textInput formLengthHalf">{tmpl_var name='action'}</select>
+ <div class="col-sm-9"><select id="action" name="action" class="form-control">{tmpl_var name='action'}</select></div>
<div class="col-sm-9"><input type="text" id="target" name="target" value="{tmpl_var name='target'}" class="form-control">
</div></div>
<div class="form-group">
diff --git a/interface/web/mailuser/templates/mail_user_filter_list.htm b/interface/web/mailuser/templates/mail_user_filter_list.htm
index 139439e..61fb63f 100644
--- a/interface/web/mailuser/templates/mail_user_filter_list.htm
+++ b/interface/web/mailuser/templates/mail_user_filter_list.htm
@@ -13,15 +13,15 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="rulename_txt"></th>
<th> </th>
</tr>
<tr>
- <td><input type="text" name="search_rulename" value="{tmpl_var name='search_rulename'}" /></td>
+ <td><input class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_user_edit.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -30,7 +30,7 @@
<tr>
<td><a href="#" data-load-content="mailuser/mail_user_filter_edit.php?id={tmpl_var name='id'}">{tmpl_var name="rulename"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('mailuser/mail_user_filter_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('mailuser/mail_user_filter_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/monitor/templates/datalog_list.htm b/interface/web/monitor/templates/datalog_list.htm
index f5437b0..74bb1e2 100644
--- a/interface/web/monitor/templates/datalog_list.htm
+++ b/interface/web/monitor/templates/datalog_list.htm
@@ -7,7 +7,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="tstamp_txt"></th>
<th><tmpl_var name="server_id_txt"></th>
@@ -17,11 +17,11 @@
</tr>
<tr>
<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><input type="text" name="search_dbtable" value="{tmpl_var name='search_dbtable'}" /></td>
+ <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><select class="form-control" name="search_action">{tmpl_var name='search_action'}</select></td>
+ <td><input class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','monitor/datalog_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -33,7 +33,7 @@
<td>{tmpl_var name="action"}</td>
<td>{tmpl_var name="dbtable"}</td>
<td>
- <!--<a class="btn btn-default formbutton-delete" href="javascript: del_record('monitor/datalog_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button> -->
+ <!--<a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('monitor/datalog_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button> -->
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/monitor/templates/syslog_list.htm b/interface/web/monitor/templates/syslog_list.htm
index 41ce2ff..c7c968f 100644
--- a/interface/web/monitor/templates/syslog_list.htm
+++ b/interface/web/monitor/templates/syslog_list.htm
@@ -7,7 +7,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="tstamp_txt"></th>
<th><tmpl_var name="server_id_txt"></th>
@@ -17,11 +17,11 @@
</tr>
<tr>
<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><input type="text" name="search_message" value="{tmpl_var name='search_message'}" /></td>
+ <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><select class="form-control" name="search_loglevel">{tmpl_var name='search_loglevel'}</select></td>
+ <td><input class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','monitor/log_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -34,10 +34,10 @@
<td>{tmpl_var name="message"}</td>
<td>
<tmpl_if name="loglevel" op="==" value="Error">
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('monitor/log_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('monitor/log_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</tmpl_if>
<tmpl_if name="loglevel" op="==" value="Warning">
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('monitor/log_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('monitor/log_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</tmpl_if>
</td>
</tr>
diff --git a/interface/web/sites/templates/aps_install_package.htm b/interface/web/sites/templates/aps_install_package.htm
index 5981e9b..b942b9e 100644
--- a/interface/web/sites/templates/aps_install_package.htm
+++ b/interface/web/sites/templates/aps_install_package.htm
@@ -35,12 +35,12 @@
<tmpl_if name='pkg_license_type' op='==' value='url'>
<a href="{tmpl_var name='pkg_license_content'}" target="_blank">{tmpl_var name='pkg_license_content'}</a>
<tmpl_elseif name='pkg_license_content'>
- <div class="col-sm-9"><textarea rows="10" cols="80" id="license_text">{tmpl_var name='pkg_license_content'}</textarea></div>
+ <div class="col-sm-9"><textarea class="form-control" rows="10" cols="80" id="license_text">{tmpl_var name='pkg_license_content'}</textarea></div>
</tmpl_if>
</div>
<div class="form-group">
<label for="license" class="col-sm-3 control-label">{tmpl_var name='acceptance_txt'}</label>
- <div class="col-sm-9"><input type="checkbox" name="license" id="license" <tmpl_if name='inp_license' op='==' value='true'>checked</div></tmpl_if> /> {tmpl_var name='acceptance_text'}
+ <div class="col-sm-9"><input class="form-control" type="checkbox" name="license" id="license" <tmpl_if name='inp_license' op='==' value='true'>checked</div></tmpl_if> /> {tmpl_var name='acceptance_text'}
</div>
diff --git a/interface/web/sites/templates/aps_instances_list.htm b/interface/web/sites/templates/aps_instances_list.htm
index 70f6c20..50e9cc2 100644
--- a/interface/web/sites/templates/aps_instances_list.htm
+++ b/interface/web/sites/templates/aps_instances_list.htm
@@ -4,7 +4,7 @@
<p>{tmpl_var name="list_head_txt"}</p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th>{tmpl_var name='name_txt'}</th>
<th>{tmpl_var name='version_txt'}</th>
@@ -16,15 +16,15 @@
<th > </th>
</tr>
<tr>
- <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><input class="form-control" type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
+ <td><input class="form-control" type="text" name="search_version" value="{tmpl_var name='search_version'}" /></td>
<tmpl_if name='is_noclient'>
- <!--<td><input type="text" name="search_customer_name" value="{tmpl_var name='search_customer_name'}" /></td>-->
+ <!--<td><input class="form-control" 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>
+ <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>
- <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name='filter_txt'}" onclick="submitForm('pageForm','sites/aps_installedpackages_list.php');">{tmpl_var name='filter_txt'}</button>
+ <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>
</td>
</tr>
</thead>
@@ -40,7 +40,7 @@
<td><span id="status_content{tmpl_var name='__ROWNUM__'}">{tmpl_var name='instance_status'}</span></td>
<td>
<tmpl_if name='delete_possible'>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('sites/aps_do_operation.php?action=delete_instance&id={tmpl_var name='id'}','{tmpl_var name='pkg_delete_confirmation'}')">{tmpl_var name='delete_txt'}</button>
+ <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>
</tmpl_if>
</td>
</tr>
diff --git a/interface/web/sites/templates/aps_packagedetails_show.htm b/interface/web/sites/templates/aps_packagedetails_show.htm
index 318b1ce..d13c92d 100644
--- a/interface/web/sites/templates/aps_packagedetails_show.htm
+++ b/interface/web/sites/templates/aps_packagedetails_show.htm
@@ -80,7 +80,7 @@
<tmpl_if name='pkg_license_name'>{tmpl_var name='pkg_license_name'}<br /></tmpl_if>
<tmpl_if name='pkg_license_type' op='==' value='url'><a href="{tmpl_var name='pkg_license_content'}" target="_blank">{tmpl_var name='pkg_license_content'}</a>
<tmpl_elseif name='pkg_license_content'>
- <div class="col-sm-9"><textarea rows="10" cols="80">{tmpl_var name='pkg_license_content'}</textarea></div>
+ <div class="col-sm-9"><textarea class="form-control" rows="10" cols="80">{tmpl_var name='pkg_license_content'}</textarea></div>
</tmpl_if>
</td>
</tr>
diff --git a/interface/web/sites/templates/aps_packages_list.htm b/interface/web/sites/templates/aps_packages_list.htm
index 8f74d18..5e734ac 100644
--- a/interface/web/sites/templates/aps_packages_list.htm
+++ b/interface/web/sites/templates/aps_packages_list.htm
@@ -4,7 +4,7 @@
<p>{tmpl_var name="list_head_txt"} ({tmpl_var name='package_count'})</p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th>{tmpl_var name='name_txt'}</th>
<th>{tmpl_var name='version_txt'}</th>
@@ -15,13 +15,13 @@
<th> </th>
</tr>
<tr>
- <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>
+ <td><input class="form-control" type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
+ <td><input class="form-control" type="text" name="search_version" value="{tmpl_var name='search_version'}" /></td>
+ <td><select class="form-control" 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>
+ <td><select class="form-control" name="search_package_status" onChange="submitForm('pageForm','sites/aps_availablepackages_list.php');">{tmpl_var name='search_package_status'}</select></td>
</tmpl_if>
- <td><button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name='filter_txt'}" onclick="submitForm('pageForm','sites/aps_availablepackages_list.php');">{tmpl_var name='filter_txt'}</button></td>
+ <td><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_availablepackages_list.php');"><span class="icon icon-filter"></span></button></td>
</tr>
</thead>
<tbody>
diff --git a/interface/web/sites/templates/cron_list.htm b/interface/web/sites/templates/cron_list.htm
index 9ca7b8e..92ff1bf 100644
--- a/interface/web/sites/templates/cron_list.htm
+++ b/interface/web/sites/templates/cron_list.htm
@@ -14,7 +14,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="active_txt"></th>
<th><tmpl_var name="server_id_txt"></th>
@@ -28,17 +28,17 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<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><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></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><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><select class="form-control" name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
+ <td><input class="form-control" type="text" name="search_run_min" value="{tmpl_var name='search_run_min'}" /></td>
+ <td><input class="form-control" type="text" name="search_run_hour" value="{tmpl_var name='search_run_hour'}" /></td>
+ <td><input class="form-control" type="text" name="search_run_mday" value="{tmpl_var name='search_run_mday'}" /></td>
+ <td><input class="form-control" type="text" name="search_run_month" value="{tmpl_var name='search_run_month'}" /></td>
+ <td><input class="form-control" type="text" name="search_run_wday" value="{tmpl_var name='search_run_wday'}" /></td>
+ <td><input class="form-control" 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>
+ <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/cron_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -56,7 +56,7 @@
<td><a href="#" data-load-content="sites/cron_edit.php?id={tmpl_var name='id'}">{tmpl_var name="command"}</a></td>
<td>
<div class="buttons icons16">
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('sites/cron_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('sites/cron_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</div>
</td>
</tr>
diff --git a/interface/web/sites/templates/database_admin_list.htm b/interface/web/sites/templates/database_admin_list.htm
index 6e76387..7c0c330 100644
--- a/interface/web/sites/templates/database_admin_list.htm
+++ b/interface/web/sites/templates/database_admin_list.htm
@@ -13,7 +13,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="active_txt"></th>
<th><tmpl_var name="remote_access_txt"></th>
@@ -26,16 +26,16 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <td><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td><select name="search_remote_access">{tmpl_var name='search_remote_access'}</select></td>
- <td><select name="search_type">{tmpl_var name='search_type'}</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><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><input type="text" name="search_database_name" value="{tmpl_var name='search_database_name'}" /></td>
+ <td><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select class="form-control" name="search_remote_access">{tmpl_var name='search_remote_access'}</select></td>
+ <td><select class="form-control" name="search_type">{tmpl_var name='search_type'}</select></td>
+ <td><select class="form-control" name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
+ <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><select class="form-control" name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
+ <td><select class="form-control" name="search_database_user_id">{tmpl_var name='search_database_user_id'}</select></td>
+ <td><input class="form-control" type="text" name="search_database_name" value="{tmpl_var name='search_database_name'}" /></td>
<td>
- <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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/database_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -52,10 +52,10 @@
<td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="database_name"}</a></td>
<td>
<tmpl_if name="dblist_phpmyadmin_link">
- <a class="btn btn-default formbutton-default" href="sites/database_phpmyadmin.php?id={tmpl_var name='id'}" target="phpmyadmin">{tmpl_var name='admin_txt'}</button>
+ <a class="btn btn-default formbutton-default formbutton-narrow" href="sites/database_phpmyadmin.php?id={tmpl_var name='id'}" target="phpmyadmin"><span class="icon icon-dbadmin"></span></button>
</tmpl_if>
- <a class="btn btn-default formbutton-default" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name='edit_txt'}</button>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('sites/database_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-default formbutton-narrow" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}"><span class="icon icon-edit"></span></button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('sites/database_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/sites/templates/database_list.htm b/interface/web/sites/templates/database_list.htm
index 6c2f1e9..c00faae 100644
--- a/interface/web/sites/templates/database_list.htm
+++ b/interface/web/sites/templates/database_list.htm
@@ -30,7 +30,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="active_txt"></th>
<th><tmpl_var name="remote_access_txt"></th>
@@ -42,15 +42,15 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <td><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td><select name="search_remote_access">{tmpl_var name='search_remote_access'}</select></td>
- <td><select name="search_type">{tmpl_var name='search_type'}</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><select name="search_database_user_id">{tmpl_var name='search_database_user_id'}</select></td>
- <td><input type="text" name="search_database_name" value="{tmpl_var name='search_database_name'}"/></td>
+ <td><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select class="form-control" name="search_remote_access">{tmpl_var name='search_remote_access'}</select></td>
+ <td><select class="form-control" name="search_type">{tmpl_var name='search_type'}</select></td>
+ <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><select class="form-control" name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
+ <td><select class="form-control" name="search_database_user_id">{tmpl_var name='search_database_user_id'}</select></td>
+ <td><input class="form-control" type="text" name="search_database_name" value="{tmpl_var name='search_database_name'}"/></td>
<td>
- <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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/database_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -66,10 +66,10 @@
<td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="database_name"}</a></td>
<td>
<tmpl_if name="dblist_phpmyadmin_link">
- <a class="btn btn-default formbutton-default" href="sites/database_phpmyadmin.php?id={tmpl_var name='id'}" target="phpmyadmin">{tmpl_var name='admin_txt'}</button>
+ <a class="btn btn-default formbutton-default formbutton-narrow" href="sites/database_phpmyadmin.php?id={tmpl_var name='id'}" target="phpmyadmin"><span class="icon icon-dbadmin"></span></button>
</tmpl_if>
- <a class="btn btn-default formbutton-default" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name='edit_txt'}</button>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('sites/database_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-default formbutton-narrow" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}"><span class="icon icon-edit"></span></button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('sites/database_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/sites/templates/database_quota_stats_list.htm b/interface/web/sites/templates/database_quota_stats_list.htm
index 80b0bb0..2fd32e5 100644
--- a/interface/web/sites/templates/database_quota_stats_list.htm
+++ b/interface/web/sites/templates/database_quota_stats_list.htm
@@ -6,7 +6,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="database_txt"></th>
<th><tmpl_var name="client_txt"></th>
@@ -16,13 +16,13 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <td><input type="text" name="search_database_name" value="{tmpl_var name='search_database_name'}" /></td>
+ <td><input class="form-control" type="text" name="search_database_name" value="{tmpl_var name='search_database_name'}" /></td>
<td> </td>
<td> </td>
<td> </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','sites/database_quota_stats.php');">{tmpl_var name="filter_txt"}</button>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/database_quota_stats.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
diff --git a/interface/web/sites/templates/database_user_admin_list.htm b/interface/web/sites/templates/database_user_admin_list.htm
index f6d6ca2..4a984e7 100644
--- a/interface/web/sites/templates/database_user_admin_list.htm
+++ b/interface/web/sites/templates/database_user_admin_list.htm
@@ -14,14 +14,14 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="database_user_txt"></th>
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <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>
+ <td><input class="form-control" type="text" name="search_database_user" value="{tmpl_var name='search_database_user'}"/></td>
+ <td><button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/database_user_list.php');"><span class="icon icon-filter"></span></button></td>
</tr>
</thead>
<tbody>
@@ -29,8 +29,8 @@
<tr>
<td><a href="#" data-load-content="sites/database_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="database_user"}</a></td>
<td>
- <a class="btn btn-default formbutton-default" data-load-content="sites/database_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name='edit_txt'}</button>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('sites/database_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-default formbutton-narrow" data-load-content="sites/database_user_edit.php?id={tmpl_var name='id'}"><span class="icon icon-edit"></span></button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('sites/database_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/sites/templates/database_user_list.htm b/interface/web/sites/templates/database_user_list.htm
index 4f6a7e1..b083279 100644
--- a/interface/web/sites/templates/database_user_list.htm
+++ b/interface/web/sites/templates/database_user_list.htm
@@ -30,14 +30,14 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="database_user_txt"></th>
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <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>
+ <td><input class="form-control" type="text" name="search_database_user" value="{tmpl_var name='search_database_user'}"/></td>
+ <td><button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/database_user_list.php');"><span class="icon icon-filter"></span></button></td>
</tr>
</thead>
<tbody>
@@ -45,8 +45,8 @@
<tr>
<td><a href="#" data-load-content="sites/database_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="database_user"}</a></td>
<td>
- <a class="btn btn-default formbutton-default" data-load-content="sites/database_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name='edit_txt'}</button>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('sites/database_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-default formbutton-narrow" data-load-content="sites/database_user_edit.php?id={tmpl_var name='id'}"><span class="icon icon-edit"></span></button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('sites/database_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/sites/templates/ftp_user_list.htm b/interface/web/sites/templates/ftp_user_list.htm
index 9526c24..048350a 100644
--- a/interface/web/sites/templates/ftp_user_list.htm
+++ b/interface/web/sites/templates/ftp_user_list.htm
@@ -30,7 +30,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="active_txt"></th>
<th><tmpl_var name="server_id_txt"></th>
@@ -39,12 +39,12 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<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><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
- <td><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
+ <td><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><select class="form-control" name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
+ <td><input class="form-control" 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>
+ <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/ftp_user_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -57,9 +57,9 @@
<td><a href="#" data-load-content="sites/ftp_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="username"}</a></td>
<td>
<tmpl_if name="webftp_link">
- <a class="btn btn-default formbutton-default" href="{tmpl_var name='webftp_url'}" target="_blank">{tmpl_var name='admin_txt'}</button>
+ <a class="btn btn-default formbutton-default formbutton-narrow" href="{tmpl_var name='webftp_url'}" target="_blank"><span class="icon icon-dbadmin"></span></button>
</tmpl_if>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('sites/ftp_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('sites/ftp_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/sites/templates/shell_user_edit.htm b/interface/web/sites/templates/shell_user_edit.htm
index 3bc3ab8..4b16539 100644
--- a/interface/web/sites/templates/shell_user_edit.htm
+++ b/interface/web/sites/templates/shell_user_edit.htm
@@ -51,7 +51,7 @@
</div>
<div class="form-group">
<label for="ssh_rsa" class="col-sm-3 control-label">{tmpl_var name='ssh_rsa_txt'}</label>
- <div class="col-sm-9"><textarea name="ssh_rsa" id="ssh_rsa" rows="10" cols="30">{tmpl_var name='ssh_rsa'}</textarea></div>
+ <div class="col-sm-9"><textarea class="form-control" name="ssh_rsa" id="ssh_rsa" rows="10" cols="30">{tmpl_var name='ssh_rsa'}</textarea></div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
diff --git a/interface/web/sites/templates/shell_user_list.htm b/interface/web/sites/templates/shell_user_list.htm
index 23d5417..a04469c 100644
--- a/interface/web/sites/templates/shell_user_list.htm
+++ b/interface/web/sites/templates/shell_user_list.htm
@@ -30,7 +30,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="active_txt"></th>
<th><tmpl_var name="server_id_txt"></th>
@@ -39,12 +39,12 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<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><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
- <td><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
+ <td><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><select class="form-control" name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
+ <td><input class="form-control" 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>
+ <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/shell_user_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -56,7 +56,7 @@
<td><a href="#" data-load-content="sites/shell_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="parent_domain_id"}</a></td>
<td><a href="#" data-load-content="sites/shell_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="username"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('sites/shell_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('sites/shell_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/sites/templates/user_quota_stats_list.htm b/interface/web/sites/templates/user_quota_stats_list.htm
index 641f06f..9310985 100644
--- a/interface/web/sites/templates/user_quota_stats_list.htm
+++ b/interface/web/sites/templates/user_quota_stats_list.htm
@@ -6,7 +6,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="domain_txt"></th>
<th><tmpl_var name="system_user_txt"></th>
@@ -17,14 +17,14 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <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><input class="form-control" type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+ <td><input class="form-control" type="text" name="search_system_user" value="{tmpl_var name='search_system_user'}" /></td>
<td> </td>
<td> </td>
<td> </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','sites/user_quota_stats.php');">{tmpl_var name="filter_txt"}</button>
+ <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/user_quota_stats.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
diff --git a/interface/web/sites/templates/web_backup_list.htm b/interface/web/sites/templates/web_backup_list.htm
index 22ea0b7..e46eda6 100644
--- a/interface/web/sites/templates/web_backup_list.htm
+++ b/interface/web/sites/templates/web_backup_list.htm
@@ -10,7 +10,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="date_txt"></th>
<th><tmpl_var name="backup_type_txt"></th>
diff --git a/interface/web/sites/templates/web_childdomain_advanced.htm b/interface/web/sites/templates/web_childdomain_advanced.htm
index 430fe48..2f00c50 100644
--- a/interface/web/sites/templates/web_childdomain_advanced.htm
+++ b/interface/web/sites/templates/web_childdomain_advanced.htm
@@ -7,7 +7,7 @@
<legend>Options</legend>
<div class="form-group proxy">
<label for="proxy_directives" class="col-sm-3 control-label">{tmpl_var name='proxy_directives_txt'}</label>
- <div class="col-sm-9"><textarea name="proxy_directives" id="proxy_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='proxy_directives'}</textarea></div> <b>{tmpl_var name="available_proxy_directive_snippets_txt"}</b><br><br> {tmpl_var name="proxy_directive_snippets_txt"}
+ <div class="col-sm-9"><textarea class="form-control" name="proxy_directives" id="proxy_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='proxy_directives'}</textarea></div> <b>{tmpl_var name="available_proxy_directive_snippets_txt"}</b><br><br> {tmpl_var name="proxy_directive_snippets_txt"}
</div>
diff --git a/interface/web/sites/templates/web_childdomain_list.htm b/interface/web/sites/templates/web_childdomain_list.htm
index 7a011ff..bb5ab52 100644
--- a/interface/web/sites/templates/web_childdomain_list.htm
+++ b/interface/web/sites/templates/web_childdomain_list.htm
@@ -30,7 +30,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="active_txt"></th>
<th><tmpl_var name="server_id_txt"></th>
@@ -39,12 +39,12 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<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><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
- <td><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+ <td><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><select class="form-control" name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
+ <td><input class="form-control" 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>
+ <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/web_childdomain_list.php?type={tmpl_var name="childdomain_type"}');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -56,7 +56,7 @@
<td><a href="#" data-load-content="sites/web_childdomain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="parent_domain_id"}</a></td>
<td><a href="#" data-load-content="sites/web_childdomain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="domain"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('sites/web_childdomain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('sites/web_childdomain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/sites/templates/web_folder_list.htm b/interface/web/sites/templates/web_folder_list.htm
index da11a0c..07c5556 100644
--- a/interface/web/sites/templates/web_folder_list.htm
+++ b/interface/web/sites/templates/web_folder_list.htm
@@ -29,7 +29,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="active_txt"></th>
<th><tmpl_var name="server_id_txt"></th>
@@ -38,12 +38,12 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <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><input type="text" name="search_path" value="{tmpl_var name='search_path'}" /></td>
+ <td><select class="form-control" name="search_active" onChange="submitForm('pageForm','sites/web_folder_list.php');">{tmpl_var name='search_active'}</select></td>
+ <td><select class="form-control" name="search_server_id" onChange="submitForm('pageForm','sites/web_folder_list.php');">{tmpl_var name='search_server_id'}</select></td>
+ <td><select class="form-control" name="search_parent_domain_id" onChange="submitForm('pageForm','sites/web_folder_list.php');">{tmpl_var name='search_parent_domain_id'}</select></td>
+ <td><input class="form-control" 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>
+ <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/web_folder_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -55,7 +55,7 @@
<td><a href="#" data-load-content="sites/web_folder_edit.php?id={tmpl_var name='id'}">{tmpl_var name="parent_domain_id"}</a></td>
<td><a href="#" data-load-content="sites/web_folder_edit.php?id={tmpl_var name='id'}">{tmpl_var name="path"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('sites/web_folder_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('sites/web_folder_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/sites/templates/web_folder_user_list.htm b/interface/web/sites/templates/web_folder_user_list.htm
index ca75ef8..6c4f53a 100644
--- a/interface/web/sites/templates/web_folder_user_list.htm
+++ b/interface/web/sites/templates/web_folder_user_list.htm
@@ -29,7 +29,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="active_txt"></th>
<th><tmpl_var name="web_folder_id_txt"></th>
@@ -37,11 +37,11 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<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><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
+ <td><select class="form-control" name="search_active" onChange="submitForm('pageForm','sites/web_folder_user_list.php');">{tmpl_var name='search_active'}</select></td>
+ <td><select class="form-control" name="search_web_folder_id" onChange="submitForm('pageForm','sites/web_folder_user_list.php');">{tmpl_var name='search_web_folder_id'}</select></td>
+ <td><input class="form-control" 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>
+ <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/web_folder_user_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -52,7 +52,7 @@
<td><a href="#" data-load-content="sites/web_folder_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="web_folder_id"}</a></td>
<td><a href="#" data-load-content="sites/web_folder_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="username"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('sites/web_folder_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('sites/web_folder_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/sites/templates/web_sites_stats_list.htm b/interface/web/sites/templates/web_sites_stats_list.htm
index 22c73a8..c771276 100644
--- a/interface/web/sites/templates/web_sites_stats_list.htm
+++ b/interface/web/sites/templates/web_sites_stats_list.htm
@@ -7,7 +7,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="domain_txt"></th>
<th><tmpl_var name="this_month_txt"></th>
@@ -17,13 +17,13 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <td><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+ <td><input class="form-control" type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
<td></td>
<td></td>
<td></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','sites/web_sites_stats.php');">{tmpl_var name="filter_txt"}</button>
+ <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/web_sites_stats.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
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 fea321d..945b79e 100644
--- a/interface/web/sites/templates/web_vhost_domain_admin_list.htm
+++ b/interface/web/sites/templates/web_vhost_domain_admin_list.htm
@@ -13,7 +13,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<tmpl_if name="vhostdomain_type" value="domain"><th><tmpl_var name="domain_id_txt"></th></tmpl_if>
<th><tmpl_var name="active_txt"></th>
@@ -24,14 +24,14 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <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><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+ <tmpl_if name="vhostdomain_type" value="domain"><td><input class="form-control" type="text" name="search_domain_id" value="{tmpl_var name='search_domain_id'}" /></td></tmpl_if>
+ <td><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select class="form-control" name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
+ <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <tmpl_if name="vhostdomain_type" op="!=" value="domain"><td><select class="form-control" name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td></tmpl_if>
+ <td><input class="form-control" 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>
+ <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/web_vhost_domain_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -43,9 +43,9 @@
<td><a href="#" data-load-content="sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}&type={tmpl_var name='vhostdomain_type'}">{tmpl_var name="sys_groupid"}</a></td>
<td><a href="#" data-load-content="sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}&type={tmpl_var name='vhostdomain_type'}">{tmpl_var name="server_id"}</a></td>
<tmpl_if name="vhostdomain_type" op="!=" value="domain"><td><a href="#" data-load-content="sites/web_vhost_aliasdomain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="parent_domain_id"}</a></td></tmpl_if>
- <td><a href="#" data-load-content="sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}&type={tmpl_var name='vhostdomain_type'}">{tmpl_var name="domain"}</a><a href="http://{tmpl_var name="domain"}" target="_blank" class="btn btn-default formbutton-default">Link</button></td>
+ <td><a href="#" data-load-content="sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}&type={tmpl_var name='vhostdomain_type'}">{tmpl_var name="domain"}</a><a href="http://{tmpl_var name="domain"}" target="_blank" class="btn btn-default formbutton-default formbutton-narrower"><span class="icon icon-link"></span></button></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('sites/web_vhost_domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('sites/web_vhost_domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/sites/templates/web_vhost_domain_advanced.htm b/interface/web/sites/templates/web_vhost_domain_advanced.htm
index fc479de..1374d55 100644
--- a/interface/web/sites/templates/web_vhost_domain_advanced.htm
+++ b/interface/web/sites/templates/web_vhost_domain_advanced.htm
@@ -84,19 +84,19 @@
</div></div>
<div class="form-group php">
<label for="custom_php_ini" class="col-sm-3 control-label">{tmpl_var name='custom_php_ini_txt'}</label>
- <div class="col-sm-9"><textarea name="custom_php_ini" id="custom_php_ini" rows='10' cols='50' style="width:400px;">{tmpl_var name='custom_php_ini'}</textarea></div> <b>{tmpl_var name="available_php_directive_snippets_txt"}</b><br><br> {tmpl_var name="php_directive_snippets_txt"}
+ <div class="col-sm-9"><textarea class="form-control" name="custom_php_ini" id="custom_php_ini" rows='10' cols='50' style="width:400px;">{tmpl_var name='custom_php_ini'}</textarea></div> <b>{tmpl_var name="available_php_directive_snippets_txt"}</b><br><br> {tmpl_var name="php_directive_snippets_txt"}
</div>
<div class="form-group apache">
<label for="apache_directives" class="col-sm-3 control-label">{tmpl_var name='apache_directives_txt'}</label>
- <div class="col-sm-9"><textarea name="apache_directives" id="apache_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='apache_directives'}</textarea></div> <b>{tmpl_var name="available_apache_directive_snippets_txt"}</b><br><br> {tmpl_var name="apache_directive_snippets_txt"}<br>----<br><b> {tmpl_var name='variables_txt'}:</b> <a href="javascript:void(0);" class="addPlaceholder">{DOCROOT}</a>
+ <div class="col-sm-9"><textarea class="form-control" name="apache_directives" id="apache_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='apache_directives'}</textarea></div> <b>{tmpl_var name="available_apache_directive_snippets_txt"}</b><br><br> {tmpl_var name="apache_directive_snippets_txt"}<br>----<br><b> {tmpl_var name='variables_txt'}:</b> <a href="javascript:void(0);" class="addPlaceholder">{DOCROOT}</a>
</div>
<div class="form-group nginx">
<label for="nginx_directives" class="col-sm-3 control-label">{tmpl_var name='nginx_directives_txt'}</label>
- <div class="col-sm-9"><textarea name="nginx_directives" id="nginx_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='nginx_directives'}</textarea></div> <b>{tmpl_var name="available_nginx_directive_snippets_txt"}</b><br><br> {tmpl_var name="nginx_directive_snippets_txt"}<br>----<br><b> {tmpl_var name='variables_txt'}:</b> <a href="javascript:void(0);" class="addPlaceholder">{DOCROOT}</a>, <a href="javascript:void(0);" class="addPlaceholder">{FASTCGIPASS}</a>
+ <div class="col-sm-9"><textarea class="form-control" name="nginx_directives" id="nginx_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='nginx_directives'}</textarea></div> <b>{tmpl_var name="available_nginx_directive_snippets_txt"}</b><br><br> {tmpl_var name="nginx_directive_snippets_txt"}<br>----<br><b> {tmpl_var name='variables_txt'}:</b> <a href="javascript:void(0);" class="addPlaceholder">{DOCROOT}</a>, <a href="javascript:void(0);" class="addPlaceholder">{FASTCGIPASS}</a>
</div>
<div class="form-group proxy">
<label for="proxy_directives" class="col-sm-3 control-label">{tmpl_var name='proxy_directives_txt'}</label>
- <div class="col-sm-9"><textarea name="proxy_directives" id="proxy_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='proxy_directives'}</textarea></div> <b>{tmpl_var name="available_proxy_directive_snippets_txt"}</b><br><br> {tmpl_var name="proxy_directive_snippets_txt"}
+ <div class="col-sm-9"><textarea class="form-control" name="proxy_directives" id="proxy_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='proxy_directives'}</textarea></div> <b>{tmpl_var name="available_proxy_directive_snippets_txt"}</b><br><br> {tmpl_var name="proxy_directive_snippets_txt"}
</div>
diff --git a/interface/web/sites/templates/web_vhost_domain_list.htm b/interface/web/sites/templates/web_vhost_domain_list.htm
index 8244cdd..116b5af 100644
--- a/interface/web/sites/templates/web_vhost_domain_list.htm
+++ b/interface/web/sites/templates/web_vhost_domain_list.htm
@@ -30,7 +30,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<tmpl_if name="vhostdomain_type" value="domain"><th><tmpl_var name="domain_id_txt"></th></tmpl_if>
<th><tmpl_var name="active_txt"></th>
@@ -40,13 +40,13 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <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><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
+ <tmpl_if name="vhostdomain_type" value="domain"><td><input class="form-control" type="text" name="search_domain_id" value="{tmpl_var name='search_domain_id'}" /></td></tmpl_if>
+ <td><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <tmpl_if name="vhostdomain_type" op="!=" value="domain"><td><select class="form-control" name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td></tmpl_if>
+ <td><input class="form-control" 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>
+ <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/web_vhost_domain_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -57,9 +57,9 @@
<td><a href="#" data-load-content="sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}&type={tmpl_var name='vhostdomain_type'}">{tmpl_var name="active"}</a></td>
<td><a href="#" data-load-content="sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}&type={tmpl_var name='vhostdomain_type'}">{tmpl_var name="server_id"}</a></td>
<tmpl_if name="vhostdomain_type" op="!=" value="domain"><td><a href="#" data-load-content="sites/web_vhost_aliasdomain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="parent_domain_id"}</a></td></tmpl_if>
- <td><a href="#" data-load-content="sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}&type={tmpl_var name='vhostdomain_type'}">{tmpl_var name="domain"}</a><a href="http://{tmpl_var name="domain"}" target="_blank" class="btn btn-default formbutton-default">Link</button></td>
+ <td><a href="#" data-load-content="sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}&type={tmpl_var name='vhostdomain_type'}">{tmpl_var name="domain"}</a><a href="http://{tmpl_var name="domain"}" target="_blank" class="btn btn-default formbutton-default formbutton-narrower"><span class="icon icon-link"></span></button></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('sites/web_vhost_domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('sites/web_vhost_domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/sites/templates/web_vhost_domain_redirect.htm b/interface/web/sites/templates/web_vhost_domain_redirect.htm
index a810705..4f10fea 100644
--- a/interface/web/sites/templates/web_vhost_domain_redirect.htm
+++ b/interface/web/sites/templates/web_vhost_domain_redirect.htm
@@ -32,7 +32,7 @@
</div></div>
<div class="form-group nginx">
<label for="rewrite_rules" class="col-sm-3 control-label">{tmpl_var name='rewrite_rules_txt'}</label>
- <div class="col-sm-9"><textarea name="rewrite_rules" id="rewrite_rules" rows='10' cols='50' style="width:400px;">{tmpl_var name='rewrite_rules'}</textarea></div> <b>{tmpl_var name="allowed_rewrite_rule_directives_txt"}</b><br><br> break<br> if<br> return<br> rewrite<br> set<br><br> <a href="http://wiki.nginx.org/HttpRewriteModule" target="_blank">http://wiki.nginx.org/HttpRewriteModule</a>
+ <div class="col-sm-9"><textarea class="form-control" name="rewrite_rules" id="rewrite_rules" rows='10' cols='50' style="width:400px;">{tmpl_var name='rewrite_rules'}</textarea></div> <b>{tmpl_var name="allowed_rewrite_rule_directives_txt"}</b><br><br> break<br> if<br> return<br> rewrite<br> set<br><br> <a href="http://wiki.nginx.org/HttpRewriteModule" target="_blank">http://wiki.nginx.org/HttpRewriteModule</a>
</div>
diff --git a/interface/web/sites/templates/web_vhost_domain_ssl.htm b/interface/web/sites/templates/web_vhost_domain_ssl.htm
index 2ff5ee8..d40dfd8 100644
--- a/interface/web/sites/templates/web_vhost_domain_ssl.htm
+++ b/interface/web/sites/templates/web_vhost_domain_ssl.htm
@@ -44,19 +44,19 @@
</div></div>
<div class="form-group">
<label for="ssl_request" class="col-sm-3 control-label">{tmpl_var name='ssl_key_txt'}</label>
- <div class="col-sm-9"><textarea name="ssl_key" id="ssl_key" rows='10' cols='30'>{tmpl_var name='ssl_key'}</textarea></div>
+ <div class="col-sm-9"><textarea class="form-control" name="ssl_key" id="ssl_key" rows='10' cols='30'>{tmpl_var name='ssl_key'}</textarea></div>
</div>
<div class="form-group">
<label for="ssl_request" class="col-sm-3 control-label">{tmpl_var name='ssl_request_txt'}</label>
- <div class="col-sm-9"><textarea name="ssl_request" id="ssl_request" rows='10' cols='30'>{tmpl_var name='ssl_request'}</textarea></div>
+ <div class="col-sm-9"><textarea class="form-control" name="ssl_request" id="ssl_request" rows='10' cols='30'>{tmpl_var name='ssl_request'}</textarea></div>
</div>
<div class="form-group">
<label for="ssl_cert" class="col-sm-3 control-label">{tmpl_var name='ssl_cert_txt'}</label>
- <div class="col-sm-9"><textarea name="ssl_cert" id="ssl_cert" rows='10' cols='30'>{tmpl_var name='ssl_cert'}</textarea></div>
+ <div class="col-sm-9"><textarea class="form-control" name="ssl_cert" id="ssl_cert" rows='10' cols='30'>{tmpl_var name='ssl_cert'}</textarea></div>
</div>
<div class="form-group">
<label for="ssl_bundle" class="col-sm-3 control-label">{tmpl_var name='ssl_bundle_txt'}</label>
- <div class="col-sm-9"><textarea name="ssl_bundle" id="ssl_bundle" rows='10' cols='30'>{tmpl_var name='ssl_bundle'}</textarea></div>
+ <div class="col-sm-9"><textarea class="form-control" name="ssl_bundle" id="ssl_bundle" rows='10' cols='30'>{tmpl_var name='ssl_bundle'}</textarea></div>
</div>
<div class="form-group">
<label for="ssl_action" class="col-sm-3 control-label">{tmpl_var name='ssl_action_txt'}</label>
diff --git a/interface/web/sites/templates/webdav_user_list.htm b/interface/web/sites/templates/webdav_user_list.htm
index 40ad485..5e7b513 100644
--- a/interface/web/sites/templates/webdav_user_list.htm
+++ b/interface/web/sites/templates/webdav_user_list.htm
@@ -30,7 +30,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="active_txt"></th>
<th><tmpl_var name="server_id_txt"></th>
@@ -39,12 +39,12 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<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><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
- <td><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
+ <td><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><select class="form-control" name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
+ <td><input class="form-control" 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>
+ <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/webdav_user_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -56,7 +56,7 @@
<td><a href="#" data-load-content="sites/webdav_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="parent_domain_id"}</a></td>
<td><a href="#" data-load-content="sites/webdav_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="username"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('sites/webdav_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('sites/webdav_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/themes/blue/templates/main.tpl.htm b/interface/web/themes/blue/templates/main.tpl.htm
index f2ace7f..260c727 100644
--- a/interface/web/themes/blue/templates/main.tpl.htm
+++ b/interface/web/themes/blue/templates/main.tpl.htm
@@ -143,7 +143,7 @@
<!-- end: skip link navigation -->
<tmpl_if name="cpuser">
<a href="#logout" data-load-content="login/logout.php"><tmpl_var format="strtoupper" name="logout_txt"> <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>-->
- <tmpl_if name='usertype' op='==' value='normaluser'><div class="col-sm-9"><input type="text" id="globalsearch" value="" /></div></tmpl_if>
+ <tmpl_if name='usertype' op='==' value='normaluser'><div class="col-sm-9"><input class="form-control" type="text" id="globalsearch" value="" /></div></tmpl_if>
</tmpl_if>
</nav>
<h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>
@@ -161,7 +161,7 @@
<!-- begin: #content -->
<section id="content">
<form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class="uniForm">
- <div class="col-sm-9"><input type="text" style="display:none" /></div><input type="password" style="display:none"/>
+ <div class="col-sm-9"><input class="form-control" type="text" style="display:none" /></div><input type="password" style="display:none"/>
<div id="pageContent"><!-- AJAX CONTENT --></div>
</form>
<div id="ie_clearing"> </div>
@@ -178,7 +178,7 @@
<div id="dummy_login" style="display:none;position:absolute;top:-1000px;left:-1000px;">
<form action="" method="post" target="dummy_login" id="dummy_login_form">
-<div class="col-sm-9"><input type="text" name="username" id="dummy_username" autocomplete="on" value="" />
+<div class="col-sm-9"><input class="form-control" type="text" name="username" id="dummy_username" autocomplete="on" value="" />
</div><input name="passwort" id="dummy_passwort" type="password" autocomplete="on" value="" />
<input type="submit" value="Login" id="dummy_submit"/>
</form>
diff --git a/interface/web/themes/default/assets/fonts/ispconfig.eot b/interface/web/themes/default/assets/fonts/ispconfig.eot
index f433d14..a6af458 100644
--- a/interface/web/themes/default/assets/fonts/ispconfig.eot
+++ b/interface/web/themes/default/assets/fonts/ispconfig.eot
Binary files differ
diff --git a/interface/web/themes/default/assets/fonts/ispconfig.svg b/interface/web/themes/default/assets/fonts/ispconfig.svg
index 606db8a..0ee8980 100644
--- a/interface/web/themes/default/assets/fonts/ispconfig.svg
+++ b/interface/web/themes/default/assets/fonts/ispconfig.svg
@@ -3,23 +3,30 @@
<svg xmlns="http://www.w3.org/2000/svg">
<metadata>Generated by IcoMoon</metadata>
<defs>
-<font id="ispconfig" horiz-adv-x="512">
-<font-face units-per-em="512" ascent="480" descent="-32" />
-<missing-glyph horiz-adv-x="512" />
-<glyph unicode=" " d="" horiz-adv-x="256" />
-<glyph unicode="" d="M435.001 328.713h-0.005c0-0.036 0.003-0.072 0.003-0.108 0.014 9.983-5.675 19.021-15.61 24.794l-137.159 79.708c-7.16 4.16-16.325 6.452-25.805 6.452-9.463 0-18.63-2.283-25.808-6.428l-138.053-79.707c-10.005-5.774-15.752-14.829-15.764-24.837 0-0.042 0.004-0.083 0.004-0.123 0 0.003 0 0.007 0 0.011h-0.005v-0.013l0.198-44.654c0.029-9.941 5.721-18.938 15.613-24.685l137.157-79.709c7.16-4.161 16.323-6.452 25.803-6.452 9.463 0 18.63 2.283 25.808 6.428l138.055 79.707c10.048 5.798 15.796 14.892 15.767 24.95l-0.199 44.666zM103.793 334.097l138.053 79.707c3.764 2.173 9.078 3.419 14.582 3.419 5.498 0 10.792-1.243 14.524-3.412l137.157-79.707c1.337-0.776 4.445-2.852 4.442-5.35-0.003-2.534-3.175-4.639-4.539-5.426l-138.057-79.705c-3.764-2.174-9.077-3.421-14.582-3.421-5.498 0-10.792 1.244-14.522 3.412l-137.157 79.707c-1.337 0.776-4.444 2.852-4.439 5.352 0.004 2.533 3.174 4.637 4.539 5.424zM403.437 274.541l-23.947-13.825c-5.108-2.95-9.255-0.587-9.273 5.283-0.017 5.87 4.103 13.021 9.214 15.97l23.947 13.825c5.096 2.942 9.255 0.572 9.272-5.298 0.018-5.87-4.113-13.015-9.212-15.956zM434.418 253.869c-1.624-7.931-6.92-14.952-15.182-19.72l-138.055-79.707c-7.18-4.146-16.346-6.426-25.809-6.426-9.481 0-18.644 2.291-25.804 6.45l-137.157 79.709c-8.206 4.768-13.454 11.779-15.046 19.695h-0.552l0.184-64.964c0.029-9.942 5.721-18.94 15.613-24.688l137.157-79.707c7.16-4.159 16.323-6.452 25.803-6.452 9.463 0 18.63 2.285 25.808 6.43l138.055 79.705c10.048 5.8 15.796 14.894 15.767 24.95l-0.184 64.728h-0.598zM403.437 179.738l-23.947-13.823c-5.108-2.952-9.255-0.587-9.273 5.283-0.017 5.87 4.103 13.021 9.214 15.971l23.947 13.825c5.096 2.942 9.255 0.571 9.272-5.3 0.018-5.87-4.113-13.014-9.212-15.956z" />
-<glyph unicode="" d="M435.001 354h-0.005c0-0.036 0.003-0.072 0.003-0.108 0.014 9.983-5.675 19.022-15.61 24.794l-137.159 79.709c-7.16 4.159-16.325 6.452-25.805 6.452-9.463 0-18.63-2.283-25.808-6.428l-138.053-79.707c-10.005-5.775-15.752-14.829-15.764-24.838 0-0.041 0.004-0.083 0.004-0.123 0 0.003 0 0.007 0 0.011h-0.005v-0.012l0.198-69.94c0.029-9.942 5.721-18.938 15.613-24.685l137.157-79.709c7.16-4.161 16.323-6.452 25.803-6.452 9.463 0 18.63 2.283 25.808 6.428l138.055 79.707c10.048 5.798 15.796 14.893 15.767 24.95l-0.199 69.953zM103.793 359.385l138.053 79.707c3.764 2.173 9.078 3.419 14.582 3.419 5.498 0 10.792-1.243 14.524-3.412l137.157-79.707c1.337-0.776 4.445-2.852 4.442-5.35-0.003-2.534-3.175-4.639-4.539-5.426l-138.057-79.705c-3.764-2.175-9.077-3.421-14.582-3.421-5.498 0-10.792 1.245-14.522 3.412l-137.157 79.707c-1.337 0.776-4.444 2.852-4.439 5.352 0.004 2.533 3.174 4.637 4.539 5.424zM403.437 274.541l-23.947-13.825c-5.108-2.95-9.255-0.587-9.273 5.283-0.017 5.87 4.103 13.021 9.214 15.97l23.947 13.825c5.096 2.942 9.255 0.572 9.272-5.298 0.018-5.87-4.113-13.015-9.212-15.956zM434.418 253.869c-1.624-7.931-6.92-14.952-15.182-19.72l-138.055-79.707c-7.18-4.146-16.346-6.426-25.809-6.426-9.481 0-18.644 2.291-25.804 6.45l-137.157 79.709c-8.206 4.768-13.454 11.779-15.046 19.695h-0.552l0.184-64.964c0.029-9.942 5.721-18.94 15.613-24.688l137.157-79.707c7.16-4.159 16.323-6.452 25.803-6.452 9.463 0 18.63 2.285 25.808 6.43l138.055 79.705c10.048 5.8 15.796 14.894 15.767 24.95l-0.184 64.728h-0.598zM403.437 179.738l-23.947-13.823c-5.108-2.952-9.255-0.587-9.273 5.283-0.017 5.87 4.103 13.021 9.214 15.971l23.947 13.825c5.096 2.942 9.255 0.571 9.272-5.3 0.018-5.87-4.113-13.014-9.212-15.956zM434.418 158.966c-1.624-7.933-6.92-14.952-15.182-19.721l-138.055-79.707c-7.18-4.146-16.346-6.428-25.809-6.428-9.481 0-18.644 2.292-25.804 6.45l-137.157 79.709c-8.206 4.769-13.454 11.779-15.046 19.695h-0.552l0.184-64.964c0.029-9.943 5.721-18.94 15.613-24.689l137.157-79.707c7.16-4.159 16.323-6.45 25.803-6.45 9.463 0 18.63 2.283 25.808 6.428l138.055 79.705c10.048 5.8 15.796 14.894 15.767 24.95l-0.184 64.728h-0.598zM403.437 84.836l-23.947-13.825c-5.108-2.95-9.255-0.587-9.273 5.283-0.017 5.87 4.103 13.021 9.214 15.971l23.947 13.825c5.096 2.942 9.255 0.572 9.272-5.298 0.018-5.87-4.113-13.014-9.212-15.956z" />
-<glyph unicode="" d="M243.85 161.313l-0.025 0.027-0.025 0.029c-3.543 4.116-5.316 9.847-5.583 18.262-5.56 0.262-11.343 1.498-15.368 6.2l-0.029 0.033-0.028 0.033c-5.405 6.399-8.544 10.195-8.675 10.353l-0.025 0.030-0.024 0.030c-2.571 3.147-5.203 8.253-6.188 14.524l-88.799-88.805c-13.403-13.387-13.403-35.088 0-48.452 13.381-13.403 35.070-13.403 48.452 0l81.646 81.637c-1.761 2.007-3.534 4.034-5.331 6.097zM145.872 84.752c-5.733-2.146-12.159 0.759-14.31 6.556-2.179 5.743 0.763 12.139 6.531 14.318 5.767 2.175 12.159-0.758 14.305-6.53 2.185-5.773-0.759-12.173-6.526-14.344zM446.551 352.903l-38.91-38.914-37.974 10.19-10.173 37.945 38.909 38.914c-24.777 7.551-52.806 1.535-72.416-18.070-8.782-8.787-14.195-18.63-16.658-28.885-3.111-11.725-1.884-25.226 3.385-38.404l-41.911-41.915c6.060-0.939 10.51-3.353 12.901-4.954 0.031-0.021 0.063-0.042 0.094-0.062 0.156-0.106 0.301-0.205 0.438-0.303 0.062-0.043 0.121-0.084 0.178-0.126 0.108-0.078 0.212-0.153 0.307-0.224 0.081-0.059 0.149-0.111 0.219-0.164 0.062-0.048 0.13-0.097 0.183-0.14 0.119-0.094 0.222-0.176 0.306-0.244 0.161-0.132 4.022-3.309 10.38-8.697 4.577-3.865 6.011-9.457 6.3-15.43 8.373-0.277 14.038-2.037 18.166-5.603l0.037-0.032c1.318-1.148 2.62-2.284 3.913-3.415 0.735-0.643 1.468-1.284 2.197-1.922l34.762 34.759c13.028-5.194 26.394-6.459 38.034-3.486 10.392 2.428 20.372 7.88 29.277 16.771 19.587 19.6 25.601 47.629 18.058 72.412zM311.57 227.738c-4.875 4.212-23.529 1.607-23.529 1.607s2.273 16.726-0.824 19.33c-6.364 5.394-10.243 8.583-10.243 8.583s-13.655 11.362-31.368-6.351l-94.997 94.944c-5.248 5.262-0.708 26.66-0.708 26.66l-57.403 36.333-20.309-20.323 36.332-57.417c0 0 21.413 4.54 26.673-0.695l95.090-95.103c-16.989-16.989-5.899-30.57-5.899-30.57s3.162-3.827 8.583-10.244c2.604-3.041 19.33-0.823 19.33-0.823s-2.604-18.733 1.595-23.609c35.434-40.681 92.017-102.752 107.947-102.752 11.852 0 22.634 5.469 34.95 17.653 12.288 12.183 17.559 23.111 17.559 34.829 0.014 15.969-62.070 72.527-102.779 107.947z" />
-<glyph unicode="" d="M446.276 248.417c-0.728 5.421-5.793 10.098-11.249 10.399l-24.137 1.318c-5.457 0.298-11.336 4.786-13.065 9.972l-8.918 21.583c-2.459 4.884-1.481 12.207 2.162 16.272l16.12 17.992c3.651 4.075 3.76 10.834 0.259 15.026l-34.464 34.468c-4.196 3.507-10.962 3.391-15.037-0.255l-17.981-16.12c-4.064-3.654-11.399-4.624-16.272-2.155l-21.591 8.912c-5.176 1.728-9.667 7.608-9.969 13.063l-1.317 24.131c-0.301 5.46-4.974 10.525-10.399 11.257 0 0-12.717 1.721-24.435 1.721-11.697 0-24.415-1.721-24.415-1.721-5.421-0.735-10.097-5.8-10.395-11.257l-1.322-24.131c-0.296-5.459-4.786-11.334-9.976-13.063l-21.576-8.912c-4.884-2.469-12.21-1.495-16.272 2.155l-17.994 16.12c-4.075 3.645-10.828 3.763-15.024 0.255l-34.466-34.468c-3.507-4.196-3.391-10.955 0.258-15.026l16.12-17.992c3.648-4.071 4.622-11.392 2.155-16.272l-8.912-21.583c-1.728-5.185-7.612-9.674-13.063-9.972l-24.13-1.318c-5.459-0.3-10.523-4.975-11.258-10.399 0 0-1.718-12.723-1.718-24.417 0-11.695 1.722-24.406 1.722-24.406 0.735-5.431 5.8-10.099 11.258-10.399l24.126-1.326c5.46-0.295 11.334-4.792 13.066-9.971l8.909-21.577c2.468-4.88 1.49-12.21-2.155-16.281l-16.12-17.983c-3.648-4.077-3.766-10.837-0.258-15.038l34.47-34.466c4.196-3.506 10.953-3.389 15.024 0.257l17.99 16.123c4.071 3.647 11.392 4.624 16.272 2.162l21.576-8.918c5.19-1.725 9.679-7.61 9.972-13.074l1.322-24.124c0.296-5.455 4.975-10.526 10.395-11.262 0 0 12.718-1.717 24.418-1.717 11.717 0 24.442 1.717 24.442 1.717 5.417 0.735 10.089 5.809 10.391 11.262l1.317 24.124c0.301 5.46 4.79 11.345 9.976 13.074l21.575 8.918c4.88 2.46 12.208 1.483 16.279-2.162l17.981-16.123c4.075-3.649 10.837-3.769 15.029-0.262l34.471 34.471c3.502 4.197 3.387 10.962-0.259 15.038l-16.12 17.983c-3.645 4.071-4.622 11.401-2.162 16.281l8.918 21.577c1.725 5.176 7.61 9.674 13.065 9.971l24.137 1.326c5.457 0.3 10.529 4.971 11.249 10.399 0 0 1.725 12.711 1.725 24.405 0.002 11.694-1.723 24.417-1.723 24.417zM255.988 175.244c-26.929 0-48.759 21.844-48.759 48.759 0 26.927 21.83 48.759 48.759 48.759 26.945 0 48.786-21.832 48.786-48.759-0.005-26.914-21.844-48.759-48.786-48.759z" />
-<glyph unicode="" d="M372.784 226.819h-157.871c-1.873 0-3.39-1.517-3.39-3.39v-13.517c0-1.871 1.517-3.39 3.39-3.39h157.871c1.873 0 3.39 1.519 3.39 3.39v13.517c0 1.873-1.517 3.39-3.39 3.39zM372.365 267.974h-157.871c-1.873 0-3.39-1.517-3.39-3.39v-13.517c0-1.873 1.517-3.39 3.39-3.39h157.871c1.871 0 3.39 1.517 3.39 3.39v13.517c0 1.873-1.519 3.39-3.39 3.39zM372.365 146.049h-248.73c-1.871 0-3.39-1.517-3.39-3.39v-13.517c0-1.873 1.519-3.39 3.39-3.39h248.73c1.871 0 3.39 1.517 3.39 3.39v13.517c0 1.875-1.519 3.39-3.39 3.39zM372.365 105.315h-248.73c-1.871 0-3.39-1.517-3.39-3.39v-13.517c0-1.873 1.519-3.39 3.39-3.39h248.73c1.871 0 3.39 1.517 3.39 3.39v13.517c0 1.875-1.519 3.39-3.39 3.39zM123.635 206.942h64.025c1.873 0 3.39 1.517 3.39 3.39v54.251c0 1.873-1.517 3.39-3.39 3.39h-64.025c-1.873 0-3.39-1.517-3.39-3.39v-54.249c0-1.875 1.517-3.392 3.39-3.392zM372.365 186.646h-248.73c-1.871 0-3.39-1.517-3.39-3.39v-13.517c0-1.873 1.519-3.39 3.39-3.39h248.73c1.871 0 3.39 1.517 3.39 3.39v13.517c0 1.873-1.519 3.39-3.39 3.39zM123.635 298.279h248.73c1.871 0 3.39 1.517 3.39 3.39v33.673c0 1.873-1.519 3.39-3.39 3.39h-248.73c-1.873 0-3.39-1.517-3.39-3.39v-33.673c0-1.873 1.517-3.39 3.39-3.39zM397.283 433.538h-298.565c-18.21 0-33.027-14.817-33.027-33.027v-337.020c0-18.212 14.817-33.027 33.027-33.027h298.565c18.21 0 33.027 14.815 33.027 33.027v337.021c0 18.21-14.817 33.027-33.027 33.027zM349.781 412.967c7.099 0 12.854-5.755 12.854-12.854 0-7.101-5.755-12.856-12.854-12.856-7.099 0-12.856 5.755-12.856 12.856 0 7.099 5.759 12.854 12.856 12.854zM403.233 63.49c0-3.283-2.67-5.95-5.95-5.95h-298.565c-3.28 0-5.95 2.666-5.95 5.95v302.723h310.465v-302.723zM390.377 387.257c-7.099 0-12.856 5.755-12.856 12.856 0 7.099 5.757 12.854 12.856 12.854 7.099 0 12.856-5.755 12.856-12.854 0-7.101-5.757-12.856-12.856-12.856z" />
-<glyph unicode="" d="M320.925 470.969h-129.851c-16.301 0-29.563-13.262-29.563-29.563v-388.095c0-16.3 13.262-29.56 29.56-29.56h22.724v-46.719h84.403v46.719h22.724c16.3 0 29.559 13.262 29.559 29.56v388.095c0.002 16.301-13.257 29.563-29.557 29.563zM210.217 423.368c12.228 12.228 28.488 18.964 45.782 18.964s33.554-6.736 45.782-18.964c22.077-22.077 25.264-56.749 7.579-82.443-2.628-3.816-6.863-5.868-11.171-5.868-2.649 0-5.323 0.775-7.669 2.391-6.163 4.241-7.72 12.674-3.479 18.837 10.276 14.932 8.419 35.086-4.416 47.925-7.113 7.111-16.569 11.029-26.625 11.029-10.057 0-19.512-3.916-26.625-11.029-12.837-12.837-14.694-32.993-4.418-47.925 4.241-6.163 2.684-14.598-3.479-18.837-6.159-4.248-14.596-2.686-18.839 3.477-17.684 25.695-14.495 60.364 7.579 82.443zM309.36 78.325c-2.628-3.818-6.863-5.868-11.171-5.868-2.649 0-5.323 0.773-7.669 2.389-6.163 4.241-7.72 12.674-3.479 18.839 10.276 14.932 8.419 35.084-4.416 47.925-14.679 14.675-38.568 14.679-53.251-0.002-12.837-12.837-14.694-32.993-4.418-47.923 4.241-6.164 2.684-14.599-3.479-18.839-6.159-4.248-14.596-2.684-18.839 3.479-17.685 25.695-14.496 60.365 7.579 82.443 25.245 25.242 66.322 25.24 91.565 0 22.077-22.077 25.264-56.75 7.579-82.443zM309.36 209.625c-2.628-3.817-6.863-5.868-11.171-5.868-2.649 0-5.323 0.775-7.669 2.389-6.163 4.243-7.72 12.676-3.479 18.839 10.277 14.932 8.419 35.087-4.416 47.923-7.113 7.115-16.569 11.030-26.625 11.030-10.057 0-19.512-3.916-26.625-11.029-12.837-12.837-14.696-32.992-4.418-47.924 4.241-6.163 2.684-14.598-3.479-18.839-6.159-4.248-14.596-2.684-18.839 3.479-17.684 25.696-14.499 60.368 7.579 82.443 12.228 12.228 28.488 18.964 45.782 18.964s33.554-6.736 45.782-18.965c22.079-22.078 25.264-56.748 7.579-82.442z" />
-<glyph unicode="" d="M410.592 250.438l-145.615 112.541c-2.643 2.043-5.808 3.065-8.975 3.065-3.166 0-6.332-1.022-8.975-3.065l-145.615-112.541c-3.596-2.779-5.701-7.067-5.701-11.613v-178.689c0-8.106 6.571-14.677 14.677-14.677h60.676v111.659c0 8.106 6.571 14.677 14.677 14.677h70.261c8.106 0 14.677-6.572 14.677-14.677v-111.658h130.938c8.106 0 14.676 6.572 14.676 14.677l0.001 178.332v0.357c0 4.546-2.106 8.833-5.7 11.613zM460.377 251.899l-186.327 144.006c-9.007 8.922-23.448 10.021-33.755 2.055l-188.669-145.818c-11.224-8.674-13.291-24.805-4.617-36.029 5.061-6.548 12.66-9.978 20.341-9.978 5.485 0 11.013 1.75 15.689 5.363l172.804 133.556 173.12-133.801c4.675-3.615 10.203-5.363 15.689-5.363 7.68 0 15.28 3.431 20.341 9.978 8.674 11.225 6.608 27.355-4.615 36.030z" />
-<glyph unicode="" d="M432.398 312.932c-9.997 23.638-24.31 44.868-42.541 63.097-18.229 18.23-39.459 32.543-63.098 42.541-24.476 10.353-50.473 15.601-77.27 15.601s-52.795-5.249-77.27-15.601c-23.638-9.998-44.868-24.31-63.097-42.541-18.23-18.229-32.542-39.459-42.541-63.097-9.88-23.358-15.1-48.103-15.557-73.605h-0.044v-3.638c0-0.010-0.001-0.018-0.001-0.028v-3.666h0.046c0.458-25.502 5.677-50.246 15.557-73.605 9.523-22.515 22.971-42.841 39.978-60.474l-0.031-0.031 2.588-2.587c0.001-0.002 0.004-0.002 0.004-0.005l2.593-2.592 0.031 0.031c17.634-17.010 37.958-30.455 60.476-39.979 24.475-10.353 50.473-15.601 77.27-15.601s52.795 5.25 77.27 15.601c23.639 9.998 44.868 24.31 63.097 42.541 18.231 18.23 32.543 39.459 42.541 63.099 10.353 24.476 15.601 50.473 15.601 77.27 0.001 26.797-5.248 52.793-15.601 77.269zM374.305 360.476v0l-42.966-42.965c-21.863 21.863-50.931 33.903-81.85 33.903v60.762c23.838 0 46.951-4.663 68.702-13.863 21.017-8.889 39.895-21.619 56.113-37.837zM315.786 169.366l-0.137-0.137c-17.693-17.622-41.18-27.324-66.159-27.324-25.043 0-48.588 9.753-66.295 27.461-17.709 17.707-27.461 41.252-27.461 66.295 0 25.038 9.749 48.579 27.451 66.286l0.010 0.010c17.708 17.709 41.253 27.461 66.297 27.461s48.587-9.752 66.295-27.461c17.707-17.707 27.461-41.252 27.461-66.295 0-25.043-9.753-48.587-27.46-66.295zM72.975 236.645l0.040 2.288c0.407 22.694 5.058 44.708 13.823 65.431 8.889 21.017 21.619 39.895 37.835 56.113l42.965-42.965c-0.004-0.005-0.007-0.008-0.012-0.012-21.856-21.862-33.892-50.925-33.891-81.837l-60.763 0.028v0.956zM180.788 73.010c-19.988 8.454-38.081 20.416-53.773 35.553l-1.439 1.385-0.65 0.651-0.242 0.257 42.958 42.957c21.863-21.862 50.93-33.902 81.85-33.902v-60.762c-23.838 0-46.953 4.663-68.702 13.863zM412.141 166.96c-8.889-21.019-21.619-39.897-37.837-56.114l-42.964 42.966c21.863 21.863 33.903 50.932 33.903 81.85h60.762c0-23.837-4.663-46.951-13.863-68.701z" />
-<glyph unicode="" d="M256.002 440.363l-191.732-150.945v-239.664h383.462v239.664l-191.731 150.946zM256.002 410.233l167.834-132.131-110.284-86.547c-0.146-0.074-0.29-0.146-0.438-0.226-2.382-1.353-5.242-2.702-8.575-4.051-3.336-1.349-7.147-2.561-11.435-3.632-1.467-0.368-2.997-0.709-4.58-1.028l-32.522 25.522-28.148-22.091c-7.964 3.171-14.94 7.589-20.926 13.26-6.789 6.432-12.111 14.451-15.961 24.060-3.852 9.608-5.778 20.764-5.778 33.469 0 10.084 1.727 19.553 5.182 28.409 3.453 8.853 8.278 16.596 14.471 23.226 6.194 6.63 13.578 11.851 22.154 15.663 8.575 3.812 17.986 5.718 28.229 5.718 9.369 0 17.886-1.31 25.55-3.931 7.661-2.62 14.213-6.473 19.654-11.553 5.438-5.083 9.627-11.375 12.565-18.878 2.937-7.503 4.406-16.181 4.406-26.026 0-5.718-0.538-10.999-1.608-15.841-1.073-4.845-2.523-9.052-4.348-12.625-1.828-3.573-3.991-6.373-6.492-8.398s-5.181-3.037-8.041-3.037c-3.019 0-5.42 0.755-7.205 2.263-1.788 1.507-2.68 4.248-2.68 8.219 0 2.779 0.596 6.51 1.787 11.197l11.673 45.142c-2.305 0.954-4.546 1.805-6.729 2.561-2.185 0.755-4.507 1.37-6.969 1.846-2.463 0.476-5.122 0.854-7.981 1.132-2.858 0.277-6.034 0.416-9.529 0.416-7.385 0-14.114-0.833-20.188-2.5-6.075-1.668-11.494-3.912-16.258-6.73-4.764-2.819-8.915-6.155-12.447-10.004-3.534-3.853-6.452-7.942-8.754-12.269-2.304-4.329-4.031-8.834-5.181-13.519-1.151-4.686-1.727-9.29-1.727-13.816 0-5.163 0.655-9.927 1.965-14.293 1.31-4.368 3.275-8.141 5.897-11.316 2.62-3.177 5.875-5.658 9.767-7.444 3.889-1.788 8.416-2.68 13.578-2.68 5.956 0 11.512 1.11 16.675 3.336 5.161 2.221 10.124 5.955 14.887 11.196 1.031-2.7 2.402-4.983 4.109-6.849 1.707-1.865 3.613-3.375 5.718-4.525 2.103-1.151 4.348-1.985 6.729-2.501 2.382-0.517 4.843-0.774 7.385-0.774 7.543 0 14.512 1.627 20.905 4.883 6.392 3.255 11.911 7.683 16.556 13.281s8.259 12.149 10.839 19.653c2.579 7.503 3.87 15.503 3.87 24.001 0 8.416-1.111 16.336-3.336 23.762-2.224 7.423-5.32 14.214-9.291 20.368-3.971 6.154-8.716 11.651-14.233 16.496-5.521 4.843-11.553 8.934-18.103 12.269-6.553 3.336-13.502 5.875-20.845 7.624-7.346 1.745-14.87 2.62-22.571 2.62-9.212 0-17.986-1.192-26.324-3.574-8.338-2.382-16.079-5.738-23.227-10.065-7.147-4.329-13.619-9.469-19.416-15.425-5.797-5.955-10.759-12.467-14.887-19.535-4.13-7.069-7.307-14.611-9.53-22.63-2.224-8.021-3.335-16.199-3.335-24.538 0-14.431 2.299-27.543 6.887-39.342l-77.227 60.606 167.83 132.13zM424.060 248.185v-171.574l-109.543 85.606 109.543 85.967zM87.945 248.185l109.545-85.967-109.545-85.606v171.573zM268.805 279.827l-8.339-32.517c-0.795-3.177-1.807-5.835-3.038-7.98-1.233-2.144-2.602-3.87-4.109-5.181-1.508-1.31-3.117-2.245-4.825-2.798-1.708-0.558-3.434-0.835-5.181-0.835-3.256 0-5.776 1.15-7.563 3.454-1.787 2.302-2.679 5.795-2.679 10.482 0 4.843 0.813 9.429 2.441 13.758 1.626 4.327 3.812 8.117 6.55 11.375 2.74 3.255 5.935 5.837 9.589 7.742 3.651 1.906 7.463 2.858 11.435 2.858 1.907 0 3.812-0.118 5.718-0.357zM122.316 73.426l133.687 104.62 133.311-104.62h-266.998z" />
-<glyph unicode="" d="M176.517 190.325l48.141 79.006c-10.861 3.995-20.701 10.012-29.279 17.901l-51.072-83.817c11.578-2.189 22.4-6.586 32.21-13.089zM398.669 184.208c-37.262 0-67.578-30.315-67.578-67.578 0-37.26 30.315-67.576 67.578-67.576s67.578 30.315 67.578 67.576c0 37.262-30.315 67.578-67.578 67.578zM244.824 347.411l98.161-161.093c8.599 6.889 18.238 12.051 28.706 15.371l-65.1 106.836 0.809 0.99c9.846 12.028 15.268 27.207 15.268 42.743 0 37.262-30.312 67.576-67.576 67.576-37.263 0-67.578-30.314-67.578-67.576s30.315-67.578 67.578-67.578c3.71 0 7.42 0.304 11.059 0.902l-31.031 50.926c-4.839 7.94-2.755 18.462 4.746 23.952l3.627 2.657-0.782-4.429c-0.688-3.907 0.061-7.909 2.112-11.276zM311.651 136.5h-119.226l-0.408 1.243c-9.132 27.794-34.925 46.467-64.18 46.467-37.261 0-67.576-30.314-67.576-67.576s30.316-67.578 67.576-67.578c27.281 0 52.048 16.655 62.443 41.706h-62.441c-9.96 0-18.062 8.103-18.062 18.062 0 1.075 0.106 2.193 0.316 3.324l0.95 5.096 2.424-4.58c2.829-5.348 8.335-8.671 14.372-8.671h182.493c-0.607 4.232-0.912 8.473-0.912 12.644 0 6.697 0.75 13.37 2.233 19.866z" />
-<glyph unicode="" d="M310.185 397.936c-45.615 0-82.593-36.979-82.593-82.593v-34.969c0.004-45.614 36.981-105.897 82.593-105.897s82.589 60.282 82.593 105.897v34.97c0 45.614-36.978 82.591-82.593 82.591zM433.7 178.433c-10.037 8.22-24.94 13.969-46.494 17.589-21.106-29.031-48.43-45.026-77.021-45.026-28.593 0-55.917 15.993-77.021 45.026-21.555-3.62-36.459-9.37-46.495-17.589-18.559-15.2-22.191-41.288-22.191-81.216 0-18.689 22.578-30.921 41.519-37.894 26.893-9.904 64.869-15.582 104.188-15.582 39.322 0 77.293 5.679 104.19 15.582 18.938 6.974 41.516 19.207 41.516 37.894 0 39.928-3.628 66.017-22.191 81.216zM204.161 278.432c-2.569-9.694-7.196-19.716-13.189-28.045-8.989-12.494-19.52-19.661-28.888-19.661-9.367 0-19.898 7.167-28.888 19.661-9.38 13.037-15.439 30.231-15.442 43.803v28.712c0 24.444 19.886 44.33 44.33 44.33 21.291 0 39.121-15.089 43.365-35.135 1.808 11.341 5.431 22.077 10.543 31.927-12.391 16.218-31.922 26.688-53.909 26.688-37.45 0-67.811-30.359-67.811-67.811v-28.712c0.002-14.404 4.507-30.583 12.165-45.050-56.292-8.048-65.007-32.724-65.007-85.415 0-29.486 47.197-45.934 99.868-49.355 0.363 9.663 1.102 18.649 2.389 26.981-18.586 1.161-35.803 4.050-49.731 8.428-18.719 5.885-24.72 12.411-25.433 14.029 0.007 32.971 4.162 43.135 10.398 48.243 7.427 6.082 22.692 10.007 46.282 11.86 10.619-10.113 23.277-16.663 36.88-16.663 13.615 0 26.282 6.56 36.903 16.684 7.129-0.553 13.467-1.304 19.090-2.238-8.629 18.49-13.587 38.382-13.915 56.739z" />
-<glyph unicode="" d="M235.278 163.977c-17.392-17.366-40.388-26.899-64.953-26.899-24.51 0-47.612 9.533-64.871 26.899-35.874 35.795-35.874 93.976 0 129.77 17.261 17.392 40.388 26.899 64.871 26.899 24.564 0 47.559-9.506 64.952-26.899 17.366-17.26 26.899-40.362 26.899-64.899 0-24.509-9.506-47.559-26.899-64.871zM282.651 167.589c10.171 18.587 15.613 39.486 15.613 61.261 0 34.174-13.302 66.279-37.495 90.418-24.138 24.164-56.242 37.441-90.444 37.441-34.122 0-66.254-13.277-90.444-37.441-49.868-49.816-49.868-130.991 0-180.862 24.192-24.111 56.322-37.388 90.444-37.388 21.802 0 42.673 5.443 61.286 15.613l68.032-67.952c7.036-7.063 16.25-10.567 25.493-10.567s18.454 3.532 25.493 10.567c14.1 14.048 14.1 36.938 0 50.986l-67.98 67.925z" horiz-adv-x="362" />
-<glyph unicode="" d="M293.845 133.060c-3.271 3.271-7.585 5.063-12.172 5.063s-8.924-1.795-12.172-5.063c-6.721-6.7-6.721-17.645 0-24.365l14.557-14.557c3.271-3.271 7.585-5.040 12.193-5.040 4.588 0 8.924 1.773 12.172 5.063 6.721 6.7 6.721 17.622 0 24.343l-14.579 14.557zM82.136 296.060c3.27-3.271 7.585-5.064 12.194-5.064 4.588 0 8.947 1.795 12.172 5.040 3.27 3.248 5.040 7.563 5.040 12.172 0 4.611-1.773 8.947-5.040 12.194l-14.557 14.557c-3.27 3.249-7.585 5.040-12.194 5.040-4.588 0-8.924-1.795-12.172-5.040-6.721-6.721-6.721-17.645 0-24.365l14.557-14.534zM281.582 291.063c4.588 0 8.924 1.795 12.172 5.040l14.579 14.557c6.721 6.7 6.721 17.645 0 24.365-3.271 3.249-7.585 5.040-12.172 5.040-4.611 0-8.947-1.795-12.194-5.040l-14.557-14.557c-6.721-6.721-6.721-17.645 0-24.365 3.248-3.271 7.585-5.040 12.172-5.040zM75.573 214.514c0 9.491-7.721 17.212-17.236 17.212h-23.412c-9.491 0-17.235-7.721-17.235-17.212s7.744-17.236 17.235-17.236h23.412c9.515 0 17.236 7.743 17.236 17.236zM341.034 231.727h-23.412c-9.515 0-17.236-7.744-17.236-17.235s7.721-17.236 17.236-17.236h23.412c9.515 0 17.236 7.721 17.236 17.236s-7.721 17.236-17.236 17.236zM188.069 326.946c9.515 0 17.236 7.721 17.236 17.236v23.436c0 9.491-7.721 17.236-17.236 17.236-9.491 0-17.236-7.721-17.236-17.236v-23.436c0-9.491 7.744-17.236 17.236-17.236zM188.069 102.154c-9.491 0-17.236-7.743-17.236-17.26v-23.412c0-9.491 7.744-17.236 17.236-17.236 9.515 0 17.236 7.743 17.236 17.236v23.412c0 9.515-7.721 17.26-17.236 17.26zM248.429 274.874c-16.555 16.555-38.22 24.82-59.906 24.82s-43.374-8.266-59.906-24.82c-23.275-23.253-30.178-56.703-20.709-85.998l-38.9-38.877c-4.611-4.634-6.245-11.469-4.223-17.668l6.972-21.233c1.703-5.221 5.813-9.356 11.058-11.058l21.21-6.95c1.773-0.567 3.587-0.863 5.382-0.863 4.541 0 8.969 1.773 12.264 5.108l38.014 37.969c9.265-3.339 19.030-5.040 28.816-5.040 21.663 0 43.35 8.266 59.906 24.82 33.108 33.063 33.132 86.724 0.022 119.788zM227.536 175.955c-10.423-10.423-24.276-16.146-39.012-16.146s-28.591 5.722-39.012 16.146c-10.423 10.423-16.168 24.276-16.168 39.012 0 14.738 5.745 28.591 16.168 39.012 10.423 10.423 24.253 16.168 39.012 16.168 14.715 0 28.591-5.745 39.012-16.168 10.423-10.399 16.168-24.253 16.168-38.99 0-14.762-5.745-28.613-16.168-39.038z" horiz-adv-x="362" />
-<glyph unicode="" d="M161.891 397.428c-3.068-0.062-6.078-1.147-8.679-2.892s-4.63-3.416-6.199-5.373c-1.569-1.957-3.048-4.776-4.546-7.852-1.499-3.077-2.696-5.673-3.72-8.266-1.023-2.592-2.379-5.347-3.72-8.266-1.34-2.918-2.458-5.552-3.72-7.44-0.952-1.252-2.405-2.905-4.133-4.959-1.728-2.055-3.031-3.803-4.133-5.373-1.103-1.569-2.162-2.873-2.48-4.133-0.317-1.419 0.192-3.447 0.826-6.199 0.635-2.751 0.572-4.938 0.413-6.199-0.626-5.978-2.496-13.518-6.199-22.73-3.703-9.213-7.343-15.746-10.332-19.837-0.626-0.784-2.12-2.613-4.96-5.373-2.839-2.759-4.746-5.393-5.373-7.44-0.635-0.793-0.555-2.997 0-6.613 0.555-3.615 0.572-6.019 0.413-7.44-0.626-5.351-2.48-12.261-5.786-21.077-3.306-8.816-6.612-16.235-9.918-21.904-0.475-0.943-1.929-2.692-4.133-5.373-2.204-2.68-3.243-4.885-3.719-6.613-0.317-1.262-0.397-3.464 0-6.613 0.397-3.147 0.475-5.447 0-7.026-1.261-5.986-3.974-13.071-7.439-21.49-3.465-8.419-6.709-15.917-10.332-21.904-0.944-1.578-2.475-3.248-4.133-5.373-1.658-2.125-2.776-4.208-3.719-5.786-0.944-1.578-1.749-3.232-2.066-4.959-0.158-0.943 0.192-2.422 0.827-4.546 0.635-2.125 0.985-3.699 0.827-4.959-0.15-2.204-0.764-5.055-1.239-8.678-0.475-3.625-0.413-5.986-0.413-6.613-3.465-9.451-3.369-19.212 0.413-29.755 4.409-12.281 12.298-22.576 23.556-30.995 11.259-8.419 23.005-12.812 35.129-12.812h217.796c10.236 0 19.875 3.481 28.93 10.332s15.195 15.132 18.185 25.21l64.885 214.077c3.464 11.339 2.163 21.608-4.133 30.583h-0.413c-3.307 4.409-7.651 7.556-13.638 9.918 0.317-5.51-0.138-9.76-1.24-13.225l-34.302-112.411c6.192-3.728 12.44-7.452 18.598-11.159-6.341-12.356-17.545-21.738-30.995-29.755l-24.384-79.762c-1.261-4.091-4.016-7.476-8.266-9.918s-8.658-3.719-13.225-3.719h-217.796c-18.886 0-30.107 5.51-33.889 16.531-1.57 4.25-1.728 7.81 0 10.332 1.737 2.363 4.843 3.307 9.092 3.307h98.773c-23.774 14.317-47.506 28.788-71.084 42.981 28.766 56.078 150.19 55.486 184.322 108.278h-127.289c-2.204 0-4.016 0.981-4.959 2.48s-1.040 2.915-0.413 4.959l4.959 15.292c0.635 2.045 2.167 3.874 4.133 5.373s3.741 2.066 5.786 2.066h143.82c2.204 0 3.603-0.567 4.546-2.066s1.039-3.327 0.413-5.373l-4.959-15.291c-0.635-2.045-1.753-3.46-3.719-4.959s-4.154-2.48-6.199-2.48h-5.373c17.406-10.478 34.957-20.856 52.486-31.409l42.154 138.861c3.474 11.647 1.757 21.766-4.546 30.583s-15.216 13.225-26.863 13.225h-179.775c-2.045 0-5.999-0.647-11.985-2.067l0.413 0.413c-4.409 0.925-8.090 1.714-11.159 1.653zM192.473 337.091h143.406c2.204 0 3.603-0.981 4.546-2.48s1.452-3.327 0.827-5.373l-4.959-14.877c-0.635-2.045-2.166-3.874-4.133-5.373s-3.741-2.48-5.786-2.48h-143.82c-2.204 0-3.602 0.981-4.546 2.48s-1.040 3.327-0.413 5.373l4.959 14.877c0.635 2.045 1.754 3.873 3.72 5.373s4.154 2.48 6.199 2.48zM331.334 141.197c-36.945-14.148-79.264-25.031-104.559-46.286h57.032c14.644 0 24.579 2.834 30.169 8.266s11.276 17.634 16.945 36.368l0.413 1.653zM288.353 263.113c-3.742-0.551-6.858-1.713-9.505-3.306-2.365-1.425-4.351-3.402-5.373-5.373-4.721-9.22-12.716-17.115-24.797-24.383-16.135-9.709-37.28-17.020-59.513-24.796-23.597-8.235-47.796-16.904-67.777-28.93-16.979-10.236-28.767-21.497-35.542-34.715-2.282-4.462-0.089-9.51 5.373-12.812l104.145-62.817c5.169-3.113 12.739-4.361 19.837-3.307 3.742 0.565 6.858 1.712 9.506 3.307 2.365 1.425 4.351 3.389 5.373 5.373 4.732 9.22 12.706 17.115 24.797 24.384 16.124 9.709 37.259 17.027 59.513 24.796 23.577 8.247 47.807 16.904 67.777 28.93 16.979 10.224 28.757 21.497 35.542 34.714 2.272 4.457 0.079 9.529-5.373 12.812l-104.145 62.818c-5.17 3.113-12.74 4.361-19.837 3.307zM293.726 250.714c34.521-20.78 69.614-42.031 104.145-62.818-29.632-57.735-158.016-55.077-187.627-112.825-34.521 20.787-69.625 42.038-104.145 62.818 29.623 57.747 158.026 55.077 187.628 112.825zM288.96 169.808c-3.398 1.713-6.817 2.881-10.256 3.459-3.418 0.577-6.838 0.81-10.298 0.659-3.418-0.158-6.921-0.628-10.423-1.437-3.502-0.822-7.025-1.713-10.569-2.75-5.597 3.872-11.195 7.702-16.792 11.253 2.522 1.374 4.971 2.071 7.327 2.122 2.365 0.062 4.638-0.087 6.796-0.414 2.2-0.333 4.212-0.615 6.066-0.835 1.876-0.219 3.501 0.024 4.93 0.747 1.511 0.785 2.346 1.801 2.46 3.025 0.104 1.236-0.668 2.441-2.387 3.615-2.2 1.519-4.847 2.442-8.025 2.781-3.137 0.333-6.347 0.308-9.694-0.132-3.294-0.452-6.431-1.199-9.401-2.253-2.97-1.055-5.357-2.134-7.13-3.188-0.677 0.389-1.356 0.772-2.032 1.155-0.75 0.414-1.689 0.64-2.815 0.628-1.136 0-2.074-0.295-2.845-0.835-0.75-0.527-1.094-1.142-0.958-1.789 0.105-0.671 0.553-1.185 1.324-1.582 0.677-0.346 1.356-0.683 2.032-1.042-2.668-1.94-4.868-4.080-6.598-6.339-1.751-2.265-2.793-4.512-3.179-6.69-0.406-2.197-0.020-4.205 1.094-6.069 1.115-1.877 3.179-3.471 6.191-4.978 4.909-2.454 10.684-3.497 17.385-3.264 6.681 0.245 13.883 1.444 21.629 3.948 6.15-4.279 12.32-8.529 18.48-12.478-2.606-1.325-4.889-2.084-6.9-2.329-2.012-0.257-3.805-0.233-5.43 0.062-1.626 0.308-3.137 0.747-4.524 1.312-1.387 0.577-2.751 1.067-4.117 1.469-1.345 0.401-2.731 0.628-4.149 0.64-1.418 0.012-2.929-0.401-4.596-1.262-1.709-0.897-2.564-1.94-2.564-3.113 0-1.168 0.895-2.353 2.648-3.553 1.772-1.199 4.076-2.209 6.858-3.007 2.784-0.798 5.93-1.3 9.391-1.437 3.461-0.144 7.108 0.17 10.955 1.029 3.868 0.848 7.692 2.379 11.465 4.658 1.813-1.067 3.648-2.084 5.473-3.063 0.771-0.401 1.709-0.603 2.845-0.553 1.094 0.024 2.053 0.333 2.815 0.885 0.771 0.565 1.094 1.185 0.98 1.839-0.104 0.659-0.553 1.168-1.303 1.531-1.835 0.885-3.67 1.813-5.493 2.793 3.116 2.303 5.618 4.733 7.474 7.136 1.854 2.416 2.95 4.745 3.314 6.904 0.365 2.172-0.062 4.13-1.24 5.906-1.168 1.801-3.242 3.345-6.212 4.833zM230.685 165.553c-2.95-0.075-5.524 0.514-7.775 1.825-0.959 0.553-1.626 1.224-2.032 2.021-0.428 0.798-0.573 1.67-0.406 2.624 0.146 0.941 0.615 1.927 1.428 2.918 0.771 0.992 1.917 1.983 3.377 2.943 5.285-3.163 10.559-6.634 15.843-10.224-4.002-1.325-7.484-2.034-10.434-2.109zM279.851 152.987c-0.938-1.042-2.012-1.971-3.273-2.781-5.849 3.553-11.685 7.456-17.51 11.461 1.491 0.401 3.054 0.822 4.742 1.249 1.688 0.428 3.377 0.709 5.066 0.885 1.73 0.158 3.44 0.113 5.149-0.132 1.688-0.257 3.294-0.81 4.784-1.682 1.469-0.885 2.397-1.801 2.772-2.793 0.406-1.004 0.428-2.021 0.146-3.063-0.303-1.048-0.918-2.090-1.877-3.144zM238.46 124.117c2.054 0.998 5.076 0.948 6.963-0.207 2.043-1.224 2.043-3.226 0-4.45-0.167-0.101-0.344-0.17-0.531-0.257l0.020-0.012c-6.598-3.019-12.018-5.736-17.864-9.257-5.285-3.175-10.058-6.521-14.185-9.916l-6.66-5.491c-0.208-0.226-0.458-0.433-0.771-0.627-2.043-1.224-5.369-1.224-7.4 0-1.772 1.067-1.99 2.712-0.689 3.935l-0.020 0.012 7.13 5.863c4.451 3.666 9.568 7.255 15.228 10.663 5.889 3.558 12.247 6.735 18.762 9.747h0.022zM276.619 214.901c5.274 3.175 10.038 6.509 14.175 9.923l6.921 5.712c0.25 0.27 0.531 0.54 0.918 0.772 2.053 1.237 5.378 1.237 7.432 0 1.949-1.18 2.033-3.044 0.26-4.293l0.021-0.012-7.13-5.887c-4.461-3.666-9.569-7.243-15.228-10.651-5.889-3.546-12.238-6.735-18.75-9.747l-0.042 0.012c-2.074-1.149-5.295-1.123-7.286 0.087-2.054 1.236-2.054 3.251 0 4.487 0.365 0.233 0.793 0.396 1.219 0.539 6.13 2.818 12.038 5.774 17.49 9.057z" horiz-adv-x="480" />
-<glyph unicode="" d="M76.662 48.299h65.888v65.887h-65.888v-65.887zM157.191 48.299h73.208v65.887h-73.209v-65.887zM76.662 128.829h65.888v73.209h-65.888v-73.209zM157.191 128.829h73.208v73.209h-73.209v-73.209zM76.662 216.679h65.888v65.887h-65.888v-65.887zM245.042 48.299h73.208v65.887h-73.209v-65.887zM157.191 216.679h73.208v65.887h-73.209v-65.887zM332.894 48.299h65.887v65.887h-65.887v-65.887zM245.042 128.829h73.208v73.209h-73.209v-73.209zM164.512 326.493v65.887q0 2.975-2.174 5.148t-5.148 2.174h-14.641q-2.975 0-5.148-2.174t-2.174-5.148v-65.887q0-2.974 2.174-5.147t5.148-2.174h14.641q2.975 0 5.148 2.174t2.174 5.147zM332.894 128.829h65.887v73.209h-65.887v-73.209zM245.042 216.679h73.208v65.887h-73.209v-65.887zM332.894 216.679h65.887v65.887h-65.887v-65.887zM340.214 326.493v65.887q0 2.975-2.174 5.148t-5.147 2.174h-14.641q-2.974 0-5.147-2.174t-2.174-5.148v-65.887q0-2.974 2.174-5.147t5.147-2.174h14.641q2.974 0 5.147 2.174t2.174 5.147zM428.065 341.135v-292.836q0-11.897-8.693-20.591t-20.591-8.693h-322.119q-11.896 0-20.59 8.693t-8.693 20.591v292.836q0 11.897 8.693 20.591t20.59 8.693h29.284v21.962q0 15.099 10.752 25.851t25.851 10.752h14.641q15.099 0 25.852-10.752t10.752-25.851v-21.962h87.851v21.962q0 15.099 10.752 25.851t25.851 10.752h14.641q15.099 0 25.851-10.752t10.752-25.851v-21.962h29.284q11.897 0 20.591-8.693t8.693-20.591z" horiz-adv-x="476" />
+<font id="ispconfig" horiz-adv-x="1024">
+<font-face units-per-em="1024" ascent="960" descent="-64" />
+<missing-glyph horiz-adv-x="1024" />
+<glyph unicode=" " d="" horiz-adv-x="512" />
+<glyph unicode="" d="M870.002 657.426h-0.011c0-0.072 0.007-0.144 0.007-0.217 0.029 19.966-11.35 38.043-31.219 49.588l-274.318 159.417c-14.32 8.319-32.649 12.904-51.611 12.904-18.926 0-37.259-4.566-51.615-12.857l-276.106-159.413c-20.009-11.549-31.504-29.658-31.529-49.675 0-0.083 0.007-0.166 0.007-0.246 0 0.007 0 0.014 0 0.022h-0.011v-0.025l0.397-89.307c0.058-19.883 11.441-37.876 31.226-49.371l274.314-159.417c14.32-8.323 32.646-12.904 51.607-12.904 18.926 0 37.259 4.566 51.615 12.857l276.11 159.413c20.096 11.596 31.591 29.785 31.533 49.899l-0.397 89.332zM207.585 668.194l276.106 159.413c7.528 4.346 18.156 6.838 29.163 6.838 10.996 0 21.584-2.485 29.048-6.824l274.314-159.413c2.673-1.553 8.89-5.704 8.883-10.7-0.007-5.068-6.351-9.277-9.078-10.852l-276.113-159.41c-7.528-4.349-18.153-6.842-29.163-6.842-10.996 0-21.584 2.489-29.044 6.824l-274.314 159.413c-2.673 1.553-8.887 5.704-8.879 10.704 0.007 5.065 6.347 9.273 9.078 10.848zM806.874 549.081l-47.894-27.65c-10.216-5.899-18.51-1.174-18.546 10.566-0.033 11.74 8.207 26.042 18.427 31.941l47.894 27.65c10.191 5.885 18.51 1.145 18.543-10.595 0.036-11.74-8.226-26.031-18.423-31.912zM868.835 507.737c-3.248-15.862-13.839-29.904-30.363-39.441l-276.11-159.413c-14.359-8.291-32.693-12.853-51.618-12.853-18.962 0-37.288 4.581-51.607 12.9l-274.314 159.417c-16.411 9.537-26.909 23.557-30.092 39.39h-1.105l0.368-129.929c0.058-19.883 11.441-37.88 31.226-49.375l274.314-159.413c14.32-8.319 32.646-12.904 51.607-12.904 18.926 0 37.259 4.57 51.615 12.86l276.11 159.41c20.096 11.6 31.591 29.788 31.533 49.899l-0.368 129.455h-1.196zM806.874 359.475l-47.894-27.646c-10.216-5.903-18.51-1.174-18.546 10.566-0.033 11.74 8.207 26.042 18.427 31.941l47.894 27.65c10.191 5.885 18.51 1.142 18.543-10.599 0.036-11.74-8.226-26.028-18.423-31.912z" />
+<glyph unicode="" d="M870.002 708h-0.011c0-0.072 0.007-0.144 0.007-0.217 0.029 19.966-11.35 38.043-31.219 49.588l-274.318 159.417c-14.32 8.319-32.649 12.904-51.611 12.904-18.926 0-37.259-4.566-51.615-12.857l-276.106-159.413c-20.009-11.549-31.504-29.658-31.529-49.675 0-0.083 0.007-0.166 0.007-0.246 0 0.007 0 0.014 0 0.022h-0.011v-0.025l0.397-139.881c0.058-19.883 11.441-37.876 31.226-49.371l274.314-159.417c14.32-8.323 32.646-12.904 51.607-12.904 18.926 0 37.259 4.566 51.615 12.857l276.11 159.413c20.096 11.596 31.591 29.785 31.533 49.899l-0.397 139.906zM207.585 718.769l276.106 159.413c7.528 4.346 18.156 6.838 29.163 6.838 10.996 0 21.584-2.485 29.048-6.824l274.314-159.413c2.673-1.553 8.89-5.704 8.883-10.7-0.007-5.068-6.351-9.277-9.078-10.852l-276.113-159.41c-7.528-4.349-18.153-6.842-29.163-6.842-10.996 0-21.584 2.489-29.044 6.824l-274.314 159.413c-2.673 1.553-8.887 5.704-8.879 10.704 0.007 5.065 6.347 9.273 9.078 10.848zM806.874 549.081l-47.894-27.65c-10.216-5.899-18.51-1.174-18.546 10.566-0.033 11.74 8.207 26.042 18.427 31.941l47.894 27.65c10.191 5.885 18.51 1.145 18.543-10.595 0.036-11.74-8.226-26.031-18.423-31.912zM868.835 507.737c-3.248-15.862-13.839-29.904-30.363-39.441l-276.11-159.413c-14.359-8.291-32.693-12.853-51.618-12.853-18.962 0-37.288 4.581-51.607 12.9l-274.314 159.417c-16.411 9.537-26.909 23.557-30.092 39.39h-1.105l0.368-129.929c0.058-19.883 11.441-37.88 31.226-49.375l274.314-159.413c14.32-8.319 32.646-12.904 51.607-12.904 18.926 0 37.259 4.57 51.615 12.86l276.11 159.41c20.096 11.6 31.591 29.788 31.533 49.899l-0.368 129.455h-1.196zM806.874 359.475l-47.894-27.646c-10.216-5.903-18.51-1.174-18.546 10.566-0.033 11.74 8.207 26.042 18.427 31.941l47.894 27.65c10.191 5.885 18.51 1.142 18.543-10.599 0.036-11.74-8.226-26.028-18.423-31.912zM868.835 317.932c-3.248-15.866-13.839-29.904-30.363-39.441l-276.11-159.413c-14.359-8.291-32.693-12.857-51.618-12.857-18.962 0-37.288 4.584-51.607 12.9l-274.314 159.417c-16.411 9.537-26.909 23.557-30.092 39.39h-1.105l0.368-129.929c0.058-19.886 11.441-37.88 31.226-49.378l274.314-159.413c14.32-8.319 32.646-12.9 51.607-12.9 18.926 0 37.259 4.566 51.615 12.857l276.11 159.41c20.096 11.6 31.591 29.788 31.533 49.899l-0.368 129.455h-1.196zM806.874 169.671l-47.894-27.65c-10.216-5.899-18.51-1.174-18.546 10.566-0.033 11.74 8.207 26.042 18.427 31.941l47.894 27.65c10.191 5.885 18.51 1.145 18.543-10.595 0.036-11.74-8.226-26.028-18.423-31.912z" />
+<glyph unicode="" d="M487.7 322.627l-0.050 0.055-0.050 0.057c-7.086 8.232-10.633 19.694-11.166 36.524-11.119 0.523-22.685 2.996-30.735 12.399l-0.057 0.066-0.055 0.066c-10.811 12.798-17.088 20.39-17.35 20.706l-0.050 0.060-0.047 0.060c-5.141 6.295-10.407 16.507-12.375 29.049l-177.599-177.609c-26.806-26.773-26.806-70.176 0-96.903 26.763-26.806 70.139-26.806 96.903 0l163.292 163.275c-3.521 4.014-7.067 8.069-10.661 12.194zM291.744 169.503c-11.467-4.292-24.318 1.518-28.619 13.112-4.359 11.485 1.526 24.278 13.062 28.637 11.534 4.351 24.318-1.516 28.61-13.060 4.369-11.546-1.518-24.345-13.053-28.689zM893.102 705.806l-77.82-77.829-75.948 20.38-20.346 75.89 77.819 77.829c-49.555 15.102-105.613 3.070-144.832-36.139-17.564-17.574-28.39-37.261-33.316-57.769-6.222-23.45-3.768-50.452 6.771-76.809l-83.823-83.829c12.119-1.879 21.019-6.707 25.801-9.909 0.062-0.041 0.126-0.084 0.188-0.124 0.313-0.212 0.602-0.41 0.877-0.606 0.123-0.087 0.242-0.168 0.355-0.252 0.217-0.156 0.424-0.306 0.614-0.447 0.162-0.118 0.298-0.222 0.437-0.328 0.124-0.096 0.259-0.195 0.367-0.281 0.238-0.187 0.444-0.352 0.612-0.488 0.321-0.264 8.045-6.618 20.76-17.395 9.155-7.73 12.022-18.913 12.599-30.86 16.746-0.554 28.075-4.075 36.331-11.206l0.074-0.064c2.637-2.296 5.239-4.567 7.826-6.829 1.47-1.285 2.936-2.567 4.393-3.844l69.524 69.518c26.056-10.388 52.788-12.919 76.067-6.973 20.785 4.857 40.743 15.759 58.554 33.543 39.175 39.2 51.201 95.258 36.116 144.823zM623.139 455.476c-9.751 8.424-47.058 3.215-47.058 3.215s4.546 33.452-1.647 38.66c-12.728 10.789-20.486 17.165-20.486 17.165s-27.31 22.724-62.735-12.702l-189.994 189.888c-10.496 10.523-1.417 53.32-1.417 53.32l-114.806 72.665-40.619-40.646 72.664-114.835c0 0 42.826 9.079 53.347-1.39l190.181-190.206c-33.978-33.978-11.798-61.141-11.798-61.141s6.324-7.653 17.165-20.488c5.208-6.083 38.66-1.646 38.66-1.646s-5.208-37.466 3.189-47.218c70.867-81.363 184.034-205.504 215.894-205.504 23.704 0 45.268 10.938 69.9 35.306 24.577 24.366 35.118 46.223 35.118 69.659 0.027 31.939-124.141 145.054-205.557 215.894z" />
+<glyph unicode="" d="M892.551 496.835c-1.456 10.841-11.585 20.197-22.498 20.797l-48.273 2.637c-10.913 0.596-22.672 9.573-26.129 19.944l-17.835 43.165c-4.917 9.768-2.962 24.413 4.324 32.544l32.241 35.984c7.301 8.15 7.521 21.667 0.517 30.052l-68.929 68.936c-8.392 7.015-21.924 6.781-30.074-0.509l-35.962-32.241c-8.128-7.308-22.798-9.248-32.544-4.31l-43.183 17.824c-10.353 3.457-19.334 15.216-19.937 26.125l-2.633 48.262c-0.603 10.92-9.949 21.050-20.797 22.513 0 0-25.435 3.443-48.869 3.443-23.394 0-48.829-3.443-48.829-3.443-10.841-1.47-20.194-11.6-20.79-22.513l-2.644-48.262c-0.592-10.917-9.573-22.668-19.952-26.125l-43.151-17.824c-9.768-4.938-24.42-2.991-32.544 4.31l-35.987 32.241c-8.15 7.29-21.657 7.525-30.048 0.509l-68.933-68.936c-7.015-8.392-6.781-21.909 0.517-30.052l32.241-35.984c7.297-8.142 9.244-22.784 4.31-32.544l-17.824-43.165c-3.457-10.371-15.223-19.348-26.125-19.944l-48.259-2.637c-10.917-0.6-21.046-9.949-22.516-20.797 0 0-3.435-25.446-3.435-48.833 0-23.391 3.443-48.811 3.443-48.811 1.47-10.863 11.6-20.197 22.516-20.797l48.251-2.652c10.92-0.589 22.668-9.584 26.132-19.941l17.817-43.154c4.935-9.761 2.98-24.42-4.31-32.563l-32.241-35.965c-7.297-8.153-7.532-21.675-0.517-30.077l68.94-68.933c8.392-7.012 21.906-6.777 30.048 0.513l35.98 32.245c8.142 7.294 22.784 9.248 32.544 4.324l43.151-17.835c10.379-3.45 19.359-15.219 19.944-26.147l2.644-48.248c0.592-10.91 9.949-21.053 20.79-22.524 0 0 25.435-3.435 48.837-3.435 23.434 0 48.884 3.435 48.884 3.435 10.834 1.47 20.179 11.618 20.782 22.524l2.633 48.248c0.603 10.92 9.58 22.69 19.952 26.147l43.151 17.835c9.761 4.92 24.416 2.966 32.559-4.324l35.962-32.245c8.15-7.297 21.675-7.539 30.059-0.524l68.943 68.943c7.005 8.395 6.773 21.924-0.517 30.077l-32.241 35.965c-7.29 8.142-9.244 22.802-4.324 32.563l17.835 43.154c3.45 10.353 15.219 19.348 26.129 19.941l48.273 2.652c10.913 0.6 21.057 9.941 22.498 20.797 0 0 3.45 25.421 3.45 48.811 0.004 23.387-3.446 48.833-3.446 48.833zM511.977 350.488c-53.858 0-97.518 43.689-97.518 97.518 0 53.854 43.66 97.518 97.518 97.518 53.89 0 97.572-43.664 97.572-97.518-0.011-53.829-43.689-97.518-97.572-97.518z" />
+<glyph unicode="" d="M745.567 453.638h-315.742c-3.746 0-6.78-3.034-6.78-6.78v-27.034c0-3.742 3.034-6.78 6.78-6.78h315.742c3.746 0 6.78 3.038 6.78 6.78v27.034c0 3.746-3.034 6.78-6.78 6.78zM744.73 535.948h-315.742c-3.746 0-6.78-3.034-6.78-6.78v-27.034c0-3.746 3.034-6.78 6.78-6.78h315.742c3.742 0 6.78 3.034 6.78 6.78v27.034c0 3.746-3.038 6.78-6.78 6.78zM744.73 292.098h-497.459c-3.742 0-6.78-3.034-6.78-6.78v-27.034c0-3.746 3.038-6.78 6.78-6.78h497.459c3.742 0 6.78 3.034 6.78 6.78v27.034c0 3.749-3.038 6.78-6.78 6.78zM744.73 210.629h-497.459c-3.742 0-6.78-3.034-6.78-6.78v-27.034c0-3.746 3.038-6.78 6.78-6.78h497.459c3.742 0 6.78 3.034 6.78 6.78v27.034c0 3.749-3.038 6.78-6.78 6.78zM247.27 413.885h128.050c3.746 0 6.78 3.034 6.78 6.78v108.503c0 3.746-3.034 6.78-6.78 6.78h-128.050c-3.746 0-6.78-3.034-6.78-6.78v-108.499c0-3.749 3.034-6.783 6.78-6.783zM744.73 373.291h-497.459c-3.742 0-6.78-3.034-6.78-6.78v-27.034c0-3.746 3.038-6.78 6.78-6.78h497.459c3.742 0 6.78 3.034 6.78 6.78v27.034c0 3.746-3.038 6.78-6.78 6.78zM247.27 596.558h497.459c3.742 0 6.78 3.034 6.78 6.78v67.346c0 3.746-3.038 6.78-6.78 6.78h-497.459c-3.746 0-6.78-3.034-6.78-6.78v-67.346c0-3.746 3.034-6.78 6.78-6.78zM794.565 867.075h-597.131c-36.42 0-66.054-29.633-66.054-66.054v-674.041c0-36.424 29.633-66.054 66.054-66.054h597.131c36.42 0 66.054 29.63 66.054 66.054v674.041c0 36.42-29.633 66.054-66.054 66.054zM699.562 825.935c14.198 0 25.708-11.51 25.708-25.708 0-14.202-11.51-25.712-25.708-25.712s-25.712 11.51-25.712 25.712c0 14.198 11.517 25.708 25.712 25.708zM806.465 126.98c0-6.566-5.34-11.9-11.9-11.9h-597.131c-6.56 0-11.9 5.332-11.9 11.9v605.445h620.93v-605.445zM780.753 774.515c-14.198 0-25.712 11.51-25.712 25.712 0 14.198 11.514 25.708 25.712 25.708s25.712-11.51 25.712-25.708c0-14.202-11.514-25.712-25.712-25.712z" />
+<glyph unicode="" d="M641.851 941.938h-259.702c-32.602 0-59.125-26.523-59.125-59.125v-776.19c0-32.599 26.523-59.121 59.121-59.121h45.448v-93.439h168.806v93.439h45.448c32.599 0 59.118 26.523 59.118 59.121v776.19c0.004 32.602-26.515 59.125-59.114 59.125zM420.434 846.736c24.456 24.456 56.975 37.927 91.564 37.927s67.108-13.471 91.564-37.927c44.155-44.155 50.527-113.499 15.158-164.886-5.256-7.633-13.727-11.737-22.343-11.737-5.299 0-10.646 1.55-15.338 4.783-12.326 8.482-15.44 25.348-6.958 37.674 20.551 29.864 16.838 70.172-8.832 95.849-14.226 14.222-33.137 22.058-53.251 22.058s-39.025-7.832-53.251-22.058c-25.674-25.674-29.387-65.985-8.836-95.849 8.482-12.326 5.368-29.196-6.958-37.674-12.318-8.496-29.192-5.372-37.678 6.954-35.369 51.391-28.99 120.728 15.158 164.886zM618.72 156.651c-5.256-7.637-13.727-11.737-22.343-11.737-5.299 0-10.646 1.546-15.338 4.779-12.326 8.482-15.44 25.348-6.958 37.678 20.551 29.864 16.838 70.168-8.832 95.849-29.358 29.351-77.136 29.358-106.502-0.004-25.674-25.674-29.387-65.985-8.836-95.845 8.482-12.329 5.368-29.199-6.958-37.678-12.318-8.496-29.192-5.368-37.678 6.958-35.369 51.391-28.993 120.731 15.158 164.886 50.491 50.484 132.645 50.48 183.129 0 44.155-44.155 50.527-113.499 15.158-164.886zM618.72 419.25c-5.256-7.633-13.727-11.737-22.343-11.737-5.299 0-10.646 1.55-15.338 4.779-12.326 8.486-15.44 25.352-6.958 37.678 20.555 29.864 16.838 70.175-8.832 95.845-14.226 14.229-33.137 22.061-53.251 22.061s-39.025-7.832-53.251-22.058c-25.674-25.674-29.391-65.985-8.836-95.849 8.482-12.326 5.368-29.196-6.958-37.678-12.318-8.496-29.192-5.368-37.678 6.958-35.369 51.391-28.997 120.735 15.158 164.886 24.456 24.456 56.975 37.927 91.564 37.927s67.108-13.471 91.564-37.931c44.158-44.155 50.527-113.496 15.158-164.883z" />
+<glyph unicode="" d="M821.185 500.876l-291.231 225.083c-5.286 4.086-11.617 6.129-17.95 6.129-6.331 0-12.663-2.044-17.95-6.129l-291.231-225.083c-7.192-5.558-11.403-14.134-11.403-23.227v-357.378c0-16.211 13.142-29.354 29.354-29.354h121.352v223.318c0 16.211 13.142 29.354 29.354 29.354h140.523c16.212 0 29.354-13.143 29.354-29.354v-223.316h261.877c16.211 0 29.353 13.143 29.353 29.354l0.002 356.663v0.715c0 9.091-4.213 17.667-11.401 23.226zM920.754 503.798l-372.655 288.013c-18.015 17.844-46.897 20.041-67.511 4.109l-377.338-291.636c-22.449-17.348-26.582-49.611-9.233-72.059 10.122-13.096 25.319-19.957 40.683-19.957 10.97 0 22.026 3.499 31.377 10.727l345.609 267.112 346.241-267.602c9.351-7.229 20.406-10.725 31.378-10.725 15.361 0 30.56 6.862 40.683 19.957 17.348 22.449 13.216 54.71-9.231 72.060z" />
+<glyph unicode="" d="M864.796 625.864c-19.994 47.276-48.62 89.736-85.082 126.195-36.458 36.46-78.917 65.085-126.195 85.082-48.952 20.705-100.946 31.203-154.54 31.203s-105.59-10.498-154.54-31.203c-47.277-19.996-89.736-48.621-126.195-85.082-36.46-36.458-65.085-78.917-85.082-126.195-19.759-46.715-30.2-96.205-31.115-147.209h-0.089v-7.276c0-0.019-0.002-0.036-0.002-0.056v-7.332h0.092c0.915-51.003 11.354-100.493 31.113-147.209 19.047-45.030 45.941-85.682 79.957-120.947l-0.061-0.062 5.175-5.175c0.003-0.003 0.007-0.005 0.009-0.009l5.185-5.185 0.061 0.062c35.269-34.020 75.916-60.911 120.952-79.959 48.95-20.705 100.946-31.203 154.54-31.203s105.59 10.499 154.54 31.201c47.277 19.997 89.736 48.621 126.195 85.082 36.461 36.46 65.087 78.919 85.082 126.197 20.707 48.952 31.203 100.946 31.203 154.54 0.002 53.593-10.496 105.587-31.203 154.538zM748.61 720.951v0l-85.931-85.929c-43.726 43.726-101.863 67.806-163.699 67.806v121.525c47.676 0 93.903-9.327 137.404-27.727 42.035-17.778 79.79-43.238 112.226-75.673zM631.573 338.732l-0.275-0.275c-35.386-35.244-82.359-54.647-132.318-54.647-50.086 0-97.176 19.507-132.59 54.922-35.417 35.415-54.922 82.504-54.922 132.59 0 50.077 19.497 97.157 54.902 132.572l0.019 0.019c35.417 35.417 82.506 54.922 132.593 54.922s97.174-19.505 132.59-54.922c35.415-35.415 54.922-82.504 54.922-132.59s-19.507-97.174-54.92-132.59zM145.951 473.29l0.081 4.576c0.815 45.388 10.116 89.416 27.647 130.862 17.778 42.035 43.238 79.791 75.671 112.226l85.931-85.931c-0.007-0.009-0.015-0.015-0.024-0.024-43.711-43.724-67.783-101.851-67.782-163.674l-121.525 0.056v1.912zM361.576 146.021c-39.977 16.909-76.161 40.831-107.547 71.105l-2.879 2.769-1.3 1.301-0.484 0.514 85.916 85.914c43.726-43.724 101.861-67.804 163.699-67.804v-121.525c-47.676 0-93.906 9.327-137.404 27.727zM824.282 333.92c-17.778-42.037-43.238-79.794-75.673-112.228l-85.929 85.931c43.726 43.726 67.806 101.863 67.806 163.699h121.525c0-47.674-9.327-93.903-27.727-137.403z" />
+<glyph unicode="" d="M512.003 880.726l-383.463-301.891v-479.328h766.925v479.328l-383.463 301.891zM512.003 820.466l335.668-264.262-220.568-173.094c-0.292-0.147-0.58-0.292-0.876-0.451-4.764-2.705-10.484-5.404-17.149-8.102-6.671-2.699-14.293-5.122-22.87-7.265-2.934-0.735-5.993-1.417-9.16-2.056l-65.044 51.045-56.295-44.182c-15.928 6.341-29.88 15.177-41.852 26.521-13.578 12.863-24.221 28.902-31.922 48.119-7.704 19.217-11.555 41.528-11.555 66.939 0 20.167 3.455 39.107 10.364 56.817 6.907 17.706 16.555 33.191 28.943 46.453 12.387 13.259 27.157 23.702 44.307 31.326s35.971 11.436 56.458 11.436c18.738 0 35.772-2.621 51.099-7.863 15.322-5.241 28.426-12.946 39.308-23.107 10.876-10.166 19.254-22.75 25.131-37.757 5.874-15.006 8.813-32.361 8.813-52.052 0-11.436-1.077-21.998-3.215-31.683-2.146-9.689-5.046-18.104-8.695-25.25-3.656-7.147-7.982-12.746-12.984-16.795s-10.362-6.075-16.081-6.075c-6.038 0-10.839 1.509-14.411 4.527-3.575 3.015-5.361 8.495-5.361 16.437 0 5.557 1.191 13.020 3.574 22.393l23.347 90.283c-4.609 1.907-9.092 3.611-13.459 5.122-4.37 1.509-9.015 2.739-13.938 3.692-4.926 0.953-10.243 1.708-15.963 2.264-5.716 0.554-12.069 0.832-19.058 0.832-14.769 0-28.228-1.666-40.375-5.001-12.15-3.336-22.988-7.825-32.517-13.46-9.529-5.637-17.83-12.309-24.895-20.008-7.068-7.706-12.903-15.884-17.508-24.537-4.609-8.658-8.062-17.669-10.362-27.039-2.303-9.372-3.455-18.58-3.455-27.633 0-10.327 1.311-19.853 3.931-28.586 2.62-8.735 6.551-16.281 11.793-22.631 5.241-6.354 11.75-11.316 19.534-14.888 7.778-3.575 16.831-5.359 27.157-5.359 11.911 0 23.025 2.219 33.351 6.671 10.321 4.442 20.248 11.911 29.775 22.392 2.063-5.4 4.805-9.966 8.218-13.698s7.227-6.751 11.436-9.050c4.206-2.303 8.695-3.97 13.459-5.002 4.764-1.033 9.686-1.548 14.769-1.548 15.086 0 29.023 3.253 41.81 9.766 12.785 6.51 23.822 15.366 33.112 26.562s16.517 24.298 21.679 39.306c5.159 15.006 7.741 31.006 7.741 48.003 0 16.831-2.223 32.672-6.671 47.524-4.449 14.847-10.641 28.427-18.583 40.735s-17.431 23.303-28.467 32.993c-11.041 9.686-23.107 17.867-36.207 24.537-13.105 6.671-27.003 11.75-41.69 15.247-14.693 3.49-29.74 5.241-45.141 5.241-18.424 0-35.971-2.385-52.648-7.147-16.675-4.764-32.159-11.476-46.453-20.129-14.293-8.658-27.239-18.938-38.831-30.85-11.593-11.911-21.518-24.934-29.775-39.069-8.26-14.138-14.614-29.223-19.061-45.261-4.447-16.042-6.671-32.398-6.671-49.075 0-28.862 4.599-55.087 13.774-78.684l-154.454 121.211 335.66 264.26zM848.121 496.371v-343.147l-219.087 171.212 219.087 171.934zM175.889 496.371l219.090-171.934-219.090-171.212v343.147zM537.609 559.654l-16.677-65.035c-1.59-6.354-3.614-11.671-6.075-15.96-2.465-4.288-5.205-7.741-8.218-10.362-3.016-2.62-6.234-4.49-9.649-5.596-3.415-1.115-6.869-1.67-10.362-1.67-6.513 0-11.553 2.301-15.126 6.909-3.574 4.604-5.359 11.59-5.359 20.963 0 9.686 1.625 18.858 4.883 27.516 3.253 8.654 7.624 16.234 13.101 22.75 5.48 6.51 11.871 11.673 19.178 15.484 7.302 3.812 14.926 5.716 22.869 5.716 3.814 0 7.624-0.237 11.436-0.714zM244.631 146.853l267.373 209.239 266.623-209.239h-533.997z" />
+<glyph unicode="" d="M353.033 380.651l96.282 158.012c-21.722 7.991-41.402 20.024-58.558 35.803l-102.145-167.635c23.156-4.378 44.801-13.171 64.421-26.179zM797.338 368.416c-74.525 0-135.156-60.631-135.156-135.156 0-74.521 60.631-135.152 135.156-135.152s135.156 60.631 135.156 135.152c0 74.525-60.631 135.156-135.156 135.156zM489.648 694.822l196.322-322.186c17.199 13.778 36.475 24.102 57.412 30.742l-130.2 213.672 1.618 1.98c19.691 24.055 30.536 54.414 30.536 85.485 0 74.525-60.624 135.152-135.152 135.152-74.525 0-135.156-60.628-135.156-135.152s60.631-135.156 135.156-135.156c7.42 0 14.84 0.607 22.119 1.803l-62.062 101.853c-9.678 15.88-5.509 36.923 9.493 47.905l7.254 5.314-1.564-8.858c-1.376-7.814 0.123-15.819 4.223-22.552zM623.301 273.001h-238.453l-0.816 2.485c-18.264 55.588-69.85 92.934-128.361 92.934-74.521 0-135.152-60.628-135.152-135.152s60.631-135.156 135.152-135.156c54.562 0 104.096 33.31 124.886 83.411h-124.882c-19.919 0-36.124 16.205-36.124 36.124 0 2.149 0.213 4.386 0.632 6.647l1.9 10.191 4.848-9.161c5.657-10.696 16.671-17.343 28.744-17.343h364.986c-1.214 8.464-1.824 16.946-1.824 25.287 0 13.395 1.499 26.739 4.465 39.733z" />
+<glyph unicode="" d="M620.371 795.872c-91.229 0-165.186-73.957-165.186-165.186v-69.937c0.007-91.229 73.961-211.794 165.186-211.794s165.179 120.565 165.186 211.794v69.94c0 91.229-73.957 165.182-165.186 165.182zM867.401 356.867c-20.074 16.44-49.881 27.939-92.988 35.178-42.211-58.063-96.86-90.051-154.042-90.051-57.185 0-111.834 31.985-154.042 90.051-43.111-7.239-72.917-18.741-92.991-35.178-37.118-30.399-44.382-82.577-44.382-162.433 0-37.378 45.155-61.841 83.039-75.789 53.786-19.807 129.737-31.165 208.376-31.165 78.643 0 154.587 11.358 208.38 31.165 37.876 13.948 83.032 38.415 83.032 75.789 0 79.857-7.257 132.035-44.382 162.433zM408.321 556.863c-5.137-19.388-14.392-39.433-26.378-56.090-17.979-24.987-39.040-39.321-57.777-39.321-18.734 0-39.795 14.334-57.777 39.321-18.759 26.075-30.879 60.461-30.883 87.605v57.423c0 48.887 39.773 88.66 88.66 88.66 42.583 0 78.242-30.178 86.731-70.269 3.616 22.683 10.863 44.155 21.086 63.853-24.781 32.436-63.843 53.377-107.817 53.377-74.9 0-135.622-60.718-135.622-135.622v-57.423c0.004-28.809 9.013-61.166 24.33-90.101-112.585-16.097-130.015-65.447-130.015-170.829 0-58.973 94.393-91.868 199.735-98.71 0.726 19.327 2.204 37.298 4.779 53.963-37.172 2.323-71.606 8.099-99.461 16.856-37.439 11.769-49.44 24.821-50.867 28.058 0.014 65.941 8.323 86.269 20.797 96.485 14.854 12.163 45.383 20.013 92.565 23.719 21.238-20.226 46.554-33.325 73.759-33.325 27.231 0 52.565 13.12 73.806 33.368 14.258-1.105 26.934-2.608 38.18-4.476-17.257 36.981-27.173 76.764-27.83 113.478z" />
+<glyph unicode="" d="M470.555 327.954c-34.783-34.732-80.777-53.799-129.905-53.799-49.019 0-95.224 19.065-129.743 53.799-71.748 71.59-71.748 187.951 0 259.54 34.521 34.783 80.777 53.799 129.743 53.799 49.127 0 95.118-19.013 129.905-53.799 34.732-34.521 53.799-80.724 53.799-129.798 0-49.019-19.013-95.118-53.799-129.743zM565.301 335.179c20.342 37.175 31.227 78.972 31.227 122.521 0 68.348-26.604 132.558-74.99 180.836-48.276 48.328-112.483 74.882-180.887 74.882-68.244 0-132.507-26.554-180.887-74.882-99.737-99.631-99.737-261.982 0-361.723 48.384-48.223 112.643-74.776 180.887-74.776 43.604 0 85.347 10.886 122.572 31.227l136.063-135.905c14.071-14.125 32.501-21.135 50.987-21.135s36.909 7.064 50.987 21.135c28.2 28.095 28.2 73.876 0 101.971l-135.959 135.851z" horiz-adv-x="724" />
+<glyph unicode="" d="M587.69 266.12c-6.541 6.541-15.17 10.127-24.344 10.127s-17.848-3.59-24.344-10.127c-13.442-13.399-13.442-35.29 0-48.73l29.114-29.114c6.541-6.541 15.17-10.080 24.387-10.080 9.176 0 17.848 3.546 24.344 10.127 13.442 13.399 13.442 35.243 0 48.686l-29.159 29.114zM164.273 592.121c6.541-6.541 15.17-10.127 24.387-10.127 9.176 0 17.893 3.59 24.344 10.080 6.541 6.497 10.080 15.125 10.080 24.344 0 9.221-3.546 17.893-10.080 24.387l-29.114 29.114c-6.541 6.497-15.17 10.080-24.387 10.080-9.176 0-17.848-3.59-24.344-10.080-13.442-13.442-13.442-35.29 0-48.73l29.114-29.069zM563.164 582.127c9.176 0 17.848 3.59 24.344 10.080l29.159 29.114c13.442 13.399 13.442 35.29 0 48.73-6.541 6.497-15.17 10.080-24.344 10.080-9.221 0-17.893-3.59-24.387-10.080l-29.114-29.114c-13.442-13.442-13.442-35.29 0-48.73 6.497-6.541 15.17-10.080 24.344-10.080zM151.145 429.029c0 18.982-15.442 34.424-34.471 34.424h-46.824c-18.982 0-34.471-15.442-34.471-34.424s15.487-34.471 34.471-34.471h46.824c19.030 0 34.471 15.487 34.471 34.471zM682.068 463.455h-46.824c-19.030 0-34.471-15.487-34.471-34.471s15.442-34.471 34.471-34.471h46.824c19.030 0 34.471 15.442 34.471 34.471s-15.442 34.471-34.471 34.471zM376.138 653.891c19.030 0 34.471 15.442 34.471 34.471v46.872c0 18.982-15.442 34.471-34.471 34.471-18.982 0-34.471-15.442-34.471-34.471v-46.872c0-18.982 15.487-34.471 34.471-34.471zM376.138 204.309c-18.982 0-34.471-15.487-34.471-34.519v-46.824c0-18.982 15.487-34.471 34.471-34.471 19.030 0 34.471 15.487 34.471 34.471v46.824c0 19.030-15.442 34.519-34.471 34.519zM496.857 549.748c-33.111 33.111-76.439 49.64-119.812 49.64s-86.748-16.532-119.812-49.64c-46.551-46.506-60.357-113.405-41.419-171.995l-77.799-77.754c-9.221-9.267-12.49-22.937-8.446-35.336l13.943-42.465c3.406-10.443 11.625-18.711 22.117-22.117l42.42-13.899c3.546-1.133 7.173-1.727 10.764-1.727 9.083 0 17.939 3.546 24.529 10.217l76.029 75.937c18.53-6.678 38.060-10.080 57.632-10.080 43.327 0 86.7 16.532 119.812 49.64 66.216 66.126 66.264 173.447 0.043 239.575zM455.073 351.911c-20.845-20.845-48.552-32.292-78.024-32.292s-57.182 11.444-78.024 32.292c-20.845 20.845-32.337 48.552-32.337 78.024 0 29.475 11.49 57.182 32.337 78.024 20.845 20.845 48.506 32.337 78.024 32.337 29.43 0 57.182-11.49 78.024-32.337 20.845-20.799 32.337-48.506 32.337-77.98 0-29.524-11.49-57.225-32.337-78.075z" horiz-adv-x="724" />
+<glyph unicode="" d="M323.782 794.856c-6.136-0.123-12.156-2.295-17.357-5.785s-9.26-6.831-12.398-10.745c-3.138-3.915-6.095-9.551-9.092-15.704-2.998-6.154-5.393-11.346-7.439-16.532-2.046-5.184-4.758-10.695-7.439-16.532s-4.917-11.104-7.439-14.879c-1.905-2.503-4.81-5.81-8.266-9.919s-6.061-7.607-8.266-10.745c-2.205-3.138-4.325-5.745-4.96-8.266-0.635-2.838 0.384-6.895 1.653-12.398 1.27-5.502 1.144-9.877 0.827-12.398-1.253-11.955-4.992-27.035-12.398-45.46-7.405-18.426-14.686-31.493-20.664-39.674-1.253-1.569-4.241-5.226-9.919-10.745-5.678-5.518-9.493-10.787-10.745-14.879-1.269-1.587-1.111-5.994 0-13.225s1.144-12.039 0.827-14.879c-1.253-10.703-4.96-24.521-11.572-42.153-6.613-17.632-13.225-32.47-19.836-43.808-0.951-1.887-3.858-5.385-8.266-10.745s-6.487-9.769-7.439-13.225c-0.635-2.523-0.794-6.929 0-13.225 0.794-6.295 0.951-10.895 0-14.051-2.522-11.972-7.948-26.142-14.879-42.981-6.929-16.839-13.417-31.834-20.664-43.808-1.887-3.156-4.95-6.496-8.266-10.745s-5.551-8.416-7.439-11.572c-1.887-3.156-3.498-6.464-4.133-9.919-0.317-1.887 0.384-4.844 1.653-9.092 1.269-4.249 1.97-7.397 1.653-9.919-0.3-4.408-1.527-10.11-2.479-17.357-0.951-7.249-0.827-11.971-0.827-13.225-6.929-18.902-6.738-38.423 0.827-59.51 8.817-24.562 24.596-45.152 47.113-61.99 22.518-16.839 46.011-25.623 70.258-25.623h435.592c20.472 0 39.75 6.963 57.859 20.664s30.391 30.265 36.369 50.42l129.769 428.154c6.929 22.677 4.325 43.215-8.266 61.166h-0.827c-6.613 8.817-15.303 15.112-27.276 19.836 0.635-11.020-0.276-19.519-2.479-26.45l-68.604-224.823c12.385-7.456 24.879-14.904 37.195-22.317-12.683-24.711-35.089-43.475-61.991-59.51l-48.767-159.525c-2.522-8.183-8.032-14.953-16.532-19.836s-17.315-7.439-26.45-7.439h-435.592c-37.771 0-60.214 11.020-67.778 33.062-3.139 8.5-3.455 15.621 0 20.664 3.475 4.726 9.685 6.613 18.184 6.613h197.547c-47.549 28.634-95.012 57.576-142.167 85.962 57.532 112.156 300.38 110.971 368.643 216.556h-254.578c-4.408 0-8.032 1.962-9.919 4.96s-2.079 5.829-0.827 9.919l9.919 30.583c1.269 4.090 4.333 7.747 8.266 10.745s7.482 4.133 11.572 4.133h287.64c4.408 0 7.205-1.134 9.092-4.133s2.079-6.653 0.827-10.745l-9.919-30.583c-1.27-4.090-3.507-6.921-7.439-9.919s-8.307-4.96-12.398-4.96h-10.745c34.813-20.957 69.914-41.711 104.972-62.818l84.309 277.721c6.948 23.293 3.515 43.532-9.092 61.166s-30.432 26.45-53.726 26.45h-359.55c-4.090 0-11.998-1.294-23.97-4.133l0.827 0.827c-8.817 1.85-16.18 3.428-22.317 3.306zM384.946 674.181h286.813c4.408 0 7.205-1.962 9.092-4.96s2.905-6.653 1.653-10.745l-9.919-29.755c-1.27-4.090-4.333-7.747-8.266-10.745s-7.482-4.96-11.572-4.96h-287.64c-4.408 0-7.205 1.962-9.092 4.96s-2.079 6.653-0.827 10.745l9.919 29.755c1.27 4.090 3.507 7.747 7.439 10.745s8.307 4.96 12.398 4.96zM662.668 282.393c-73.889-28.296-158.529-50.063-209.118-92.573h114.065c29.289 0 49.159 5.669 60.339 16.532s22.551 35.267 33.89 72.737l0.827 3.306zM576.707 526.226c-7.484-1.103-13.716-3.425-19.011-6.613-4.731-2.849-8.701-6.804-10.745-10.745-9.443-18.44-25.433-34.23-49.593-48.767-32.269-19.419-74.559-34.040-119.025-49.593-47.195-16.47-95.592-33.807-135.554-57.859-33.958-20.473-57.534-42.994-71.084-69.43-4.565-8.925-0.178-19.020 10.745-25.623l208.29-125.635c10.339-6.227 25.479-8.722 39.674-6.613 7.484 1.13 13.716 3.425 19.011 6.613 4.731 2.849 8.701 6.778 10.745 10.745 9.464 18.44 25.411 34.23 49.593 48.767 32.249 19.419 74.518 34.054 119.025 49.593 47.154 16.494 95.614 33.807 135.554 57.859 33.958 20.447 57.513 42.993 71.084 69.429 4.545 8.913 0.157 19.057-10.745 25.623l-208.29 125.636c-10.339 6.227-25.479 8.722-39.674 6.613zM587.452 501.429c69.042-41.56 139.228-84.062 208.291-125.636-59.265-115.47-316.032-110.155-375.255-225.649-69.042 41.574-139.249 84.075-208.291 125.636 59.245 115.494 316.052 110.155 375.255 225.649zM577.92 339.615c-6.796 3.426-13.633 5.762-20.512 6.917-6.837 1.155-13.676 1.62-20.596 1.318-6.837-0.315-13.841-1.256-20.846-2.874-7.004-1.644-14.050-3.426-21.138-5.499-11.194 7.744-22.389 15.403-33.583 22.506 5.044 2.748 9.943 4.142 14.654 4.243 4.731 0.124 9.276-0.174 13.592-0.829 4.399-0.666 8.423-1.23 12.133-1.67 3.753-0.439 7.003 0.049 9.86 1.494 3.023 1.57 4.692 3.602 4.919 6.050 0.209 2.472-1.335 4.882-4.774 7.229-4.399 3.038-9.694 4.883-16.051 5.562-6.274 0.666-12.695 0.615-19.387-0.264-6.588-0.904-12.863-2.397-18.803-4.507s-10.715-4.268-14.259-6.377c-1.354 0.778-2.712 1.544-4.065 2.31-1.501 0.829-3.377 1.281-5.629 1.256-2.272 0-4.148-0.59-5.691-1.67-1.501-1.055-2.188-2.284-1.917-3.578 0.209-1.343 1.105-2.371 2.648-3.163 1.354-0.691 2.712-1.367 4.065-2.084-5.337-3.879-9.735-8.16-13.196-12.678-3.503-4.531-5.587-9.025-6.357-13.38-0.813-4.393-0.041-8.411 2.188-12.137 2.231-3.754 6.357-6.942 12.383-9.955 9.818-4.908 21.368-6.993 34.77-6.527 13.363 0.489 27.767 2.888 43.257 7.896 12.299-8.559 24.64-17.059 36.961-24.955-5.211-2.649-9.777-4.167-13.8-4.657-4.024-0.514-7.609-0.465-10.861 0.124-3.252 0.615-6.274 1.494-9.048 2.624-2.773 1.155-5.503 2.133-8.234 2.937-2.689 0.803-5.462 1.256-8.297 1.281s-5.858-0.803-9.192-2.523c-3.419-1.794-5.128-3.879-5.128-6.227 0-2.335 1.791-4.707 5.295-7.105 3.543-2.397 8.151-4.418 13.717-6.013 5.567-1.595 11.861-2.599 18.783-2.874 6.921-0.288 14.217 0.339 21.91 2.059 7.735 1.695 15.385 4.758 22.93 9.315 3.626-2.133 7.296-4.167 10.945-6.125 1.542-0.803 3.419-1.205 5.69-1.105 2.188 0.049 4.107 0.666 5.629 1.769 1.542 1.13 2.188 2.371 1.96 3.678-0.209 1.318-1.105 2.335-2.606 3.063-3.67 1.769-7.339 3.627-10.986 5.586 6.233 4.607 11.236 9.465 14.947 14.272 3.709 4.833 5.9 9.489 6.628 13.807 0.729 4.344-0.124 8.26-2.479 11.811-2.335 3.603-6.484 6.69-12.423 9.666zM461.369 331.105c-5.9-0.151-11.048 1.029-15.55 3.651-1.918 1.105-3.252 2.447-4.065 4.042-0.855 1.595-1.147 3.339-0.813 5.248 0.292 1.882 1.23 3.854 2.856 5.837 1.542 1.984 3.835 3.967 6.754 5.886 10.569-6.327 21.118-13.267 31.686-20.447-8.005-2.649-14.968-4.067-20.868-4.218zM559.701 305.974c-1.876-2.084-4.024-3.943-6.546-5.562-11.697 7.105-23.369 14.912-35.020 22.921 2.982 0.803 6.108 1.644 9.484 2.498s6.754 1.418 10.132 1.769c3.46 0.315 6.88 0.226 10.299-0.264 3.377-0.514 6.588-1.62 9.567-3.364 2.939-1.769 4.794-3.603 5.544-5.586 0.813-2.008 0.856-4.042 0.292-6.125-0.605-2.097-1.835-4.18-3.753-6.289zM476.921 248.234c4.107 1.997 10.152 1.896 13.925-0.414 4.086-2.447 4.086-6.452 0-8.9-0.334-0.201-0.687-0.339-1.063-0.514l0.041-0.024c-13.196-6.038-24.036-11.473-35.729-18.515-10.569-6.351-20.116-13.042-28.371-19.833l-13.319-10.983c-0.417-0.451-0.916-0.865-1.542-1.255-4.086-2.447-10.737-2.447-14.801 0-3.543 2.134-3.981 5.423-1.377 7.87l-0.041 0.024 14.259 11.725c8.901 7.331 19.136 14.511 30.456 21.327 11.779 7.116 24.494 13.47 37.524 19.494h0.043zM553.238 429.803c10.549 6.351 20.075 13.017 28.35 19.846l13.842 11.423c0.5 0.54 1.063 1.079 1.835 1.544 4.107 2.473 10.756 2.473 14.863 0 3.898-2.36 4.065-6.088 0.521-8.586l0.042-0.024-14.259-11.774c-8.921-7.331-19.137-14.485-30.457-21.302-11.779-7.091-24.475-13.469-37.501-19.494l-0.084 0.024c-4.148-2.297-10.589-2.247-14.571 0.174-4.107 2.472-4.107 6.502 0 8.974 0.729 0.465 1.585 0.791 2.439 1.079 12.259 5.636 24.077 11.547 34.981 18.113z" horiz-adv-x="960" />
+<glyph unicode="" d="M153.324 96.598h131.775v131.775h-131.775v-131.775zM314.383 96.598h146.417v131.775h-146.417v-131.775zM153.324 257.658h131.775v146.417h-131.775v-146.417zM314.383 257.658h146.417v146.417h-146.417v-146.417zM153.324 433.358h131.775v131.775h-131.775v-131.775zM490.085 96.598h146.417v131.775h-146.417v-131.775zM314.383 433.358h146.417v131.775h-146.417v-131.775zM665.787 96.598h131.775v131.775h-131.775v-131.775zM490.085 257.658h146.417v146.417h-146.417v-146.417zM329.025 652.985v131.775q0 5.949-4.348 10.295t-10.295 4.348h-29.282q-5.949 0-10.295-4.348t-4.348-10.295v-131.775q0-5.949 4.348-10.295t10.295-4.348h29.282q5.949 0 10.295 4.348t4.348 10.295zM665.787 257.658h131.775v146.417h-131.775v-146.417zM490.085 433.358h146.417v131.775h-146.417v-131.775zM665.787 433.358h131.775v131.775h-131.775v-131.775zM680.427 652.985v131.775q0 5.949-4.348 10.295t-10.295 4.348h-29.282q-5.949 0-10.295-4.348t-4.348-10.295v-131.775q0-5.949 4.348-10.295t10.295-4.348h29.282q5.949 0 10.295 4.348t4.348 10.295zM856.13 682.269v-585.671q0-23.793-17.386-41.182t-41.182-17.386h-644.238q-23.792 0-41.181 17.386t-17.386 41.182v585.671q0 23.793 17.386 41.181t41.181 17.386h58.568v43.924q0 30.198 21.505 51.702t51.702 21.505h29.282q30.198 0 51.703-21.505t21.505-51.702v-43.924h175.702v43.924q0 30.198 21.505 51.702t51.703 21.505h29.282q30.198 0 51.702-21.505t21.505-51.702v-43.924h58.568q23.793 0 41.182-17.386t17.386-41.181z" horiz-adv-x="951" />
+<glyph unicode="" d="M402.381 220.467l-41.472-41.165c-35.942-35.584-94.362-35.635-130.253 0-17.254 17.152-26.726 39.834-26.726 64.051s9.523 46.95 26.726 64.102l152.576 151.398c31.59 31.386 91.085 77.517 134.451 34.509 19.917-19.763 52.070-19.61 71.782 0.256 19.763 19.866 19.661 52.019-0.256 71.782-73.677 73.114-182.63 59.597-277.504-34.509l-152.576-151.398c-36.557-36.352-56.73-84.685-56.73-136.141 0-51.405 20.173-99.738 56.781-136.090 37.683-37.427 87.142-56.064 136.602-56.064s99.021 18.637 136.704 56.064l41.472 41.216c19.917 19.763 20.019 51.917 0.256 71.731-19.763 19.866-51.917 19.968-71.834 0.256zM864.819 808.499c-79.155 78.541-189.798 82.79-263.117 10.086l-51.661-51.251c-19.917-19.763-20.070-51.866-0.307-71.782 19.814-19.917 51.917-20.019 71.782-0.256l51.661 51.251c37.939 37.683 87.654 22.067 120.115-10.086 17.254-17.101 26.726-39.885 26.726-64.051 0-24.218-9.523-46.95-26.726-64.051l-162.816-161.485c-74.394-73.83-109.363-39.219-124.262-24.422-19.917 19.763-52.019 19.61-71.731-0.256-19.763-19.917-19.661-52.070 0.256-71.782 34.15-33.894 73.216-50.688 114.074-50.688 50.074 0 102.963 25.19 153.242 75.11l162.765 161.485c36.608 36.301 56.781 84.634 56.781 136.038s-20.173 99.789-56.781 136.141z" />
+<glyph unicode="" d="M627.866 329.318c0 0 361.421 260.762 321.331 559.258-0.922 6.554-3.072 10.854-5.734 13.773-2.816 2.714-7.014 4.966-13.466 5.888-291.686 40.909-546.509-328.909-546.509-328.909-221.082 26.522-205.005-17.613-305.869-259.84-19.302-46.182 11.981-62.106 46.285-49.101 34.304 12.902 110.029 41.523 110.029 41.523l132.557-135.629c0 0-27.955-77.466-40.602-112.538-12.646-35.174 2.867-67.174 48.026-47.462 236.749 103.27 279.859 86.835 253.952 313.037zM679.475 632.218c-30.618 31.334-30.618 82.125 0 113.459 30.618 31.283 80.23 31.283 110.848 0 30.669-31.283 30.669-82.125 0-113.459-30.566-31.386-80.23-31.386-110.848 0z" />
+<glyph unicode="" d="M870.4 921.6h-460.8c-56.32 0-101.376-46.080-101.376-102.4v-153.6h101.376v153.6h460.8v-716.8h-460.8v102.4h-101.376v-102.4c0-56.32 45.056-102.4 101.376-102.4h460.8c56.32 0 102.4 46.080 102.4 102.4v716.8c0 56.32-46.080 102.4-102.4 102.4zM512 235.52l204.8 199.68-204.8 199.68v-122.88h-460.8v-153.6h460.8v-122.88z" />
+<glyph unicode="" d="M856.422 315.392c-43.213-69.837-180.992-120.883-344.422-120.883-163.328 0-301.21 51.046-344.371 120.883-9.165 14.797-14.029 6.861-14.029-0.461 0-7.373 0-102.502 0-102.502 0-99.277 160.461-202.189 358.4-202.189s358.4 102.912 358.4 202.189c0 0 0 95.13 0 102.502 0 7.322-4.915 15.258-13.978 0.461zM856.934 577.28c-42.445-61.747-180.838-107.008-344.934-107.008s-302.49 45.261-344.934 107.008c-8.806 12.749-13.466 5.837-13.466 0.051s0-120.627 0-120.627c0-90.266 160.461-163.379 358.4-163.379s358.4 73.114 358.4 163.379c0 0 0 114.842 0 120.627s-4.71 12.698-13.466-0.051zM512 911.36c-197.939 0-358.4-60.314-358.4-134.758v-64.461c0-78.95 160.461-142.95 358.4-142.95s358.4 64 358.4 142.95v64.41c0 74.496-160.461 134.81-358.4 134.81z" />
+<glyph unicode="" d="M173.517 567.706l56.422-497.101c3.021-23.603 116.992-101.222 282.061-101.325 165.069 0.102 279.091 77.722 282.112 101.325l56.422 497.101c-86.221-48.23-215.091-71.066-338.534-71.066s-252.314 22.835-338.483 71.066zM674.15 874.906l-43.981 48.794c-16.947 24.115-35.379 28.621-71.27 28.621h-93.798c-35.84 0-54.272-4.506-71.27-28.621l-43.93-48.794c-131.584-22.989-227.021-83.968-227.021-128.922v-8.755c0-79.155 174.182-143.36 389.12-143.36s389.12 64.205 389.12 143.36v8.755c0 44.954-95.386 105.933-226.97 128.922zM617.933 760.883l-64.102 68.557h-83.661l-64.102-68.557h-87.040c0 0 95.334 113.664 108.083 129.075 9.728 11.776 19.712 16.282 32.614 16.282h104.602c12.902 0 22.835-4.506 32.614-16.282 12.698-15.411 108.083-129.075 108.083-129.075h-87.091z" />
+<glyph unicode="" d="M898.304 180.838l-193.485 193.485c29.184 47.974 45.978 104.192 45.978 164.454 0 174.899-151.603 326.502-326.554 326.502-174.899 0-316.723-141.824-316.723-316.723 0-174.95 151.552-326.554 326.502-326.554 58.163 0 112.64 15.77 159.488 43.162l194.509-194.56c19.098-19.046 49.92-19.046 68.915 0l48.282 48.23c18.995 19.046 12.083 43.008-6.912 62.003zM205.005 548.557c0 121.088 98.15 219.29 219.238 219.29 121.139 0 229.069-107.93 229.069-229.069s-98.15-219.29-219.29-219.29-229.018 107.93-229.018 229.069z" />
+<glyph unicode="" d="M847.923 796.774c-73.83 73.882-129.28 62.822-129.28 62.822l-554.291-554.291-51.712-243.866 243.866 51.712 554.24 554.24c0 0 11.11 55.45-62.822 129.382zM341.965 142.49l-83.098-17.92c-8.038 15.002-17.715 30.003-35.379 47.718-17.664 17.664-32.717 27.29-47.718 35.328l17.971 83.149 24.013 24.013c0 0 45.261-0.922 96.307-51.968 51.098-51.098 52.019-96.358 52.019-96.358l-24.115-23.962z" />
</font></defs></svg>
\ No newline at end of file
diff --git a/interface/web/themes/default/assets/fonts/ispconfig.ttf b/interface/web/themes/default/assets/fonts/ispconfig.ttf
index 7483faa..cc359a9 100644
--- a/interface/web/themes/default/assets/fonts/ispconfig.ttf
+++ b/interface/web/themes/default/assets/fonts/ispconfig.ttf
Binary files differ
diff --git a/interface/web/themes/default/assets/fonts/ispconfig.woff b/interface/web/themes/default/assets/fonts/ispconfig.woff
index 3f1e5ef..2d6c559 100644
--- a/interface/web/themes/default/assets/fonts/ispconfig.woff
+++ b/interface/web/themes/default/assets/fonts/ispconfig.woff
Binary files differ
diff --git a/interface/web/themes/default/assets/stylesheets/fonts.css b/interface/web/themes/default/assets/stylesheets/fonts.css
index b30235b..f631bda 100644
--- a/interface/web/themes/default/assets/stylesheets/fonts.css
+++ b/interface/web/themes/default/assets/stylesheets/fonts.css
@@ -23,6 +23,9 @@
-moz-osx-font-smoothing: grayscale;
}
+.icon:before {
+ vertical-align: middle;
+}
.icon-calendar:before {
content: "\e60e";
}
@@ -68,3 +71,24 @@
.icon-client:before {
content: "\e60a";
}
+.icon-edit:before {
+ content: "\e615";
+}
+.icon-filter:before {
+ content: "\e614";
+}
+.icon-link:before {
+ content: "\e60f";
+}
+.icon-action:before {
+ content: "\e610";
+}
+.icon-dbadmin:before {
+ content: "\e612";
+}
+.icon-loginas:before {
+ content: "\e611";
+}
+.icon-delete:before {
+ content: "\e613";
+}
\ No newline at end of file
diff --git a/interface/web/themes/default/assets/stylesheets/fonts.min.css b/interface/web/themes/default/assets/stylesheets/fonts.min.css
index b30235b..9d1c9d0 100644
--- a/interface/web/themes/default/assets/stylesheets/fonts.min.css
+++ b/interface/web/themes/default/assets/stylesheets/fonts.min.css
@@ -1,70 +1 @@
-@font-face {
- font-family: 'ispconfig';
- src:url('../fonts/ispconfig.eot?-drlkxz');
- src:url('../fonts/ispconfig.eot?#iefix-drlkxz') format('embedded-opentype'),
- url('../fonts/ispconfig.woff?-drlkxz') format('woff'),
- url('../fonts/ispconfig.ttf?-drlkxz') format('truetype'),
- url('../fonts/ispconfig.svg?-drlkxz#ispconfig') format('svg');
- font-weight: normal;
- font-style: normal;
-}
-
-.icon {
- font-family: 'ispconfig';
- speak: none;
- font-style: normal;
- font-weight: normal;
- font-variant: normal;
- text-transform: none;
- line-height: 1;
-
- /* Better Font Rendering =========== */
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
-}
-
-.icon-calendar:before {
- content: "\e60e";
-}
-.icon-billing:before {
- content: "\e60d";
-}
-.icon-lens:before {
- content: "\e60b";
-}
-.icon-bulb:before {
- content: "\e60c";
-}
-.icon-vm2:before {
- content: "\e600";
-}
-.icon-vm:before {
- content: "\e601";
-}
-.icon-tools:before {
- content: "\e602";
-}
-.icon-admin:before {
- content: "\e603";
-}
-.icon-sites:before {
- content: "\e604";
-}
-.icon-monitor:before {
- content: "\e605";
-}
-.icon-dashboard:before {
- content: "\e606";
-}
-.icon-help:before {
- content: "\e607";
-}
-.icon-mail:before {
- content: "\e608";
-}
-.icon-dns:before {
- content: "\e609";
-}
-.icon-client:before {
- content: "\e60a";
-}
+@font-face{font-family:'ispconfig';src:url('../fonts/ispconfig.eot?-drlkxz');src:url('../fonts/ispconfig.eot?#iefix-drlkxz') format('embedded-opentype'),url('../fonts/ispconfig.woff?-drlkxz') format('woff'),url('../fonts/ispconfig.ttf?-drlkxz') format('truetype'),url('../fonts/ispconfig.svg?-drlkxz#ispconfig') format('svg');font-weight:normal;font-style:normal}.icon{font-family:'ispconfig';speak:none;font-style:normal;font-weight:normal;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.icon:before{vertical-align:middle}.icon-calendar:before{content:"\e60e"}.icon-billing:before{content:"\e60d"}.icon-lens:before{content:"\e60b"}.icon-bulb:before{content:"\e60c"}.icon-vm2:before{content:"\e600"}.icon-vm:before{content:"\e601"}.icon-tools:before{content:"\e602"}.icon-admin:before{content:"\e603"}.icon-sites:before{content:"\e604"}.icon-monitor:before{content:"\e605"}.icon-dashboard:before{content:"\e606"}.icon-help:before{content:"\e607"}.icon-mail:before{content:"\e608"}.icon-dns:before{content:"\e609"}.icon-client:before{content:"\e60a"}.icon-edit:before{content:"\e615"}.icon-filter:before{content:"\e614"}.icon-link:before{content:"\e60f"}.icon-action:before{content:"\e610"}.icon-dbadmin:before{content:"\e612"}.icon-loginas:before{content:"\e611"}.icon-delete:before{content:"\e613"}
\ No newline at end of file
diff --git a/interface/web/themes/default/assets/stylesheets/ispconfig.css b/interface/web/themes/default/assets/stylesheets/ispconfig.css
index 3ab9b2b..37a1549 100644
--- a/interface/web/themes/default/assets/stylesheets/ispconfig.css
+++ b/interface/web/themes/default/assets/stylesheets/ispconfig.css
@@ -38,7 +38,8 @@
font-weight: bold;
transition: all ease 500ms; }
-.formbutton-success {
+.formbutton-success,
+.formbutton-danger {
padding: 6px 30px;
border-style: solid;
border-width: 1px;
@@ -47,6 +48,14 @@
font-weight: bold;
transition: all ease 500ms; }
+.formbutton-narrow {
+ padding: 6px 8px;
+ margin-left: 2px;
+ margin-right: 2px; }
+
+.formbutton-narrower {
+ padding: 4px 6px; }
+
#main-wrapper {
margin: 0 auto;
width: 95%;
diff --git a/interface/web/themes/default/assets/stylesheets/ispconfig.min.css b/interface/web/themes/default/assets/stylesheets/ispconfig.min.css
index f3f6e23..f81e1ad 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:95%;max-width:1260px}#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:78%}#sidebar{margin-top:27px;width:18%;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{table-layout:fixed;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
+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,.formbutton-danger{padding:6px 30px;border-style:solid;border-width:1px;border-bottom-width:solid;font-size:12px;font-weight:bold;transition:all ease 500ms}.formbutton-narrow{padding:6px 8px;margin-left:2px;margin-right:2px}.formbutton-narrower{padding:4px 6px}#main-wrapper{margin:0 auto;width:95%;max-width:1260px}#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:78%}#sidebar{margin-top:27px;width:18%;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{table-layout:fixed;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/themes/default/assets/stylesheets/select2-spinner.gif b/interface/web/themes/default/assets/stylesheets/select2-spinner.gif
new file mode 100644
index 0000000..5b33f7e
--- /dev/null
+++ b/interface/web/themes/default/assets/stylesheets/select2-spinner.gif
Binary files differ
diff --git a/interface/web/themes/default/assets/stylesheets/select2.png b/interface/web/themes/default/assets/stylesheets/select2.png
new file mode 100644
index 0000000..1d804ff
--- /dev/null
+++ b/interface/web/themes/default/assets/stylesheets/select2.png
Binary files differ
diff --git a/interface/web/themes/default/assets/stylesheets/themes/dark/theme.css b/interface/web/themes/default/assets/stylesheets/themes/dark/theme.css
index a6a3f37..af60b97 100644
--- a/interface/web/themes/default/assets/stylesheets/themes/dark/theme.css
+++ b/interface/web/themes/default/assets/stylesheets/themes/dark/theme.css
@@ -28,6 +28,17 @@
border-bottom-color: #509b5a;
color: #101a22; }
+.formbutton-danger {
+ background: linear-gradient(to bottom, #c70f19, #b60008);
+ border-color: #980b13;
+ border-bottom-color: #980b13;
+ color: white; }
+ .formbutton-danger:hover {
+ background: linear-gradient(to bottom, #c30b15, #b20004); }
+ .formbutton-danger:hover, .formbutton-danger.active {
+ border-bottom-color: #8f0209;
+ color: white; }
+
#searchform button {
background: linear-gradient(to bottom, white, #b9bbbd); }
#searchform button:hover {
diff --git a/interface/web/themes/default/assets/stylesheets/themes/dark/theme.min.css b/interface/web/themes/default/assets/stylesheets/themes/dark/theme.min.css
index b7dbfd6..63f79fa 100644
--- a/interface/web/themes/default/assets/stylesheets/themes/dark/theme.min.css
+++ b/interface/web/themes/default/assets/stylesheets/themes/dark/theme.min.css
@@ -1 +1 @@
-html,body{-webkit-tap-highlight-color:black}body{background:#101a22;color:#dfdfdf}.green{color:#3cb355}.form-control:focus{border-color:#f9f1c9}.formbutton-default{background:linear-gradient(to bottom,white,#b9bbbd);color:#101a22}.formbutton-default:hover{background:linear-gradient(to bottom,#f2f2f2,#acaeb1)}.formbutton-success{background:linear-gradient(to bottom,#7bcc89,#6ab977);border-color:#5aab68;border-bottom-color:#5aab68;color:#101a22}.formbutton-success:hover{background:linear-gradient(to bottom,#69c579,#59b167)}.formbutton-success:hover,.formbutton-success.active{border-bottom-color:#509b5a;color:#101a22}#searchform button{background:linear-gradient(to bottom,white,#b9bbbd)}#searchform button:hover{background:linear-gradient(to bottom,#f2f2f2,#acaeb1)}#logout-button{background:#c70f19;border-bottom-color:#980b13}#logout-button:hover{background:#df111c;border-bottom-color:#800a10}#main-navigation a{background:linear-gradient(to bottom,white,#b9bbbd);border-bottom-color:#878787}#main-navigation a:hover{background:linear-gradient(to bottom,#f2f2f2,#acaeb1)}#main-navigation a:hover,#main-navigation a.active{border-bottom-color:#6b6b6b;color:#c70f19}#main-navigation .icon{text-shadow:1px 1px 1px #101a22}#sidebar{border-color:#cedded;background:#101a22}#sidebar header{background:#00313d;color:#f9f1c9}#sidebar li{border-top-color:#cedded}#sidebar a{color:inherit}#sidebar a:hover{color:#f2eaca}.page-header{border-color:#878787}.alert-notification{background:#00313d;border-color:#cedded;color:#f9f1c9}.alert-notification a{color:#e8d9a1}.alert-notification a:hover{color:#f2eaca}.alert-danger{background:#f7dfdf;border-color:#dcb2b3;color:#af797d}.modules li{background:#101a22;border-color:#d3d7da;box-shadow:inset 1px 3px 8px -5px rgba(0,0,0,0.2)}.modules .button{background:linear-gradient(to bottom,white,#b9bbbd);border-bottom-color:#878787}.modules .button:hover{background:linear-gradient(to bottom,#f2f2f2,#acaeb1)}.modules .button:hover,.modules .button.active{border-bottom-color:#6b6b6b}.modules a{color:inherit}.table-wrapper{background:#101a22;border-color:#d3d7da}.table caption{border-bottom-color:#d3d7da}.table tbody tr{border-top-color:#d3d7da}.table tbody tr:nth-child(odd){background:#101a22}.table tbody tr:nth-child(even){background:#101a22}.table tbody tr:hover{background:#00313d}.tfooter{border-top-color:#d3d7da}.content-tab-wrapper{background:#101a22;border-color:#d3d7da}.content-tab-wrapper .nav-tabs{background:#243b55;box-shadow:inset -1px -2px 6px -5px rgba(0,0,0,0.2)}.content-tab-wrapper .nav-tabs>li>a{border-right-color:#d3d7da !important;color:inherit}.content-tab-wrapper .nav-tabs>li>a:hover{background:#1c2f43}.content-tab-wrapper .nav-tabs .active a{background:#101a22 !important}.content-tab-wrapper .nav-tabs .active a:focus{color:inherit}thead.dark{background:linear-gradient(to bottom,#2b556d,#1c394e) !important;color:#dfdfdf}#footer{border-top-color:#d3d7da}.pushy{background:#101a22}.pushy ul.subnavi li a:hover{background:0}.pushy a:hover,.pushy a.active{background:#101a22;color:inherit}@media screen and (max-width:860px){#main-navigation a{border-right-color:#d3d7da;border-bottom-color:#d3d7da}#main-navigation a.active{border-right-color:#d3d7da;border-bottom-color:#d3d7da}#main-navigation a:hover{border-bottom-color:#d3d7da}}
\ No newline at end of file
+html,body{-webkit-tap-highlight-color:black}body{background:#101a22;color:#dfdfdf}.green{color:#3cb355}.form-control:focus{border-color:#f9f1c9}.formbutton-default{background:linear-gradient(to bottom,white,#b9bbbd);color:#101a22}.formbutton-default:hover{background:linear-gradient(to bottom,#f2f2f2,#acaeb1)}.formbutton-success{background:linear-gradient(to bottom,#7bcc89,#6ab977);border-color:#5aab68;border-bottom-color:#5aab68;color:#101a22}.formbutton-success:hover{background:linear-gradient(to bottom,#69c579,#59b167)}.formbutton-success:hover,.formbutton-success.active{border-bottom-color:#509b5a;color:#101a22}.formbutton-danger{background:linear-gradient(to bottom,#c70f19,#b60008);border-color:#980b13;border-bottom-color:#980b13;color:white}.formbutton-danger:hover{background:linear-gradient(to bottom,#c30b15,#b20004)}.formbutton-danger:hover,.formbutton-danger.active{border-bottom-color:#8f0209;color:white}#searchform button{background:linear-gradient(to bottom,white,#b9bbbd)}#searchform button:hover{background:linear-gradient(to bottom,#f2f2f2,#acaeb1)}#logout-button{background:#c70f19;border-bottom-color:#980b13}#logout-button:hover{background:#df111c;border-bottom-color:#800a10}#main-navigation a{background:linear-gradient(to bottom,white,#b9bbbd);border-bottom-color:#878787}#main-navigation a:hover{background:linear-gradient(to bottom,#f2f2f2,#acaeb1)}#main-navigation a:hover,#main-navigation a.active{border-bottom-color:#6b6b6b;color:#c70f19}#main-navigation .icon{text-shadow:1px 1px 1px #101a22}#sidebar{border-color:#cedded;background:#101a22}#sidebar header{background:#00313d;color:#f9f1c9}#sidebar li{border-top-color:#cedded}#sidebar a{color:inherit}#sidebar a:hover{color:#f2eaca}.page-header{border-color:#878787}.alert-notification{background:#00313d;border-color:#cedded;color:#f9f1c9}.alert-notification a{color:#e8d9a1}.alert-notification a:hover{color:#f2eaca}.alert-danger{background:#f7dfdf;border-color:#dcb2b3;color:#af797d}.modules li{background:#101a22;border-color:#d3d7da;box-shadow:inset 1px 3px 8px -5px rgba(0,0,0,0.2)}.modules .button{background:linear-gradient(to bottom,white,#b9bbbd);border-bottom-color:#878787}.modules .button:hover{background:linear-gradient(to bottom,#f2f2f2,#acaeb1)}.modules .button:hover,.modules .button.active{border-bottom-color:#6b6b6b}.modules a{color:inherit}.table-wrapper{background:#101a22;border-color:#d3d7da}.table caption{border-bottom-color:#d3d7da}.table tbody tr{border-top-color:#d3d7da}.table tbody tr:nth-child(odd){background:#101a22}.table tbody tr:nth-child(even){background:#101a22}.table tbody tr:hover{background:#00313d}.tfooter{border-top-color:#d3d7da}.content-tab-wrapper{background:#101a22;border-color:#d3d7da}.content-tab-wrapper .nav-tabs{background:#243b55;box-shadow:inset -1px -2px 6px -5px rgba(0,0,0,0.2)}.content-tab-wrapper .nav-tabs>li>a{border-right-color:#d3d7da!important;color:inherit}.content-tab-wrapper .nav-tabs>li>a:hover{background:#1c2f43}.content-tab-wrapper .nav-tabs .active a{background:#101a22!important}.content-tab-wrapper .nav-tabs .active a:focus{color:inherit}thead.dark{background:linear-gradient(to bottom,#2b556d,#1c394e)!important;color:#dfdfdf}#footer{border-top-color:#d3d7da}.pushy{background:#101a22}.pushy ul.subnavi li a:hover{background:0}.pushy a:hover,.pushy a.active{background:#101a22;color:inherit}@media screen and (max-width:860px){#main-navigation a{border-right-color:#d3d7da;border-bottom-color:#d3d7da}#main-navigation a.active{border-right-color:#d3d7da;border-bottom-color:#d3d7da}#main-navigation a:hover{border-bottom-color:#d3d7da}}
\ No newline at end of file
diff --git a/interface/web/themes/default/assets/stylesheets/themes/default/theme.css b/interface/web/themes/default/assets/stylesheets/themes/default/theme.css
index 307311a..b0bedb1 100644
--- a/interface/web/themes/default/assets/stylesheets/themes/default/theme.css
+++ b/interface/web/themes/default/assets/stylesheets/themes/default/theme.css
@@ -31,6 +31,17 @@
border-bottom-color: #509b5a;
color: white; }
+.formbutton-danger {
+ background: linear-gradient(to bottom, #c70f19, #b60008);
+ border-color: #980b13;
+ border-bottom-color: #980b13;
+ color: white; }
+ .formbutton-danger:hover {
+ background: linear-gradient(to bottom, #c30b15, #b20004); }
+ .formbutton-danger:hover, .formbutton-danger.active {
+ border-bottom-color: #8f0209;
+ color: white; }
+
#searchform button {
background: linear-gradient(to bottom, white, #eef0f2); }
#searchform button:hover {
diff --git a/interface/web/themes/default/assets/stylesheets/themes/default/theme.min.css b/interface/web/themes/default/assets/stylesheets/themes/default/theme.min.css
index 43624c6..1cc932c 100644
--- a/interface/web/themes/default/assets/stylesheets/themes/default/theme.min.css
+++ b/interface/web/themes/default/assets/stylesheets/themes/default/theme.min.css
@@ -1 +1 @@
-html,body{-webkit-tap-highlight-color:black}body{background:#f2f5f7;color:#3c444b}.green{color:#3cb355}.form-control:focus{border-color:#698296}.formbutton-default{background:linear-gradient(to bottom,white,#eef0f2);border-bottom-color:#ccc;color:#3c444b}.formbutton-default:hover{background:linear-gradient(to bottom,#fafafa,#e8ebee)}.formbutton-default:hover,.formbutton-default.active{border-bottom-color:#adadad}.formbutton-success{background:linear-gradient(to bottom,#7bcc89,#6ab977);border-color:#5aab68;border-bottom-color:#5aab68;color:white}.formbutton-success:hover{background:linear-gradient(to bottom,#74c982,#63b671)}.formbutton-success:hover,.formbutton-success.active{border-bottom-color:#509b5a;color:white}#searchform button{background:linear-gradient(to bottom,white,#eef0f2)}#searchform button:hover{background:linear-gradient(to bottom,#fafafa,#e8ebee)}#logout-button{background:#c70f19;border-bottom-color:#980b13}#logout-button:hover{background:#df111c;border-bottom-color:#800a10}#main-navigation a{background:linear-gradient(to bottom,white,#eef0f2);border-bottom-color:#ccc}#main-navigation a:hover{background:linear-gradient(to bottom,#fafafa,#e8ebee)}#main-navigation a:hover,#main-navigation a.active{border-bottom-color:#adadad;color:#c70f19}#main-navigation .icon{text-shadow:1px 1px 1px white}#sidebar{border-color:#cedded;background:white}#sidebar header{background:#dfeaf6;color:#698296}#sidebar li{border-top-color:#cedded}#sidebar a{color:inherit}#sidebar a:hover{color:#428bde}.page-header{border-color:#ccc}.alert-notification{background:#dfeaf6;border-color:#cedded;color:#698296}.alert-notification a{color:#2371ca}.alert-notification a:hover{color:#428bde}.alert-danger{background:#f7dfdf;border-color:#dcb2b3;color:#95686b}.modules li{background:#e1e4e9;border-color:#d3d7da;box-shadow:inset 1px 3px 8px -5px rgba(0,0,0,0.2)}.modules .button{background:linear-gradient(to bottom,white,#eef0f2);border-bottom-color:#ccc}.modules .button:hover{background:linear-gradient(to bottom,#fafafa,#e8ebee)}.modules .button:hover,.modules .button.active{border-bottom-color:#adadad}.modules a{color:inherit}.table-wrapper{background:white;border-color:#d3d7da}.table caption{border-bottom-color:#d3d7da}.table tbody tr{border-top-color:#d3d7da}.table tbody tr:nth-child(odd){background:#f2f5f7}.table tbody tr:nth-child(even){background:white}.table tbody tr:hover{background:#dfeaf6}.tfooter{background:linear-gradient(to bottom,white,#eef0f2);border-top-color:#d3d7da}.content-tab-wrapper{background:white;border-color:#d3d7da}.content-tab-wrapper .nav-tabs{background:#eef0f2;box-shadow:inset -1px -2px 6px -5px rgba(0,0,0,0.2)}.content-tab-wrapper .nav-tabs>li>a{border-right-color:#d3d7da !important;color:inherit}.content-tab-wrapper .nav-tabs>li>a:hover{background:#e0e3e7}.content-tab-wrapper .nav-tabs .active a{background:white !important}thead.dark{background:linear-gradient(to bottom,#57646d,#3e474e) !important;color:white}#footer{border-top-color:#d3d7da}.pushy{background:#f2f5f7}.pushy ul.subnavi li a:hover{background:0}.pushy a:hover,.pushy a.active{background:#f2f5f7;color:inherit}@media screen and (max-width:860px){#main-navigation a{border-right-color:#d3d7da;border-bottom-color:#d3d7da}#main-navigation a.active{border-right-color:#d3d7da;border-bottom-color:#d3d7da}#main-navigation a:hover{border-bottom-color:#d3d7da}}
\ No newline at end of file
+html,body{-webkit-tap-highlight-color:black}body{background:#f2f5f7;color:#3c444b}.green{color:#3cb355}.form-control:focus{border-color:#698296}.formbutton-default{background:linear-gradient(to bottom,white,#eef0f2);border-bottom-color:#ccc;color:#3c444b}.formbutton-default:hover{background:linear-gradient(to bottom,#fafafa,#e8ebee)}.formbutton-default:hover,.formbutton-default.active{border-bottom-color:#adadad}.formbutton-success{background:linear-gradient(to bottom,#7bcc89,#6ab977);border-color:#5aab68;border-bottom-color:#5aab68;color:white}.formbutton-success:hover{background:linear-gradient(to bottom,#74c982,#63b671)}.formbutton-success:hover,.formbutton-success.active{border-bottom-color:#509b5a;color:white}.formbutton-danger{background:linear-gradient(to bottom,#c70f19,#b60008);border-color:#980b13;border-bottom-color:#980b13;color:white}.formbutton-danger:hover{background:linear-gradient(to bottom,#c30b15,#b20004)}.formbutton-danger:hover,.formbutton-danger.active{border-bottom-color:#8f0209;color:white}#searchform button{background:linear-gradient(to bottom,white,#eef0f2)}#searchform button:hover{background:linear-gradient(to bottom,#fafafa,#e8ebee)}#logout-button{background:#c70f19;border-bottom-color:#980b13}#logout-button:hover{background:#df111c;border-bottom-color:#800a10}#main-navigation a{background:linear-gradient(to bottom,white,#eef0f2);border-bottom-color:#ccc}#main-navigation a:hover{background:linear-gradient(to bottom,#fafafa,#e8ebee)}#main-navigation a:hover,#main-navigation a.active{border-bottom-color:#adadad;color:#c70f19}#main-navigation .icon{text-shadow:1px 1px 1px white}#sidebar{border-color:#cedded;background:white}#sidebar header{background:#dfeaf6;color:#698296}#sidebar li{border-top-color:#cedded}#sidebar a{color:inherit}#sidebar a:hover{color:#428bde}.page-header{border-color:#ccc}.alert-notification{background:#dfeaf6;border-color:#cedded;color:#698296}.alert-notification a{color:#2371ca}.alert-notification a:hover{color:#428bde}.alert-danger{background:#f7dfdf;border-color:#dcb2b3;color:#95686b}.modules li{background:#e1e4e9;border-color:#d3d7da;box-shadow:inset 1px 3px 8px -5px rgba(0,0,0,0.2)}.modules .button{background:linear-gradient(to bottom,white,#eef0f2);border-bottom-color:#ccc}.modules .button:hover{background:linear-gradient(to bottom,#fafafa,#e8ebee)}.modules .button:hover,.modules .button.active{border-bottom-color:#adadad}.modules a{color:inherit}.table-wrapper{background:white;border-color:#d3d7da}.table caption{border-bottom-color:#d3d7da}.table tbody tr{border-top-color:#d3d7da}.table tbody tr:nth-child(odd){background:#f2f5f7}.table tbody tr:nth-child(even){background:white}.table tbody tr:hover{background:#dfeaf6}.tfooter{background:linear-gradient(to bottom,white,#eef0f2);border-top-color:#d3d7da}.content-tab-wrapper{background:white;border-color:#d3d7da}.content-tab-wrapper .nav-tabs{background:#eef0f2;box-shadow:inset -1px -2px 6px -5px rgba(0,0,0,0.2)}.content-tab-wrapper .nav-tabs>li>a{border-right-color:#d3d7da!important;color:inherit}.content-tab-wrapper .nav-tabs>li>a:hover{background:#e0e3e7}.content-tab-wrapper .nav-tabs .active a{background:white!important}thead.dark{background:linear-gradient(to bottom,#57646d,#3e474e)!important;color:white}#footer{border-top-color:#d3d7da}.pushy{background:#f2f5f7}.pushy ul.subnavi li a:hover{background:0}.pushy a:hover,.pushy a.active{background:#f2f5f7;color:inherit}@media screen and (max-width:860px){#main-navigation a{border-right-color:#d3d7da;border-bottom-color:#d3d7da}#main-navigation a.active{border-right-color:#d3d7da;border-bottom-color:#d3d7da}#main-navigation a:hover{border-bottom-color:#d3d7da}}
\ No newline at end of file
diff --git a/interface/web/themes/default_64_navimg/templates/main.tpl.htm b/interface/web/themes/default_64_navimg/templates/main.tpl.htm
index ca8bfeb..c2a733b 100644
--- a/interface/web/themes/default_64_navimg/templates/main.tpl.htm
+++ b/interface/web/themes/default_64_navimg/templates/main.tpl.htm
@@ -138,7 +138,7 @@
<!-- end: skip link navigation -->
<tmpl_if name="cpuser">
<span><a href="#logout" data-load-content="login/logout.php">LOGOUT <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>--></span>
- <tmpl_if name='usertype' op='==' value='normaluser'><div class="col-sm-9"><input type="text" id="globalsearch" value="" /></div></tmpl_if>
+ <tmpl_if name='usertype' op='==' value='normaluser'><div class="col-sm-9"><input class="form-control" type="text" id="globalsearch" value="" /></div></tmpl_if>
</tmpl_if>
</div>
<h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>
@@ -168,7 +168,7 @@
<a id="content" name="content"></a>
<!-- skiplink anchor: Content -->
<form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class="uniForm">
- <div class="col-sm-9"><input type="text" style="display:none" /></div><input type="password" style="display:none"/>
+ <div class="col-sm-9"><input class="form-control" type="text" style="display:none" /></div><input type="password" style="display:none"/>
<div id="pageContent"><!-- AJAX CONTENT --></div>
</form>
</div>
diff --git a/interface/web/themes/default_combobox/templates/main.tpl.htm b/interface/web/themes/default_combobox/templates/main.tpl.htm
index 4a3694b..5a41274 100644
--- a/interface/web/themes/default_combobox/templates/main.tpl.htm
+++ b/interface/web/themes/default_combobox/templates/main.tpl.htm
@@ -163,7 +163,7 @@
select = this.element.hide(),
selected = select.children( ":selected" ),
value = selected.val() ? selected.text() : "";
- var input = this.input = $( "<div class="col-sm-9"><input type="text">" )
+ var input = this.input = $( "<div class="col-sm-9"><input class="form-control" type="text">" )
.insertAfter( select )
.width( oldWidth )
.val( value )
@@ -293,7 +293,7 @@
<!-- end: skip link navigation -->
<tmpl_if name="cpuser">
<span><a href="#logout" data-load-content="login/logout.php">LOGOUT <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>--></span>
- <tmpl_if name='usertype' op='==' value='normaluser'><div class="col-sm-9"><input type="text" id="globalsearch" value="" /></div></tmpl_if>
+ <tmpl_if name='usertype' op='==' value='normaluser'><div class="col-sm-9"><input class="form-control" type="text" id="globalsearch" value="" /></div></tmpl_if>
</tmpl_if>
</div>
<h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>
@@ -323,7 +323,7 @@
<a id="content" name="content"></a>
<!-- skiplink anchor: Content -->
<form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class="uniForm">
- <div class="col-sm-9"><input type="text" style="display:none" /></div><input type="password" style="display:none"/>
+ <div class="col-sm-9"><input class="form-control" type="text" style="display:none" /></div><input type="password" style="display:none"/>
<div id="pageContent"><!-- AJAX CONTENT --></div>
</form>
</div>
diff --git a/interface/web/themes/default_no_navimg/templates/main.tpl.htm b/interface/web/themes/default_no_navimg/templates/main.tpl.htm
index bbd956e..36afa41 100644
--- a/interface/web/themes/default_no_navimg/templates/main.tpl.htm
+++ b/interface/web/themes/default_no_navimg/templates/main.tpl.htm
@@ -139,7 +139,7 @@
<!-- end: skip link navigation -->
<tmpl_if name="cpuser">
<span><a href="#logout" data-load-content="login/logout.php">LOGOUT <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>--></span>
- <tmpl_if name='usertype' op='==' value='normaluser'><div class="col-sm-9"><input type="text" id="globalsearch" value="" /></div></tmpl_if>
+ <tmpl_if name='usertype' op='==' value='normaluser'><div class="col-sm-9"><input class="form-control" type="text" id="globalsearch" value="" /></div></tmpl_if>
</tmpl_if>
</div>
<h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>
@@ -169,7 +169,7 @@
<a id="content" name="content"></a>
<!-- skiplink anchor: Content -->
<form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class="uniForm">
- <div class="col-sm-9"><input type="text" style="display:none" /></div><input type="password" style="display:none"/>
+ <div class="col-sm-9"><input class="form-control" type="text" style="display:none" /></div><input type="password" style="display:none"/>
<div id="pageContent"><!-- AJAX CONTENT --></div>
</form>
</div>
diff --git a/interface/web/tools/templates/dns_import_tupa.htm b/interface/web/tools/templates/dns_import_tupa.htm
index 0efb142..7a5f5f8 100644
--- a/interface/web/tools/templates/dns_import_tupa.htm
+++ b/interface/web/tools/templates/dns_import_tupa.htm
@@ -6,25 +6,25 @@
<div class="form-group">
<label class="col-sm-3 control-label">Tupa database hostname</label>
<div class="col-sm-9">
- <div class="col-sm-9"><input type="text" id="dbhost" value="{tmpl_var name='dbhost'}" name="dbhost" />
+ <div class="col-sm-9"><input class="form-control" type="text" id="dbhost" value="{tmpl_var name='dbhost'}" name="dbhost" />
</div></div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">Tupa database name</label>
<div class="col-sm-9">
- <div class="col-sm-9"><input type="text" id="dbname" value="{tmpl_var name='dbname'}" name="dbname" />
+ <div class="col-sm-9"><input class="form-control" type="text" id="dbname" value="{tmpl_var name='dbname'}" name="dbname" />
</div></div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">Tupa database user</label>
<div class="col-sm-9">
- <div class="col-sm-9"><input type="text" id="dbuser" value="{tmpl_var name='dbuser'}" name="dbuser" />
+ <div class="col-sm-9"><input class="form-control" type="text" id="dbuser" value="{tmpl_var name='dbuser'}" name="dbuser" />
</div></div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">Tupa database password</label>
<div class="col-sm-9">
- <div class="col-sm-9"><input type="text" id="dbpassword" value="{tmpl_var name='dbpassword'}" name="dbpassword" />
+ <div class="col-sm-9"><input class="form-control" type="text" id="dbpassword" value="{tmpl_var name='dbpassword'}" name="dbpassword" />
</div></div>
</div>
diff --git a/interface/web/tools/templates/import_ispconfig.htm b/interface/web/tools/templates/import_ispconfig.htm
index 2385eeb..ecd9574 100644
--- a/interface/web/tools/templates/import_ispconfig.htm
+++ b/interface/web/tools/templates/import_ispconfig.htm
@@ -10,19 +10,19 @@
<div class="form-group">
<label class="col-sm-3 control-label">Remote API URL</label>
<div class="col-sm-9">
- <div class="col-sm-9"><input type="text" id="remote_server" value="{tmpl_var name='remote_server'}" name="remote_server" /> (e.g. https://www.example.com:8080/remote/ )
+ <div class="col-sm-9"><input class="form-control" type="text" id="remote_server" value="{tmpl_var name='remote_server'}" name="remote_server" /> (e.g. https://www.example.com:8080/remote/ )
</div></div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">Remote User</label>
<div class="col-sm-9">
- <div class="col-sm-9"><input type="text" id="remote_user" value="{tmpl_var name='remote_user'}" name="remote_user" />
+ <div class="col-sm-9"><input class="form-control" type="text" id="remote_user" value="{tmpl_var name='remote_user'}" name="remote_user" />
</div></div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">Remote password</label>
<div class="col-sm-9">
- <div class="col-sm-9"><input type="text" id="remote_password" value="{tmpl_var name='remote_password'}" name="remote_password" />
+ <div class="col-sm-9"><input class="form-control" type="text" id="remote_password" value="{tmpl_var name='remote_password'}" name="remote_password" />
</div></div>
</div>
@@ -45,37 +45,37 @@
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name="import_mailbox_txt"}</label>
<div class="col-sm-9">
- <div class="col-sm-9"><input type="checkbox" id="import_mailbox" value="1" name="import_mailbox" checked="checked" />
+ <div class="col-sm-9"><input class="form-control" type="checkbox" id="import_mailbox" value="1" name="import_mailbox" checked="checked" />
</div></div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name="import_user_filter_txt"}</label>
<div class="col-sm-9">
- <div class="col-sm-9"><input type="checkbox" id="import_user_filter" value="1" name="import_user_filter" checked="checked" />
+ <div class="col-sm-9"><input class="form-control" type="checkbox" id="import_user_filter" value="1" name="import_user_filter" checked="checked" />
</div></div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name="import_spamfilter_txt"}</label>
<div class="col-sm-9">
- <div class="col-sm-9"><input type="checkbox" id="import_spamfilter" value="1" name="import_spamfilter" checked="checked" />
+ <div class="col-sm-9"><input class="form-control" type="checkbox" id="import_spamfilter" value="1" name="import_spamfilter" checked="checked" />
</div></div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name="import_alias_txt"}</label>
<div class="col-sm-9">
- <div class="col-sm-9"><input type="checkbox" id="import_alias" value="1" name="import_alias" checked="checked" />
+ <div class="col-sm-9"><input class="form-control" type="checkbox" id="import_alias" value="1" name="import_alias" checked="checked" />
</div></div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name="import_forward_txt"}</label>
<div class="col-sm-9">
- <div class="col-sm-9"><input type="checkbox" id="import_forward" value="1" name="import_forward" checked="checked" />
+ <div class="col-sm-9"><input class="form-control" type="checkbox" id="import_forward" value="1" name="import_forward" checked="checked" />
</div></div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name="import_aliasdomain_txt"}</label>
<div class="col-sm-9">
- <div class="col-sm-9"><input type="checkbox" id="import_aliasdomain" value="1" name="import_aliasdomain" checked="checked" />
+ <div class="col-sm-9"><input class="form-control" type="checkbox" id="import_aliasdomain" value="1" name="import_aliasdomain" checked="checked" />
</div></div>
</div>
diff --git a/interface/web/tools/templates/import_plesk.htm b/interface/web/tools/templates/import_plesk.htm
index 08a901e..0bf97ef 100644
--- a/interface/web/tools/templates/import_plesk.htm
+++ b/interface/web/tools/templates/import_plesk.htm
@@ -6,50 +6,50 @@
<div class="form-group">
<label class="col-sm-3 control-label">Plesk database hostname</label>
<div class="col-sm-9">
- <div class="col-sm-9"><input type="text" id="dbhost" value="{tmpl_var name='dbhost'}" name="dbhost" />
+ <div class="col-sm-9"><input class="form-control" type="text" id="dbhost" value="{tmpl_var name='dbhost'}" name="dbhost" />
</div></div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">Plesk database name</label>
<div class="col-sm-9">
- <div class="col-sm-9"><input type="text" id="dbname" value="{tmpl_var name='dbname'}" name="dbname" />
+ <div class="col-sm-9"><input class="form-control" type="text" id="dbname" value="{tmpl_var name='dbname'}" name="dbname" />
</div></div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">Plesk database user</label>
<div class="col-sm-9">
- <div class="col-sm-9"><input type="text" id="dbuser" value="{tmpl_var name='dbuser'}" name="dbuser" />
+ <div class="col-sm-9"><input class="form-control" type="text" id="dbuser" value="{tmpl_var name='dbuser'}" name="dbuser" />
</div></div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">Plesk database password</label>
<div class="col-sm-9">
- <div class="col-sm-9"><input type="text" id="dbpassword" value="{tmpl_var name='dbpassword'}" name="dbpassword" />
+ <div class="col-sm-9"><input class="form-control" type="text" id="dbpassword" value="{tmpl_var name='dbpassword'}" name="dbpassword" />
</div></div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">Web content backup file (on this server, optional)</label>
<div class="col-sm-9">
- <div class="col-sm-9"><input type="text" id="webcontent" value="{tmpl_var name='webcontent'}" name="webcontent" />
+ <div class="col-sm-9"><input class="form-control" type="text" id="webcontent" value="{tmpl_var name='webcontent'}" name="webcontent" />
</div></div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">Maildir content backup file (on this server, optional)</label>
<div class="col-sm-9">
- <div class="col-sm-9"><input type="text" id="mailcontent" value="{tmpl_var name='mailcontent'}" name="mailcontent" />
+ <div class="col-sm-9"><input class="form-control" type="text" id="mailcontent" value="{tmpl_var name='mailcontent'}" name="mailcontent" />
</div></div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">Import all data (that can be imported)</label>
<div class="col-sm-9">
- <div class="col-sm-9"><input type="checkbox" id="start" value="1" name="start" checked/>
+ <div class="col-sm-9"><input class="form-control" type="checkbox" id="start" value="1" name="start" checked/>
</div></div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">Import database contents (make sure the database user has the rights to do so)</label>
<div class="col-sm-9">
- <div class="col-sm-9"><input type="checkbox" id="dbdata" value="1" name="dbdata" checked/>
+ <div class="col-sm-9"><input class="form-control" type="checkbox" id="dbdata" value="1" name="dbdata" checked/>
</div></div>
</div>
diff --git a/interface/web/tools/templates/import_vpopmail.htm b/interface/web/tools/templates/import_vpopmail.htm
index ec677a5..90cd905 100644
--- a/interface/web/tools/templates/import_vpopmail.htm
+++ b/interface/web/tools/templates/import_vpopmail.htm
@@ -10,31 +10,31 @@
<div class="form-group">
<label class="col-sm-3 control-label">Database Hostname</label>
<div class="col-sm-9">
- <div class="col-sm-9"><input type="text" id="db_hostname" value="{tmpl_var name='db_hostname'}" name="db_hostname" />
+ <div class="col-sm-9"><input class="form-control" type="text" id="db_hostname" value="{tmpl_var name='db_hostname'}" name="db_hostname" />
</div></div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">Database Name</label>
<div class="col-sm-9">
- <div class="col-sm-9"><input type="text" id="db_name" value="{tmpl_var name='db_name'}" name="db_name" />
+ <div class="col-sm-9"><input class="form-control" type="text" id="db_name" value="{tmpl_var name='db_name'}" name="db_name" />
</div></div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">Database User</label>
<div class="col-sm-9">
- <div class="col-sm-9"><input type="text" id="db_user" value="{tmpl_var name='db_user'}" name="db_user" />
+ <div class="col-sm-9"><input class="form-control" type="text" id="db_user" value="{tmpl_var name='db_user'}" name="db_user" />
</div></div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">Database password</label>
<div class="col-sm-9">
- <div class="col-sm-9"><input type="text" id="db_password" value="{tmpl_var name='db_password'}" name="db_password" />
+ <div class="col-sm-9"><input class="form-control" type="text" id="db_password" value="{tmpl_var name='db_password'}" name="db_password" />
</div></div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">Server ID of local mailserver</label>
<div class="col-sm-9">
- <div class="col-sm-9"><input type="text" id="local_server_id" value="{tmpl_var name='local_server_id'}" name="local_server_id" />
+ <div class="col-sm-9"><input class="form-control" type="text" id="local_server_id" value="{tmpl_var name='local_server_id'}" name="local_server_id" />
</div></div>
</div>
diff --git a/interface/web/tools/templates/resync.htm b/interface/web/tools/templates/resync.htm
index 6e3b2bf..21c29d7 100644
--- a/interface/web/tools/templates/resync.htm
+++ b/interface/web/tools/templates/resync.htm
@@ -7,7 +7,7 @@
<div class="form-group">
<tmpl_if name="web_server_found">
- <div class="col-sm-9"><input type="checkbox" id="resync_sites" value="1" name="resync_sites">
+ <div class="col-sm-9"><input class="form-control" type="checkbox" id="resync_sites" value="1" name="resync_sites">
</div><label for="resync_sites" class="col-sm-3 control-label">{tmpl_var name='resync_sites_txt'}</label>
<div class="col-sm-9"><select name="web_server_id" id="web_server_id" class="form-control">
{tmpl_var name='web_server_id'}
@@ -24,7 +24,7 @@
<div class="form-group">
<tmpl_if name="web_server_found">
- <div class="col-sm-9"><input type="checkbox" id="resync_ftp" value="1" name="resync_ftp">
+ <div class="col-sm-9"><input class="form-control" type="checkbox" id="resync_ftp" value="1" name="resync_ftp">
</div><label for="resync_ftp" class="col-sm-3 control-label">{tmpl_var name="resync_ftp_txt"}</label>
<div class="col-sm-9"><select name="ftp_server_id" id="ftp_server_id" class="form-control">
{tmpl_var name='ftp_server_id'}
@@ -41,7 +41,7 @@
<div class="form-group">
<tmpl_if name="file_server_found">
- <div class="col-sm-9"><input type="checkbox" id="resync_webdav" value="1" name="resync_webdav">
+ <div class="col-sm-9"><input class="form-control" type="checkbox" id="resync_webdav" value="1" name="resync_webdav">
</div><label for="resync_webdav" class="col-sm-3 control-label">{tmpl_var name="resync_webdav_txt"}</label>
<div class="col-sm-9"><select name="webdav_server_id" id="webdav_server_id" class="form-control">
{tmpl_var name='file_server_id'}
@@ -58,7 +58,7 @@
<div class="form-group">
<tmpl_if name="web_server_found">
- <div class="col-sm-9"><input type="checkbox" id="resync_shell" value="1" name="resync_shell">
+ <div class="col-sm-9"><input class="form-control" type="checkbox" id="resync_shell" value="1" name="resync_shell">
</div><label for="resync_shell" class="col-sm-3 control-label">{tmpl_var name="resync_shell_txt"}</label>
<div class="col-sm-9"><select name="shell_server_id" id="shell_server_id" class="form-control">
{tmpl_var name='web_server_id'}
@@ -75,7 +75,7 @@
<div class="form-group">
<tmpl_if name="web_server_found">
- <div class="col-sm-9"><input type="checkbox" id="resync_cron" value="1" name="resync_cron">
+ <div class="col-sm-9"><input class="form-control" type="checkbox" id="resync_cron" value="1" name="resync_cron">
</div><label for="resync_cron" class="col-sm-3 control-label">{tmpl_var name="resync_cron_txt"}</label>
<div class="col-sm-9"><select name="cron_server_id" id="cron_server_id" class="form-control">
{tmpl_var name='web_server_id'}
@@ -92,7 +92,7 @@
<div class="form-group">
<tmpl_if name="db_server_found">
- <div class="col-sm-9"><input type="checkbox" id="resync_db" value="1" name="resync_db">
+ <div class="col-sm-9"><input class="form-control" type="checkbox" id="resync_db" value="1" name="resync_db">
</div><label for="resync_db" class="col-sm-3 control-label">{tmpl_var name="resync_db_txt"}</label>
<div class="col-sm-9"><select name="db_server_id" id="db_server_id" class="form-control">
{tmpl_var name='db_server_id'}
@@ -109,7 +109,7 @@
<div class="form-group">
<tmpl_if name="mail_server_found">
- <div class="col-sm-9"><input type="checkbox" id="resync_mail" value="1" name="resync_mail">
+ <div class="col-sm-9"><input class="form-control" type="checkbox" id="resync_mail" value="1" name="resync_mail">
</div><label for="resync_mail" class="col-sm-3 control-label">{tmpl_var name="resync_mail_txt"}</label>
<div class="col-sm-9"><select name="mail_server_id" id="mail_server_id" class="form-control">
{tmpl_var name='mail_server_id'}
@@ -126,7 +126,7 @@
<div class="form-group">
<tmpl_if name="mail_server_found">
- <div class="col-sm-9"><input type="checkbox" id="resync_mailbox" value="1" name="resync_mailbox">
+ <div class="col-sm-9"><input class="form-control" type="checkbox" id="resync_mailbox" value="1" name="resync_mailbox">
</div><label for="resync_mailbox" class="col-sm-3 control-label">{tmpl_var name="resync_mailbox_txt"}</label>
<div class="col-sm-9"><select name="mailbox_server_id" id="mailbox_server_id" class="form-control">
{tmpl_var name='mail_server_id'}
@@ -142,7 +142,7 @@
<fieldset class="inlineLabels">
<div class="form-group">
<tmpl_if name="dns_server_found">
- <div class="col-sm-9"><input type="checkbox" id="resync_dns" value="1" name="resync_dns">
+ <div class="col-sm-9"><input class="form-control" type="checkbox" id="resync_dns" value="1" name="resync_dns">
</div><label for="resync_dns" class="col-sm-3 control-label">{tmpl_var name="resync_dns_txt"}</label>
<div class="col-sm-9"><select name="dns_server_id" id="dns_server_id" class="form-control">
{tmpl_var name='dns_server_id'}
@@ -159,7 +159,7 @@
<div class="form-group">
<tmpl_if name="vserver_server_found">
- <div class="col-sm-9"><input type="checkbox" id="resync_vserver" value="1" name="resync_vserver">
+ <div class="col-sm-9"><input class="form-control" type="checkbox" id="resync_vserver" value="1" name="resync_vserver">
</div><label for="resync_vserver" class="col-sm-3 control-label">{tmpl_var name="resync_vserver_txt"}</label>
<div class="col-sm-9"><select name="vserver_server_id" id="vserver_server_id" class="form-control">
{tmpl_var name='vserver_server_id'}
@@ -176,7 +176,7 @@
<div class="form-group">
<tmpl_if name="firewall_server_found">
- <div class="col-sm-9"><input type="checkbox" id="resync_firewall" value="1" name="resync_firewall">
+ <div class="col-sm-9"><input class="form-control" type="checkbox" id="resync_firewall" value="1" name="resync_firewall">
</div><label for="resync_firewall" class="col-sm-3 control-label">{tmpl_var name="resync_firewall_txt"}</label>
<div class="col-sm-9"><select name="firewall_server_id" id="firewall_server_id" class="form-control">
{tmpl_var name='firewall_server_id'}
@@ -192,7 +192,7 @@
<div class="form-group">
- <div class="col-sm-9"><input type="checkbox" id="resync_client" value="1" name="resync_client">
+ <div class="col-sm-9"><input class="form-control" type="checkbox" id="resync_client" value="1" name="resync_client">
</div><label for="resync_client" class="col-sm-3 control-label">{tmpl_var name="resync_client_txt"}</label>
</div>
diff --git a/interface/web/vm/templates/openvz_action.htm b/interface/web/vm/templates/openvz_action.htm
index a3bad27..49ca4e8 100644
--- a/interface/web/vm/templates/openvz_action.htm
+++ b/interface/web/vm/templates/openvz_action.htm
@@ -16,28 +16,28 @@
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='start_txt'}</label>
<div class="col-sm-9">
- <div class="col-sm-9"><input type="radio" id="action" value="start" name="action" {tmpl_var name='start_option_enabled'}/>
+ <div class="col-sm-9"><input class="form-control" type="radio" id="action" value="start" name="action" {tmpl_var name='start_option_enabled'}/>
</div></div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='stop_txt'}</label>
<div class="col-sm-9">
- <div class="col-sm-9"><input type="radio" id="action" value="stop" name="action" {tmpl_var name='stop_option_enabled'}/>
+ <div class="col-sm-9"><input class="form-control" type="radio" id="action" value="stop" name="action" {tmpl_var name='stop_option_enabled'}/>
</div></div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='restart_txt'}</label>
<div class="col-sm-9">
- <div class="col-sm-9"><input type="radio" id="action" value="restart" name="action" {tmpl_var name='restart_option_enabled'}/>
+ <div class="col-sm-9"><input class="form-control" type="radio" id="action" value="restart" name="action" {tmpl_var name='restart_option_enabled'}/>
</div></div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='ostemplate_txt'}</label>
<div class="col-sm-9">
- <div class="col-sm-9"><input type="radio" style="float:left; margin-right:10px;" id="action" value="ostemplate" name="action" {tmpl_var name='ostemplate_option_enabled'}/>
+ <div class="col-sm-9"><input class="form-control" type="radio" style="float:left; margin-right:10px;" id="action" value="ostemplate" name="action" {tmpl_var name='ostemplate_option_enabled'}/>
</div><div class="col-sm-9"><input type="text" name="ostemplate_name" class="form-control" value="{tmpl_var name='ostemplate_name'}" onclick="$('[name=action]').filter('[value=ostemplate]').attr('checked','checked');" /> {tmpl_var name='ostemplate_desc_txt'}
</div></div>
</div>
diff --git a/interface/web/vm/templates/openvz_ip_list.htm b/interface/web/vm/templates/openvz_ip_list.htm
index 647f147..a5d5f8b 100644
--- a/interface/web/vm/templates/openvz_ip_list.htm
+++ b/interface/web/vm/templates/openvz_ip_list.htm
@@ -13,7 +13,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="server_id_txt"></th>
<th><tmpl_var name="vm_id_txt"></th>
@@ -22,12 +22,12 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<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><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><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><select class="form-control" name="search_vm_id">{tmpl_var name='search_vm_id'}</select></td>
+ <td><input class="form-control" type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" /></td>
+ <td><select class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','vm/openvz_ip_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -39,7 +39,7 @@
<td><a href="#" data-load-content="vm/openvz_ip_edit.php?id={tmpl_var name='id'}">{tmpl_var name="ip_address"}</a></td>
<td><a href="#" data-load-content="vm/openvz_ip_edit.php?id={tmpl_var name='id'}">{tmpl_var name="reserved"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('vm/openvz_ip_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('vm/openvz_ip_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/vm/templates/openvz_ostemplate_edit.htm b/interface/web/vm/templates/openvz_ostemplate_edit.htm
index 8edc2b3..317ac9a 100644
--- a/interface/web/vm/templates/openvz_ostemplate_edit.htm
+++ b/interface/web/vm/templates/openvz_ostemplate_edit.htm
@@ -33,7 +33,7 @@
</div>
<div class="form-group">
<label for="description" class="col-sm-3 control-label">{tmpl_var name='description_txt'}</label>
- <div class="col-sm-9"><textarea name="description" id="description" rows='10' cols='30'>{tmpl_var name='description'}</textarea></div>
+ <div class="col-sm-9"><textarea class="form-control" name="description" id="description" rows='10' cols='30'>{tmpl_var name='description'}</textarea></div>
</div>
diff --git a/interface/web/vm/templates/openvz_ostemplate_list.htm b/interface/web/vm/templates/openvz_ostemplate_list.htm
index c9a41fd..d01bd1e 100644
--- a/interface/web/vm/templates/openvz_ostemplate_list.htm
+++ b/interface/web/vm/templates/openvz_ostemplate_list.htm
@@ -13,7 +13,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="active_txt"></th>
<th><tmpl_var name="ostemplate_id_txt"></th>
@@ -23,13 +23,13 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <td><select name="search_active">{tmpl_var name='search_active'}</select></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><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><input class="form-control" type="text" name="search_ostemplate_id" value="{tmpl_var name='search_ostemplate_id'}" /></td>
+ <td><input class="form-control" type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></td>
+ <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><select class="form-control" name="search_allservers">{tmpl_var name='search_allservers'}</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_ostemplate_list.php');">{tmpl_var name="filter_txt"}</button>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','vm/openvz_ostemplate_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -42,7 +42,7 @@
<td><a href="#" data-load-content="vm/openvz_ostemplate_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
<td><a href="#" data-load-content="vm/openvz_ostemplate_edit.php?id={tmpl_var name='id'}">{tmpl_var name="allservers"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('vm/openvz_ostemplate_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('vm/openvz_ostemplate_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/vm/templates/openvz_template_edit.htm b/interface/web/vm/templates/openvz_template_edit.htm
index 00285d2..9859d21 100644
--- a/interface/web/vm/templates/openvz_template_edit.htm
+++ b/interface/web/vm/templates/openvz_template_edit.htm
@@ -59,7 +59,7 @@
</div>
<div class="form-group">
<label for="description" class="col-sm-3 control-label">{tmpl_var name='description_txt'}</label>
- <div class="col-sm-9"><textarea name="description" id="description" rows='10' cols='30'>{tmpl_var name='description'}</textarea></div>
+ <div class="col-sm-9"><textarea class="form-control" name="description" id="description" rows='10' cols='30'>{tmpl_var name='description'}</textarea></div>
</div>
diff --git a/interface/web/vm/templates/openvz_template_list.htm b/interface/web/vm/templates/openvz_template_list.htm
index 355b88e..0942c37 100644
--- a/interface/web/vm/templates/openvz_template_list.htm
+++ b/interface/web/vm/templates/openvz_template_list.htm
@@ -13,17 +13,17 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="active_txt"></th>
<th><tmpl_var name="template_name_txt"></th>
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <td><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></td>
+ <td><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><input class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','vm/openvz_template_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -33,7 +33,7 @@
<td><a href="#" data-load-content="vm/openvz_template_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
<td><a href="#" data-load-content="vm/openvz_template_edit.php?id={tmpl_var name='id'}">{tmpl_var name="template_name"}</a></td>
<td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('vm/openvz_template_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('vm/openvz_template_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
diff --git a/interface/web/vm/templates/openvz_vm_edit.htm b/interface/web/vm/templates/openvz_vm_edit.htm
index 3eacdb0..b34d828 100644
--- a/interface/web/vm/templates/openvz_vm_edit.htm
+++ b/interface/web/vm/templates/openvz_vm_edit.htm
@@ -89,7 +89,7 @@
</div></div>
<div class="form-group">
<label for="description" class="col-sm-3 control-label">{tmpl_var name='description_txt'}</label>
- <div class="col-sm-9"><textarea name="description" id="description" rows='5' cols='30' style='height:60px;'>{tmpl_var name='description'}</textarea></div>
+ <div class="col-sm-9"><textarea class="form-control" name="description" id="description" rows='5' cols='30' style='height:60px;'>{tmpl_var name='description'}</textarea></div>
</div>
diff --git a/interface/web/vm/templates/openvz_vm_list.htm b/interface/web/vm/templates/openvz_vm_list.htm
index ef8e004..cb99086 100644
--- a/interface/web/vm/templates/openvz_vm_list.htm
+++ b/interface/web/vm/templates/openvz_vm_list.htm
@@ -13,7 +13,7 @@
<p><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
<th><tmpl_var name="veid_txt"></th>
<th><tmpl_var name="active_txt"></th>
@@ -25,15 +25,15 @@
<th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <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><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><input class="form-control" type="text" name="search_veid" value="{tmpl_var name='search_veid'}" /></td>
+ <td><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><select class="form-control" name="search_ostemplate_id">{tmpl_var name='search_ostemplate_id'}</select></td>
+ <td><select class="form-control" name="search_template_id">{tmpl_var name='search_template_id'}</select></td>
+ <td><input class="form-control" type="text" name="search_hostname" value="{tmpl_var name='search_hostname'}" /></td>
+ <td><input class="form-control" 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>
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','vm/openvz_vm_list.php');"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
@@ -48,8 +48,8 @@
<td><a href="#" data-load-content="vm/openvz_vm_edit.php?id={tmpl_var name='id'}">{tmpl_var name="hostname"}</a></td>
<td><a href="#" data-load-content="vm/openvz_vm_edit.php?id={tmpl_var name='id'}">{tmpl_var name="ip_address"}</a></td>
<td>
- <a class="btn btn-default formbutton-action" data-load-content="vm/openvz_action.php?id={tmpl_var name='id'}">Action</button>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('vm/openvz_vm_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <a class="btn btn-default formbutton-default formbutton-narrow" data-load-content="vm/openvz_action.php?id={tmpl_var name='id'}"><span class="icon icon-action"></span></button>
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('vm/openvz_vm_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
</td>
</tr>
</tmpl_loop>
--
Gitblit v1.9.1