From 825dd6792d2d46b7d97e1f1626a9071382977cd2 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 19 Dec 2014 15:15:19 -0500
Subject: [PATCH] - First run of template converting for new layout
---
interface/web/admin/templates/server_config_web_edit.htm | 431
interface/web/client/templates/resellers_list.htm | 93
interface/web/admin/templates/server_config_ufw_edit.htm | 79
interface/web/mail/templates/user_quota_stats_list.htm | 62
interface/web/sites/templates/database_edit.htm | 135
interface/web/admin/templates/server_config_list.htm | 40
interface/web/sites/templates/ftp_user_list.htm | 75
interface/web/mail/templates/spamfilter_config_getmail_edit.htm | 21
interface/web/client/templates/client_edit_address.htm | 289
interface/web/mail/templates/mail_transport_edit.htm | 77
interface/web/admin/templates/system_config_mail_edit.htm | 139
interface/web/help/templates/help_faq_sections_list.htm | 53
interface/web/mail/templates/mail_aliasdomain_list.htm | 67
interface/web/mail/templates/spamfilter_policy_list.htm | 79
interface/web/admin/templates/server_list.htm | 78
interface/web/help/templates/faq_manage_questions_list.htm | 51
interface/web/mail/templates/mail_user_filter_list.htm | 42
interface/web/mail/templates/spamfilter_users_list.htm | 79
interface/web/admin/templates/server_php_list.htm | 67
interface/web/dns/templates/dns_soa_list.htm | 81
interface/web/mail/templates/spamfilter_config_list.htm | 55
interface/web/dns/templates/dns_soa_edit.htm | 163
interface/web/monitor/templates/show_log.htm | 28
interface/web/mail/templates/mail_domain_admin_list.htm | 73
interface/web/sites/templates/web_vhost_domain_advanced.htm | 143
interface/web/mail/templates/mail_user_filter_edit.htm | 45
interface/web/themes/default_no_navimg/templates/main.tpl.htm | 6
interface/web/admin/templates/system_config_domains_edit.htm | 33
interface/web/sites/templates/database_user_list.htm | 55
interface/web/sites/templates/cron_list.htm | 103
interface/web/sites/templates/ftp_user_edit.htm | 61
interface/web/admin/templates/server_config_mail_edit.htm | 199
interface/web/client/templates/client_template_list.htm | 67
interface/web/admin/templates/language_complete.htm | 24
interface/web/admin/templates/language_import.htm | 48
interface/web/client/templates/reseller_edit_address.htm | 289
interface/web/sites/templates/web_vhost_domain_ssl.htm | 99
interface/web/help/templates/support_message_list.htm | 67
interface/web/mail/templates/mail_relay_recipient_edit.htm | 43
interface/web/admin/templates/server_edit_config.htm | 27
interface/web/vm/templates/openvz_vm_advanced_edit.htm | 107
interface/web/vm/templates/openvz_ostemplate_list.htm | 79
interface/web/mail/templates/mail_user_list.htm | 101
interface/web/themes/default/templates/module_tree.tpl.htm | 2
interface/web/tools/templates/import_vpopmail.htm | 66
interface/web/admin/templates/server_config_server_edit.htm | 179
interface/web/sites/templates/web_directive_snippets.htm | 8
interface/web/sites/templates/web_vhost_domain_admin_list.htm | 85
interface/web/mail/templates/spamfilter_policy_edit.htm | 85
interface/web/mail/templates/mail_user_custom_rules_edit.htm | 25
interface/web/dns/templates/dns_slave_list.htm | 71
interface/web/mail/templates/mail_forward_edit.htm | 43
interface/web/sites/templates/database_list.htm | 93
interface/web/dns/templates/dns_soa_admin_list.htm | 89
interface/web/admin/templates/tpl_default_basic.htm | 29
interface/web/sites/templates/aps_packagedetails_show.htm | 42
interface/web/sites/templates/shell_user_advanced.htm | 53
interface/web/themes/default_combobox/templates/main.tpl.htm | 10
interface/web/help/templates/help_faq_list.htm | 4
interface/web/monitor/templates/show_munin.htm | 4
interface/web/sites/templates/web_childdomain_advanced.htm | 25
interface/web/tools/templates/dns_import_tupa.htm | 59
interface/web/vm/templates/openvz_ostemplate_edit.htm | 61
interface/web/dashboard/dashlets/templates/limits.htm | 4
interface/web/dns/templates/dns_records_edit.htm | 4
interface/web/mail/templates/spamfilter_config_server_edit.htm | 43
interface/web/monitor/templates/show_data.htm | 8
interface/web/vm/templates/openvz_template_list.htm | 61
interface/web/monitor/templates/datalog_list.htm | 60
interface/web/mail/templates/spamfilter_other_edit.htm | 133
interface/web/admin/templates/software_repo_edit.htm | 57
interface/web/dns/templates/dns_hinfo_edit.htm | 51
interface/web/mail/templates/spamfilter_whitelist_list.htm | 79
interface/web/sites/templates/cron_edit.htm | 95
interface/web/login/templates/password_reset.htm | 32
interface/web/sites/templates/web_folder_user_edit.htm | 55
interface/web/sites/templates/web_folder_edit.htm | 43
interface/web/mail/templates/mail_content_filter_edit.htm | 67
interface/web/sites/templates/user_quota_stats_list.htm | 70
interface/web/sites/templates/ftp_user_advanced.htm | 79
interface/web/dns/templates/dns_a_edit.htm | 51
interface/web/mail/templates/mail_content_filter_list.htm | 73
interface/web/mail/templates/mail_user_backup_list.htm | 38
interface/web/sites/templates/web_vhost_domain_list.htm | 79
interface/web/mailuser/templates/mail_user_password_edit.htm | 37
interface/web/tools/templates/interface_settings.htm | 37
interface/web/mail/templates/mail_relay_recipient_list.htm | 67
interface/web/admin/templates/server_config_rescue_edit.htm | 31
interface/web/tools/templates/user_settings.htm | 41
interface/web/admin/templates/server_edit_services.htm | 83
interface/web/login/templates/index.htm | 38
interface/web/mail/templates/mail_whitelist_edit.htm | 51
interface/web/dns/templates/dns_ptr_edit.htm | 51
interface/web/admin/templates/software_repo_list.htm | 67
interface/web/admin/templates/directive_snippets_edit.htm | 55
interface/web/mail/templates/mail_user_backup.htm | 37
interface/web/mailuser/templates/mail_user_filter_list.htm | 57
interface/web/admin/templates/groups_list.htm | 61
interface/web/help/templates/faq_sections_edit.htm | 25
interface/web/mail/templates/mail_domain_catchall_edit.htm | 45
interface/web/help/templates/faq_edit.htm | 37
interface/web/sites/templates/database_user_admin_list.htm | 55
interface/web/admin/templates/server_php_name_edit.htm | 45
interface/web/dns/templates/dns_srv_edit.htm | 75
interface/web/dns/templates/dns_mx_edit.htm | 59
interface/web/admin/templates/iptables_list.htm | 96
interface/web/mail/templates/spamfilter_blacklist_list.htm | 79
interface/web/mailuser/templates/mail_user_autoresponder_edit.htm | 51
interface/web/client/templates/reseller_edit_limits.htm | 452
interface/web/dns/templates/dns_template_list.htm | 61
interface/web/mail/templates/mail_get_list.htm | 79
interface/web/admin/templates/language_list.htm | 52
interface/web/dns/templates/dns_txt_edit.htm | 51
interface/web/mail/templates/spamfilter_taglevel_edit.htm | 85
interface/web/themes/default/templates/main.tpl.htm | 14
interface/web/admin/templates/server_config_cron_edit.htm | 47
interface/web/client/templates/clients_list.htm | 95
interface/web/help/templates/support_message_edit.htm | 41
interface/web/mail/templates/mail_domain_edit.htm | 114
interface/web/admin/templates/remote_user_list.htm | 63
interface/web/monitor/templates/show_sys_state.htm | 28
interface/web/sites/templates/web_childdomain_edit.htm | 113
interface/web/mail/templates/mail_mailinglist_edit.htm | 97
interface/web/client/templates/message_template_list.htm | 53
interface/web/vm/templates/openvz_template_advanced_edit.htm | 205
interface/web/client/templates/client_message.htm | 51
interface/web/sites/templates/webdav_user_edit.htm | 65
interface/web/sites/templates/shell_user_list.htm | 73
interface/web/admin/templates/software_update_list.htm | 52
interface/web/admin/templates/server_ip_list.htm | 85
interface/web/admin/templates/language_export.htm | 32
interface/web/client/templates/domain_list.htm | 55
interface/web/admin/templates/firewall_list.htm | 73
interface/web/client/templates/client_circle_edit.htm | 45
interface/web/sites/templates/aps_packages_list.htm | 54
interface/web/admin/templates/firewall_edit.htm | 53
interface/web/dns/templates/dns_slave_admin_list.htm | 77
interface/web/admin/templates/server_config_dns_edit.htm | 63
interface/web/dns/templates/dns_wizard.htm | 115
interface/web/admin/templates/server_ip_edit.htm | 67
interface/web/dns/templates/dns_aaaa_edit.htm | 51
interface/web/client/templates/client_del.htm | 19
interface/web/dns/templates/dns_alias_edit.htm | 51
interface/web/sites/templates/shell_user_edit.htm | 79
interface/web/mail/templates/spamfilter_config_mail_edit.htm | 83
interface/web/mail/templates/mail_alias_list.htm | 67
interface/web/vm/templates/openvz_ip_list.htm | 73
interface/web/client/templates/domain_edit.htm | 37
interface/web/mail/templates/spamfilter_quarantine_edit.htm | 69
interface/web/tools/templates/resync.htm | 201
interface/web/sites/templates/web_childdomain_list.htm | 73
interface/web/sites/templates/database_admin_list.htm | 101
interface/web/admin/templates/software_package_edit.htm | 34
interface/web/vm/templates/openvz_vm_edit.htm | 123
interface/web/admin/templates/remote_action_osupdate.htm | 29
interface/web/tools/templates/import_ispconfig.htm | 134
interface/web/vm/templates/openvz_action.htm | 65
interface/web/admin/templates/server_config_getmail_edit.htm | 31
interface/web/sites/templates/aps_update_packagelist.htm | 26
interface/web/mail/templates/mail_user_autoresponder_edit.htm | 56
interface/web/sites/templates/aps_install_package.htm | 45
interface/web/sites/templates/ftp_user_advanced_client.htm | 33
interface/web/mailuser/templates/mail_user_spamfilter_edit.htm | 33
interface/web/sites/templates/web_vhost_domain_edit.htm | 249
interface/web/mail/templates/mail_domain_list.htm | 67
interface/web/admin/templates/remote_user_edit.htm | 47
interface/web/sites/templates/web_vhost_domain_backup.htm | 45
interface/web/mail/templates/mail_blacklist_list.htm | 73
interface/web/client/templates/client_template_edit_limits.htm | 413
interface/web/sites/templates/web_backup_list.htm | 42
interface/web/dns/templates/dns_import.htm | 61
interface/web/client/templates/client_edit_limits.htm | 436
interface/web/monitor/templates/show_monit.htm | 4
interface/web/sites/templates/web_vhost_domain_redirect.htm | 49
interface/web/mail/templates/mail_user_mailfilter_edit.htm | 27
interface/web/admin/templates/software_package_list.htm | 61
interface/web/admin/templates/server_config_vlogger_edit.htm | 31
interface/web/themes/default/templates/module.tpl.htm | 2
interface/web/vm/templates/openvz_ip_edit.htm | 51
interface/web/dns/templates/dns_template_edit.htm | 45
interface/web/mailuser/templates/mail_user_filter_edit.htm | 49
interface/web/admin/templates/software_package_install.htm | 24
interface/web/sites/templates/web_folder_user_list.htm | 67
interface/web/admin/templates/users_list.htm | 75
interface/web/admin/templates/server_php_fpm_edit.htm | 45
interface/web/mail/templates/mail_user_stats_list.htm | 62
interface/web/mailuser/templates/index.htm | 32
interface/web/mail/templates/mail_blacklist_edit.htm | 51
interface/web/sites/templates/web_sites_stats_list.htm | 74
interface/web/admin/templates/server_php_fastcgi_edit.htm | 37
interface/web/dns/templates/dns_slave_edit.htm | 85
interface/web/mail/templates/mail_forward_list.htm | 67
interface/web/monitor/templates/syslog_list.htm | 62
interface/web/tools/templates/index.htm | 12
interface/web/client/templates/message_template.htm | 44
interface/web/admin/templates/language_edit.htm | 19
interface/web/dns/templates/dns_a_list.htm | 91
interface/web/dns/templates/dns_ns_edit.htm | 51
interface/web/vm/templates/openvz_template_edit.htm | 117
interface/web/admin/templates/iptables_edit.htm | 102
interface/web/dashboard/dashlets/templates/mailquota.htm | 6
interface/web/admin/templates/users_user_edit.htm | 89
interface/web/mailuser/templates/mail_user_cc_edit.htm | 33
interface/web/sites/templates/webdav_user_list.htm | 73
interface/web/admin/templates/server_config_fastcgi_edit.htm | 87
interface/web/themes/default_64_navimg/templates/main.tpl.htm | 6
interface/web/mail/templates/mail_mailinglist_list.htm | 63
interface/web/dns/templates/dns_cname_edit.htm | 51
interface/web/admin/templates/system_config_misc_edit.htm | 187
interface/web/sites/templates/database_user_edit.htm | 57
interface/web/admin/templates/remote_action_ispcupdate.htm | 26
interface/web/mail/templates/spamfilter_whitelist_edit.htm | 59
interface/web/help/templates/support_message_view.htm | 31
interface/web/dns/templates/dns_dkim_edit.htm | 48
interface/web/sites/templates/web_vhost_domain_stats.htm | 45
interface/web/mail/templates/mail_get_edit.htm | 75
interface/web/client/templates/client_template_edit_template.htm | 37
interface/web/admin/templates/directive_snippets_list.htm | 67
interface/web/tools/templates/tpl_default.htm | 23
interface/web/dashboard/dashlets/templates/quota.htm | 6
interface/web/admin/templates/system_config_sites_edit.htm | 123
interface/web/sites/templates/aps_instances_list.htm | 66
interface/web/admin/templates/server_config_jailkit_edit.htm | 55
interface/web/client/templates/client_circle_list.htm | 73
interface/web/mail/templates/spamfilter_blacklist_edit.htm | 59
interface/web/sites/templates/database_quota_stats_list.htm | 62
interface/web/mail/templates/mail_aliasdomain_edit.htm | 43
interface/web/sites/templates/web_folder_list.htm | 73
interface/web/admin/templates/language_add.htm | 37
interface/web/mail/templates/mail_domain_catchall_list.htm | 67
interface/web/themes/blue/templates/main.tpl.htm | 10
interface/web/dns/templates/dns_rp_edit.htm | 51
interface/web/tools/templates/import_plesk.htm | 99
interface/web/mail/templates/spamfilter_users_edit.htm | 69
interface/web/vm/templates/openvz_vm_list.htm | 93
interface/web/mail/templates/mail_whitelist_list.htm | 73
interface/web/mail/templates/mail_alias_edit.htm | 47
interface/web/admin/templates/groups_edit.htm | 35
interface/web/admin/templates/users_groups_edit.htm | 37
interface/web/mail/templates/mail_user_mailbox_edit.htm | 113
interface/web/client/templates/client_message_template_list.htm | 53
interface/web/mail/templates/mail_transport_list.htm | 79
242 files changed, 8,238 insertions(+), 8,688 deletions(-)
diff --git a/interface/web/admin/templates/directive_snippets_edit.htm b/interface/web/admin/templates/directive_snippets_edit.htm
index ca5cb96..cc45309 100644
--- a/interface/web/admin/templates/directive_snippets_edit.htm
+++ b/interface/web/admin/templates/directive_snippets_edit.htm
@@ -1,47 +1,44 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_directive_snippets">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="name">{tmpl_var name='name_txt'}</label>
- <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="type">{tmpl_var name='type_txt'}</label>
- <select name="type" id="type" class="selectInput">
+
+
+ <div class="form-group">
+ <label for="name" class="col-sm-3 control-label">{tmpl_var name='name_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="name" id="name" value="{tmpl_var name='name'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="type" class="col-sm-3 control-label">{tmpl_var name='type_txt'}</label>
+ <div class="col-sm-9"><select name="type" id="type" class="form-control">
{tmpl_var name='type'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="snippet">{tmpl_var name='snippet_txt'}</label>
+ </div></div>
+ <div class="form-group">
+ <label for="snippet" class="col-sm-3 control-label">{tmpl_var name='snippet_txt'}</label>
<textarea name="snippet" id="snippet" rows='10' cols='50' style="width:400px;">{tmpl_var name='snippet'}</textarea><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="ctrlHolder">
- <p class="label">{tmpl_var name='customer_viewable_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='customer_viewable_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='customer_viewable'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/directive_snippets_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/directive_snippets_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/directive_snippets_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/directive_snippets_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
<script language="JavaScript" type="text/javascript">
if(jQuery('#type').val() == 'nginx'){
diff --git a/interface/web/admin/templates/directive_snippets_list.htm b/interface/web/admin/templates/directive_snippets_list.htm
index 32a10dd..2ce79f8 100644
--- a/interface/web/admin/templates/directive_snippets_list.htm
+++ b/interface/web/admin/templates/directive_snippets_list.htm
@@ -1,45 +1,45 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_directive_snippets">
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('admin/directive_snippets_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="admin/directive_snippets_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
- <th class="tbl_col_type" scope="col"><tmpl_var name="type_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="active_txt"></th>
+ <th><tmpl_var name="name_txt"></th>
+ <th><tmpl_var name="type_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
- <td class="tbl_col_type"><select name="search_type">{tmpl_var name='search_type'}</select></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/directive_snippets_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><select name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><div class="col-sm-9"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></div></td>
+ <td><select name="search_type">{tmpl_var name='search_type'}</select></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/directive_snippets_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('admin/directive_snippets_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_name"><a href="#" onclick="loadContent('admin/directive_snippets_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
- <td class="tbl_col_type"><a href="#" onclick="loadContent('admin/directive_snippets_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="type"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" href="javascript: del_record('admin/directive_snippets_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="admin/directive_snippets_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -52,11 +52,10 @@
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+ <td colspan="4"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/admin/templates/firewall_edit.htm b/interface/web/admin/templates/firewall_edit.htm
index b297f0a..48cd535 100644
--- a/interface/web/admin/templates/firewall_edit.htm
+++ b/interface/web/admin/templates/firewall_edit.htm
@@ -1,38 +1,35 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_firewall">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="server_id">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id" id="server_id" class="selectInput">
+
+
+ <div class="form-group">
+ <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
{tmpl_var name='server_id'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="tcp_port">{tmpl_var name='tcp_port_txt'}</label>
- <input name="tcp_port" id="tcp_port" value="{tmpl_var name='tcp_port'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="udp_port">{tmpl_var name='udp_port_txt'}</label>
- <input name="udp_port" id="udp_port" value="{tmpl_var name='udp_port'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ </div></div>
+ <div class="form-group">
+ <label for="tcp_port" class="col-sm-3 control-label">{tmpl_var name='tcp_port_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="tcp_port" id="tcp_port" value="{tmpl_var name='tcp_port'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="udp_port" class="col-sm-3 control-label">{tmpl_var name='udp_port_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="udp_port" id="udp_port" value="{tmpl_var name='udp_port'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/firewall_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/firewall_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/firewall_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/firewall_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/admin/templates/firewall_list.htm b/interface/web/admin/templates/firewall_list.htm
index 44c7f34..108613f 100644
--- a/interface/web/admin/templates/firewall_list.htm
+++ b/interface/web/admin/templates/firewall_list.htm
@@ -1,48 +1,48 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_firewall">
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('admin/firewall_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="admin/firewall_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_tcp_port" scope="col"><tmpl_var name="tcp_port_txt"></th>
- <th class="tbl_col_udp_port" scope="col"><tmpl_var name="udp_port_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="active_txt"></th>
+ <th><tmpl_var name="server_id_txt"></th>
+ <th><tmpl_var name="tcp_port_txt"></th>
+ <th><tmpl_var name="udp_port_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_tcp_port"><input type="text" name="search_tcp_port" value="{tmpl_var name='search_tcp_port'}" /></td>
- <td class="tbl_col_udp_port"><input type="text" name="search_udp_port" value="{tmpl_var name='search_udp_port'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/firewall_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><select name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><div class="col-sm-9"><input type="text" name="search_tcp_port" value="{tmpl_var name='search_tcp_port'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_udp_port" value="{tmpl_var name='search_udp_port'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/firewall_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_tcp_port"><a href="#" onclick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="tcp_port"}</a></td>
- <td class="tbl_col_udp_port"><a href="#" onclick="loadContent('admin/firewall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="udp_port"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" href="javascript: del_record('admin/firewall_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="admin/firewall_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
+ <td><a href="#" data-load-content="admin/firewall_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -55,11 +55,10 @@
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+ <td colspan="5"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/admin/templates/groups_edit.htm b/interface/web/admin/templates/groups_edit.htm
index c383172..a833ce9 100644
--- a/interface/web/admin/templates/groups_edit.htm
+++ b/interface/web/admin/templates/groups_edit.htm
@@ -1,26 +1,23 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_groups">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="name">{tmpl_var name='name_txt'}</label>
- <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
- </div>
- <div class="ctrlHolder">
- <label for="description">{tmpl_var name='description_txt'}</label>
+
+
+ <div class="form-group">
+ <label for="name" class="col-sm-3 control-label">{tmpl_var name='name_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="name" id="name" value="{tmpl_var name='name'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="description" class="col-sm-3 control-label">{tmpl_var name='description_txt'}</label>
<textarea name="description" id="description" rows='5' cols='30'>{tmpl_var name='description'}</textarea>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/groups_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/groups_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/groups_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/groups_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/admin/templates/groups_list.htm b/interface/web/admin/templates/groups_list.htm
index dc68562..cbb8d19 100644
--- a/interface/web/admin/templates/groups_list.htm
+++ b/interface/web/admin/templates/groups_list.htm
@@ -1,43 +1,43 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_groups">
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('admin/groups_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="admin/groups_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
<p><tmpl_var name="warning_txt"></p>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
- <th class="tbl_col_description" scope="col"><tmpl_var name="description_txt"></th>
- <th class="tbl_col_buttons" scope="col"> </th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="name_txt"></th>
+ <th><tmpl_var name="description_txt"></th>
+ <th> </th>
</tr>
- <tr class="filter">
- <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
- <td class="tbl_col_description"><input type="text" name="search_description" value="{tmpl_var name='search_description'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/groups_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><div class="col-sm-9"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_description" value="{tmpl_var name='search_description'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/groups_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_name"><a href="#" onclick="loadContent('admin/groups_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
- <td class="tbl_col_description"><a href="#" onclick="loadContent('admin/groups_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="description"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" href="javascript: del_record('admin/groups_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+ <td><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>
</td>
</tr>
</tmpl_loop>
@@ -49,11 +49,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+ <td colspan="3"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/admin/templates/iptables_edit.htm b/interface/web/admin/templates/iptables_edit.htm
index 23228d4..d5ba0ef 100644
--- a/interface/web/admin/templates/iptables_edit.htm
+++ b/interface/web/admin/templates/iptables_edit.htm
@@ -1,67 +1,63 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_iptables">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="server_id">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id" id="server_id" class="selectInput">
+
+
+ <div class="form-group">
+ <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
{tmpl_var name='server_id'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="table">{tmpl_var name='table_txt'}</label>
- <select name="table" id="table" class="selectInput formLengthLimit">
+ </div></div>
+ <div class="form-group">
+ <label for="table" class="col-sm-3 control-label">{tmpl_var name='table_txt'}</label>
+ <div class="col-sm-9"><select name="table" id="table" class="form-control">
{tmpl_var name='table'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="protocol">{tmpl_var name='protocol_txt'}</label>
- <select name="protocol" id="protocol" class="selectInput formLengthLimit">
+ </div></div>
+ <div class="form-group">
+ <label for="protocol" class="col-sm-3 control-label">{tmpl_var name='protocol_txt'}</label>
+ <div class="col-sm-9"><select name="protocol" id="protocol" class="form-control">
{tmpl_var name='protocol'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="singleport">{tmpl_var name='singleport_txt'}</label>
- <input name="singleport" id="singleport" value="{tmpl_var name='singleport'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="multiport">{tmpl_var name='multiport_txt'}</label>
- <input name="multiport" id="multiport" value="{tmpl_var name='multiport'}" size="20" maxlength="40" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="destination_ip">{tmpl_var name='destination_ip_txt'}</label>
- <input name="destination_ip" id="destination_ip" value="{tmpl_var name='destination_ip'}" size="16" maxlength="20" type="text" class="textInput formLengthIPv4" />
- </div>
- <div class="ctrlHolder">
- <label for="source_ip">{tmpl_var name='source_ip_txt'}</label>
- <input name="source_ip" id="source_ip" value="{tmpl_var name='source_ip'}" size="16" maxlength="20" type="text" class="textInput formLengthIPv4" />
- </div>
- <div class="ctrlHolder">
- <label for="state">{tmpl_var name='state_txt'}</label>
- <input name="state" id="state" value="{tmpl_var name='state'}" size="16" maxlength="20" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="target">{tmpl_var name='target_txt'}</label>
- <select name="target" id="target" class="selectInput formLengthLimit">
+ </div></div>
+ <div class="form-group">
+ <label for="singleport" class="col-sm-3 control-label">{tmpl_var name='singleport_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="singleport" id="singleport" value="{tmpl_var name='singleport'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="multiport" class="col-sm-3 control-label">{tmpl_var name='multiport_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="multiport" id="multiport" value="{tmpl_var name='multiport'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="destination_ip" class="col-sm-3 control-label">{tmpl_var name='destination_ip_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="destination_ip" id="destination_ip" value="{tmpl_var name='destination_ip'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="source_ip" class="col-sm-3 control-label">{tmpl_var name='source_ip_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="source_ip" id="source_ip" value="{tmpl_var name='source_ip'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="state" class="col-sm-3 control-label">{tmpl_var name='state_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="state" id="state" value="{tmpl_var name='state'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="target" class="col-sm-3 control-label">{tmpl_var name='target_txt'}</label>
+ <div class="col-sm-9"><select name="target" id="target" class="form-control">
{tmpl_var name='target'}
</select>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/iptables_edit.php');">
- <span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/iptables_list.php');">
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/iptables_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/iptables_list.php">
<span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/admin/templates/iptables_list.htm b/interface/web/admin/templates/iptables_list.htm
index 523ec67..da46eee 100644
--- a/interface/web/admin/templates/iptables_list.htm
+++ b/interface/web/admin/templates/iptables_list.htm
@@ -1,59 +1,59 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
-<div class="panel panel_list_iptables">
- <div class="pnl_toolsarea">
- <fieldset><legend>Tools</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('admin/iptables_edit.php');">
+ <p>Tools</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="admin/iptables_edit.php">
<span>{tmpl_var name="add_new_rule_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_table" scope="col"><tmpl_var name="table_txt"></th>
- <th class="tbl_col_protocol" scope="col"><tmpl_var name="protocol_txt"></th>
- <th class="tbl_col_port" scope="col"><tmpl_var name="singleport_txt"></th>
- <th class="tbl_col_port" scope="col"><tmpl_var name="multiport_txt"></th>
- <th class="tbl_col_state" scope="col"><tmpl_var name="state_txt"></th>
- <th class="tbl_col_target" scope="col"><tmpl_var name="target_txt"></th>
- <th class="tbl_col_buttons" scope="col"> </th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="active_txt"></th>
+ <th><tmpl_var name="server_id_txt"></th>
+ <th><tmpl_var name="table_txt"></th>
+ <th><tmpl_var name="protocol_txt"></th>
+ <th><tmpl_var name="singleport_txt"></th>
+ <th><tmpl_var name="multiport_txt"></th>
+ <th><tmpl_var name="state_txt"></th>
+ <th><tmpl_var name="target_txt"></th>
+ <th> </th>
</tr>
- <tr class="filter">
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_table"></td>
- <td class="tbl_col_protocol"><select name="search_protocol">{tmpl_var name='search_protocol'}</select></td>
- <td class="tbl_col_singleport"></td>
- <td class="tbl_col_multiport"></td>
- <td class="tbl_col_state"></td>
- <td class="tbl_col_target"><select name="search_target">{tmpl_var name='search_target'}</select></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/iptables_list.php');"><span>{tmpl_var name="filter_txt"}filter_txt</span></button>
+ <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></td>
+ <td><select 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>
+ <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>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_table"><a href="#" onclick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="table"}</a></td>
- <td class="tbl_col_protocol"><a href="#" onclick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="protocol"}</a></td>
- <td class="tbl_col_singleport"><a href="#" onclick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="singleport"}</a></td>
- <td class="tbl_col_multiport"><a href="#" onclick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="multiport"}</a></td>
- <td class="tbl_col_state"><a href="#" onclick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="state"}</a></td>
- <td class="tbl_col_target"><a href="#" onclick="loadContent('admin/iptables_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="target"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" href="javascript: del_record('admin/iptables_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="admin/iptables_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
+ <td><a href="#" data-load-content="admin/iptables_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
+ <td><a href="#" data-load-content="admin/iptables_edit.php?id={tmpl_var name='id'}">{tmpl_var name="table"}</a></td>
+ <td><a href="#" data-load-content="admin/iptables_edit.php?id={tmpl_var name='id'}">{tmpl_var name="protocol"}</a></td>
+ <td><a href="#" data-load-content="admin/iptables_edit.php?id={tmpl_var name='id'}">{tmpl_var name="singleport"}</a></td>
+ <td><a href="#" data-load-content="admin/iptables_edit.php?id={tmpl_var name='id'}">{tmpl_var name="multiport"}</a></td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -65,10 +65,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="9"><tmpl_var name="paging"></td>
+ <td colspan="9"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/admin/templates/language_add.htm b/interface/web/admin/templates/language_add.htm
index 0cab8ab..b0f0938 100644
--- a/interface/web/admin/templates/language_add.htm
+++ b/interface/web/admin/templates/language_add.htm
@@ -1,29 +1,26 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_language_add">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>Language Add</legend>
- <div class="ctrlHolder">
- <label for="lng_select">{tmpl_var name='language_select_txt'}</label>
- <select name="lng_select" id="language" class="selectInput flags">
+ <legend>Language Add</legend>
+ <div class="form-group">
+ <label for="lng_select" class="col-sm-3 control-label">{tmpl_var name='language_select_txt'}</label>
+ <div class="col-sm-9"><select name="lng_select" id="language" class="form-control">
{tmpl_var name='language_option'}
</select>
+ </div></div>
+ <div class="form-group">
+ <label for="lng_new" class="col-sm-3 control-label">{tmpl_var name='language_new_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="lng_new" id="lng_new" value="" class="form-control" />
+ </div><p class="formHint">{tmpl_var name='language_new_hint_txt'}</p>
</div>
- <div class="ctrlHolder">
- <label for="lng_new">{tmpl_var name='language_new_txt'}</label>
- <input name="lng_new" id="lng_new" value="" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
- <p class="formHint">{tmpl_var name='language_new_hint_txt'}</p>
- </div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/language_add.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/language_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/language_add.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/language_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/admin/templates/language_complete.htm b/interface/web/admin/templates/language_complete.htm
index 4f1fd64..7d5dc1c 100644
--- a/interface/web/admin/templates/language_complete.htm
+++ b/interface/web/admin/templates/language_complete.htm
@@ -1,4 +1,6 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
<div class="panel panel_language_complete">
@@ -11,18 +13,18 @@
</tmpl_if>
<div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>Language Complete</legend>
- <div class="ctrlHolder">
- <label for="lng_select">{tmpl_var name='language_select_txt'}</label>
- <select name="lng_select" id="language" class="selectInput flags">
+ <legend>Language Complete</legend>
+ <div class="form-group">
+ <label for="lng_select" class="col-sm-3 control-label">{tmpl_var name='language_select_txt'}</label>
+ <div class="col-sm-9"><select name="lng_select" id="language" class="form-control">
{tmpl_var name='language_option'}
</select>
- </div>
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/language_complete.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/language_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </fieldset>
+ </div></div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/language_complete.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/language_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
+
</div>
diff --git a/interface/web/admin/templates/language_edit.htm b/interface/web/admin/templates/language_edit.htm
index 30bd927..803ab80 100644
--- a/interface/web/admin/templates/language_edit.htm
+++ b/interface/web/admin/templates/language_edit.htm
@@ -1,16 +1,16 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_language_edit">
- <div class="pnl_formsarea">
<fieldset id="wf_area_language_edit"><legend>Language File Edit: {tmpl_var name="file_path"}</legend>
<span class="wf_oneField">
<tmpl_loop name="records">
<span class="wf_oneField">
<label for="records[{tmpl_var name="key"}]" class="wf_preField">{tmpl_var name="key"}</label>
- <input type="text" id="records[{tmpl_var name="key"}]" name="records[{tmpl_var name="key"}]" value="{tmpl_var name='val'}" size="50" >
- </span>
+ <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></span>
</tmpl_loop>
</span>
</fieldset>
@@ -21,9 +21,6 @@
<input type="hidden" name="module" value="{tmpl_var name='module'}">
<div class="wf_actions buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/language_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/language_list.php?lng_select={tmpl_var name='lang'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/language_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/language_list.php?lng_select={tmpl_var name='lang'}"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div>
\ No newline at end of file
diff --git a/interface/web/admin/templates/language_export.htm b/interface/web/admin/templates/language_export.htm
index 98be4b5..a2dd0c8 100644
--- a/interface/web/admin/templates/language_export.htm
+++ b/interface/web/admin/templates/language_export.htm
@@ -1,16 +1,16 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_language_export">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>Language Export</legend>
- <div class="ctrlHolder">
- <label for="lng_select">{tmpl_var name='language_select_txt'}</label>
- <select name="lng_select" id="lng_select" class="selectInput flags">
+
+ <legend>Language Export</legend>
+ <div class="form-group">
+ <label for="lng_select" class="col-sm-3 control-label">{tmpl_var name='language_select_txt'}</label>
+ <div class="col-sm-9"><select name="lng_select" id="lng_select" class="form-control">
{tmpl_var name='language_option'}
</select>
- </div>
+ </div></div>
<tmpl_if name="msg">
@@ -19,13 +19,7 @@
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/language_export.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/language_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
-
- </fieldset>
-
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/language_export.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/language_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
diff --git a/interface/web/admin/templates/language_import.htm b/interface/web/admin/templates/language_import.htm
index d674b20..dcd8ecb 100644
--- a/interface/web/admin/templates/language_import.htm
+++ b/interface/web/admin/templates/language_import.htm
@@ -1,25 +1,25 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_language_import">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>Language Import</legend>
- <div class="ctrlHolder">
- <label for="lng_select">{tmpl_var name='language_import_txt'}</label>
+
+ <legend>Language Import</legend>
+ <div class="form-group">
+ <label for="lng_select" class="col-sm-3 control-label">{tmpl_var name='language_import_txt'}</label>
<input name="file" id="file" size="30" type="file" class="fileUpload" />
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='language_overwrite_txt'}</p>
- <div class="multiField">
- <input id="overwrite" type="checkbox" value="1" name="overwrite"/>
- </div>
+ <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></div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='ignore_version_txt'}</p>
- <div class="multiField">
- <input id="ignore_version" type="checkbox" value="1" name="ignore_version"/>
- </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></div>
</div>
@@ -32,13 +32,7 @@
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitUploadForm('pageForm','admin/language_import.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/language_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
-
- </fieldset>
-
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitUploadForm('pageForm','admin/language_import.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/language_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/admin/templates/language_list.htm b/interface/web/admin/templates/language_list.htm
index ce1bf64..1b02fde 100644
--- a/interface/web/admin/templates/language_list.htm
+++ b/interface/web/admin/templates/language_list.htm
@@ -1,47 +1,47 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_language_groups">
- <div class="pnl_toolsarea">
- <fieldset class="inlineLabels"><legend>Tools</legend>
- <div class="buttons">
- <div class="ctrlHolder">
- <label for="lng_select">{tmpl_var name='language_select_txt'}</label>
- <select name="lng_select" id="language" class="selectInput flags" onChange="submitForm('pageForm','admin/language_list.php');">
+ <legend>Tools</legend>
+
+ <div class="form-group">
+ <label for="lng_select" class="col-sm-3 control-label">{tmpl_var name='language_select_txt'}</label>
+ <div class="col-sm-9"><select name="lng_select" id="language" class="form-control" onChange="submitForm('pageForm','admin/language_list.php');">
{tmpl_var name='language_option'}
</select>
- </div>
+
</div>
- </fieldset>
+
</div>
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_module" scope="col"><tmpl_var name="module_txt"></th>
- <th class="tbl_col_lang_file" scope="col"><tmpl_var name="lang_file_txt"></th>
- <th class="tbl_col_limit" scope="col"><tmpl_var name="lang_file_date_txt"></th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="module_txt"></th>
+ <th><tmpl_var name="lang_file_txt"></th>
+ <th><tmpl_var name="lang_file_date_txt"></th>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_module"><a href="#" onclick="loadContent('admin/language_edit.php?lang_file={tmpl_var name="lang_file"}&module={tmpl_var name="module"}&lang={tmpl_var name="lang"}');">{tmpl_var name="module"}</a></td>
- <td class="tbl_col_lang_file"><a href="#" onclick="loadContent('admin/language_edit.php?lang_file={tmpl_var name="lang_file"}&module={tmpl_var name="module"}&lang={tmpl_var name="lang"}');">{tmpl_var name="lang_file"}</a></td>
- <td><a href="#" onclick="loadContent('admin/language_edit.php?lang_file={tmpl_var name="lang_file"}&module={tmpl_var name="module"}&lang={tmpl_var name="lang"}');">{tmpl_var name="lang_file_date"}</a></td>
+ <td><a href="#" data-load-content="admin/language_edit.php?lang_file={tmpl_var name="lang_file"}&module={tmpl_var name="module"}&lang={tmpl_var name="lang"}">{tmpl_var name="module"}</a></td>
+ <td><a href="#" data-load-content="admin/language_edit.php?lang_file={tmpl_var name="lang_file"}&module={tmpl_var name="module"}&lang={tmpl_var name="lang"}">{tmpl_var name="lang_file"}</a></td>
+ <td><a href="#" data-load-content="admin/language_edit.php?lang_file={tmpl_var name="lang_file"}&module={tmpl_var name="module"}&lang={tmpl_var name="lang"}">{tmpl_var name="lang_file_date"}</a></td>
</tr>
</tmpl_loop>
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+ <td colspan="3"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/admin/templates/remote_action_ispcupdate.htm b/interface/web/admin/templates/remote_action_ispcupdate.htm
index 219c6fd..39549e1 100644
--- a/interface/web/admin/templates/remote_action_ispcupdate.htm
+++ b/interface/web/admin/templates/remote_action_ispcupdate.htm
@@ -1,32 +1,36 @@
<!--
-<h2><tmpl_var name="do_ispcupdate_caption"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="do_ispcupdate_caption"></h1>
+</div>
<p><tmpl_var name="do_ispcupdate_desc"></p>
-->
-<h2><tmpl_var name="ispconfig_update_title"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="ispconfig_update_title"></h1>
+</div>
<p style="margin-top:50px; font-size:14px;"><tmpl_var name="ispconfig_update_text"></p>
<div class="panel panel_language_add">
<div class="pnl_formsarea">
<!--
- <fieldset class="inlineLabels"><legend>{tmpl_var name='do_ispcupdate_caption'}</legend>
- <div class="ctrlHolder">
- <label for="server_select">{tmpl_var name='select_server_txt'}</label>
- <select name="server_select" id="server" class="selectInput" onchange="document.getElementById('OKMsg').style.visibility = 'hidden'; ">
+ <legend>{tmpl_var name='do_ispcupdate_caption'}</legend>
+ <div class="form-group">
+ <label for="server_select" class="col-sm-3 control-label">{tmpl_var name='select_server_txt'}</label>
+ <div class="col-sm-9"><select name="server_select" id="server" class="form-control" onchange="document.getElementById('OKMsg').style.visibility = 'hidden'; ">
{tmpl_var name='server_option'}
</select>
- </div>
- </fieldset>
+ </div></div>
+
<tmpl_if name="msg">
<div id="OKMsg"><p><tmpl_var name="msg"></p></div>
</tmpl_if>
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_do_txt'}" onclick="submitForm('pageForm','admin/remote_action_ispcupdate.php');"><span>{tmpl_var name='btn_do_txt'}</span></button>
- </div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_do_txt'}" onclick="submitForm('pageForm','admin/remote_action_ispcupdate.php');">{tmpl_var name='btn_do_txt'}</button>
+ </div></div>
-->
</div>
diff --git a/interface/web/admin/templates/remote_action_osupdate.htm b/interface/web/admin/templates/remote_action_osupdate.htm
index b941b83..bbed294 100644
--- a/interface/web/admin/templates/remote_action_osupdate.htm
+++ b/interface/web/admin/templates/remote_action_osupdate.htm
@@ -1,25 +1,22 @@
-<h2><tmpl_var name="do_osupdate_caption"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="do_osupdate_caption"></h1>
+</div>
<p><tmpl_var name="do_osupdate_desc"></p>
-<div class="panel panel_language_add">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>{tmpl_var name='do_osupdate_caption'}</legend>
- <div class="ctrlHolder">
- <label for="server_select">{tmpl_var name='select_server_txt'}</label>
- <select name="server_select" id="server" class="selectInput" onchange="$('#OKMsg').hide(); ">
+
+ <legend>{tmpl_var name='do_osupdate_caption'}</legend>
+ <div class="form-group">
+ <label for="server_select" class="col-sm-3 control-label">{tmpl_var name='select_server_txt'}</label>
+ <div class="col-sm-9"><select name="server_select" id="server" class="form-control" onchange="$('#OKMsg').hide(); ">
{tmpl_var name='server_option'}
</select>
- </div>
- </fieldset>
+ </div></div>
+
<tmpl_if name="msg">
<div id="OKMsg"><p><tmpl_var name="msg"></p></div>
</tmpl_if>
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_do_txt'}" onclick="submitForm('pageForm','admin/remote_action_osupdate.php');"><span>{tmpl_var name='btn_do_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_do_txt'}" onclick="submitForm('pageForm','admin/remote_action_osupdate.php');">{tmpl_var name='btn_do_txt'}</button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/admin/templates/remote_user_edit.htm b/interface/web/admin/templates/remote_user_edit.htm
index 347835f..fc8f6af 100644
--- a/interface/web/admin/templates/remote_user_edit.htm
+++ b/interface/web/admin/templates/remote_user_edit.htm
@@ -1,47 +1,44 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_ftp_user">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="remote_username">{tmpl_var name='username_txt'}</label>
+
+ <div class="form-group">
+ <label for="remote_username" class="col-sm-3 control-label">{tmpl_var name='username_txt'}</label>
<p class="prefix">{tmpl_var name='username_prefix'}</p>
- <input name="remote_username" id="username" value="{tmpl_var name='remote_username'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
+ <div class="col-sm-9"><input type="text" name="remote_username" id="username" value="{tmpl_var name='remote_username'}" class="form-control" />
+ </div></div>
- <div class="ctrlHolder">
- <label for="remote_password">{tmpl_var name='password_txt'}</label>
+ <div class="form-group">
+ <label for="remote_password" class="col-sm-3 control-label">{tmpl_var name='password_txt'}</label>
<input name="remote_password" id="password" value="{tmpl_var name='remote_password'}" size="30" maxlength="255" type="password" class="textInput" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" /> <a href="javascript:void(0);" onclick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='password_strength_txt'}</p>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='password_strength_txt'}</label>
<div id="passBar"></div>
<p class="formHint"><span id="passText"> </span></p>
</div>
- <div class="ctrlHolder">
- <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+ <div class="form-group">
+ <label for="repeat_password" class="col-sm-3 control-label">{tmpl_var name='repeat_password_txt'}</label>
<input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;" autocomplete="off" onkeyup="checkPassMatch('password','repeat_password');" />
</div>
<div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
<div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='function_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='function_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='remote_functions'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="remote_userid" value="{tmpl_var name='id'}">
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/remote_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/remote_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/remote_user_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/remote_user_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/admin/templates/remote_user_list.htm b/interface/web/admin/templates/remote_user_list.htm
index 88ddf6a..8efe48d 100644
--- a/interface/web/admin/templates/remote_user_list.htm
+++ b/interface/web/admin/templates/remote_user_list.htm
@@ -1,41 +1,41 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_users">
-
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('admin/remote_user_edit.php');">
+
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="admin/remote_user_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_remote_userid" scope="col"><tmpl_var name="parent_remote_userid_txt"></th>
- <th class="tbl_col_remote_username" scope="col"><tmpl_var name="username_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="parent_remote_userid_txt"></th>
+ <th><tmpl_var name="username_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_remote_userid"> </td>
- <td class="tbl_col_remote_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/remote_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td> </td>
+ <td><div class="col-sm-9"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/remote_user_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_remote_userid"><a href="#" onclick="loadContent('admin/remote_user_edit.php?id={tmpl_var name='remote_userid'}');">{tmpl_var name="remote_userid"}</a></td>
- <td class="tbl_col_remote_username"><a href="#" onclick="loadContent('admin/remote_user_edit.php?id={tmpl_var name='remote_userid'}');">{tmpl_var name="remote_username"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -47,11 +47,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+ <td colspan="5"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/admin/templates/server_config_cron_edit.htm b/interface/web/admin/templates/server_config_cron_edit.htm
index 4f9d283..099513c 100644
--- a/interface/web/admin/templates/server_config_cron_edit.htm
+++ b/interface/web/admin/templates/server_config_cron_edit.htm
@@ -1,30 +1,27 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_server_config">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="init_script">{tmpl_var name='init_script_txt'}</label>
- <input name="init_script" id="init_script" value="{tmpl_var name='init_script'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="crontab_dir">{tmpl_var name='crontab_dir_txt'}</label>
- <input name="crontab_dir" id="crontab_dir" value="{tmpl_var name='crontab_dir'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="wget">{tmpl_var name='wget_txt'}</label>
- <input name="wget" id="wget" value="{tmpl_var name='wget'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- </fieldset>
+
+
+ <div class="form-group">
+ <label for="init_script" class="col-sm-3 control-label">{tmpl_var name='init_script_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="init_script" id="init_script" value="{tmpl_var name='init_script'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="crontab_dir" class="col-sm-3 control-label">{tmpl_var name='crontab_dir_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="crontab_dir" id="crontab_dir" value="{tmpl_var name='crontab_dir'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="wget" class="col-sm-3 control-label">{tmpl_var name='wget_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="wget" id="wget" value="{tmpl_var name='wget'}" class="form-control" />
+ </div></div>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_config_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_config_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/admin/templates/server_config_dns_edit.htm b/interface/web/admin/templates/server_config_dns_edit.htm
index 541c9d7..be4c975 100644
--- a/interface/web/admin/templates/server_config_dns_edit.htm
+++ b/interface/web/admin/templates/server_config_dns_edit.htm
@@ -1,38 +1,35 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_server_config">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="bind_user">{tmpl_var name='bind_user_txt'}</label>
- <input name="bind_user" id="bind_user" value="{tmpl_var name='bind_user'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="bind_group">{tmpl_var name='bind_group_txt'}</label>
- <input name="bind_group" id="bind_group" value="{tmpl_var name='bind_group'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="bind_zonefiles_dir">{tmpl_var name='bind_zonefiles_dir_txt'}</label>
- <input name="bind_zonefiles_dir" id="bind_zonefiles_dir" value="{tmpl_var name='bind_zonefiles_dir'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="named_conf_path">{tmpl_var name='named_conf_path_txt'}</label>
- <input name="named_conf_path" id="named_conf_path" value="{tmpl_var name='named_conf_path'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="named_conf_local_path">{tmpl_var name='named_conf_local_path_txt'}</label>
- <input name="named_conf_local_path" id="named_conf_local_path" value="{tmpl_var name='named_conf_local_path'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- </fieldset>
+
+
+ <div class="form-group">
+ <label for="bind_user" class="col-sm-3 control-label">{tmpl_var name='bind_user_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="bind_user" id="bind_user" value="{tmpl_var name='bind_user'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="bind_group" class="col-sm-3 control-label">{tmpl_var name='bind_group_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="bind_group" id="bind_group" value="{tmpl_var name='bind_group'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="bind_zonefiles_dir" class="col-sm-3 control-label">{tmpl_var name='bind_zonefiles_dir_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="bind_zonefiles_dir" id="bind_zonefiles_dir" value="{tmpl_var name='bind_zonefiles_dir'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="named_conf_path" class="col-sm-3 control-label">{tmpl_var name='named_conf_path_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="named_conf_path" id="named_conf_path" value="{tmpl_var name='named_conf_path'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="named_conf_local_path" class="col-sm-3 control-label">{tmpl_var name='named_conf_local_path_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="named_conf_local_path" id="named_conf_local_path" value="{tmpl_var name='named_conf_local_path'}" class="form-control" />
+ </div></div>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_config_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_config_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/admin/templates/server_config_fastcgi_edit.htm b/interface/web/admin/templates/server_config_fastcgi_edit.htm
index 88d06d7..7ba29ad 100644
--- a/interface/web/admin/templates/server_config_fastcgi_edit.htm
+++ b/interface/web/admin/templates/server_config_fastcgi_edit.htm
@@ -1,52 +1,49 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_server_config">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="fastcgi_starter_path">{tmpl_var name='fastcgi_starter_path_txt'}</label>
- <input name="fastcgi_starter_path" id="fastcgi_starter_path" value="{tmpl_var name='fastcgi_starter_path'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="fastcgi_starter_script">{tmpl_var name='fastcgi_starter_script_txt'}</label>
- <input name="fastcgi_starter_script" id="fastcgi_starter_script" value="{tmpl_var name='fastcgi_starter_script'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="fastcgi_alias">{tmpl_var name='fastcgi_alias_txt'}</label>
- <input name="fastcgi_alias" id="fastcgi_alias" value="{tmpl_var name='fastcgi_alias'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="fastcgi_phpini_path">{tmpl_var name='fastcgi_phpini_path_txt'}</label>
- <input name="fastcgi_phpini_path" id="fastcgi_phpini_path" value="{tmpl_var name='fastcgi_phpini_path'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="fastcgi_children">{tmpl_var name='fastcgi_children_txt'}</label>
- <input name="fastcgi_children" id="fastcgi_children" value="{tmpl_var name='fastcgi_children'}" size="40" maxlength="255" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="fastcgi_max_requests">{tmpl_var name='fastcgi_max_requests_txt'}</label>
- <input name="fastcgi_max_requests" id="fastcgi_max_requests" value="{tmpl_var name='fastcgi_max_requests'}" size="40" maxlength="255" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="fastcgi_bin">{tmpl_var name='fastcgi_bin_txt'}</label>
- <input name="fastcgi_bin" id="fastcgi_bin" value="{tmpl_var name='fastcgi_bin'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="fastcgi_config_syntax">{tmpl_var name='fastcgi_config_syntax_txt'}</label>
- <select name="fastcgi_config_syntax" id="fastcgi_config_syntax" class="selectInput">
+
+
+ <div class="form-group">
+ <label for="fastcgi_starter_path" class="col-sm-3 control-label">{tmpl_var name='fastcgi_starter_path_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="fastcgi_starter_path" id="fastcgi_starter_path" value="{tmpl_var name='fastcgi_starter_path'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="fastcgi_starter_script" class="col-sm-3 control-label">{tmpl_var name='fastcgi_starter_script_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="fastcgi_starter_script" id="fastcgi_starter_script" value="{tmpl_var name='fastcgi_starter_script'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="fastcgi_alias" class="col-sm-3 control-label">{tmpl_var name='fastcgi_alias_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="fastcgi_alias" id="fastcgi_alias" value="{tmpl_var name='fastcgi_alias'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="fastcgi_phpini_path" class="col-sm-3 control-label">{tmpl_var name='fastcgi_phpini_path_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="fastcgi_phpini_path" id="fastcgi_phpini_path" value="{tmpl_var name='fastcgi_phpini_path'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="fastcgi_children" class="col-sm-3 control-label">{tmpl_var name='fastcgi_children_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="fastcgi_children" id="fastcgi_children" value="{tmpl_var name='fastcgi_children'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="fastcgi_max_requests" class="col-sm-3 control-label">{tmpl_var name='fastcgi_max_requests_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="fastcgi_max_requests" id="fastcgi_max_requests" value="{tmpl_var name='fastcgi_max_requests'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="fastcgi_bin" class="col-sm-3 control-label">{tmpl_var name='fastcgi_bin_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="fastcgi_bin" id="fastcgi_bin" value="{tmpl_var name='fastcgi_bin'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="fastcgi_config_syntax" class="col-sm-3 control-label">{tmpl_var name='fastcgi_config_syntax_txt'}</label>
+ <div class="col-sm-9"><select name="fastcgi_config_syntax" id="fastcgi_config_syntax" class="form-control">
{tmpl_var name='fastcgi_config_syntax'}
</select>
- </div>
- </fieldset>
+ </div></div>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_config_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_config_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/admin/templates/server_config_getmail_edit.htm b/interface/web/admin/templates/server_config_getmail_edit.htm
index 8dc900d..9664593 100644
--- a/interface/web/admin/templates/server_config_getmail_edit.htm
+++ b/interface/web/admin/templates/server_config_getmail_edit.htm
@@ -1,22 +1,19 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_server_config">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="getmail_config_dir">{tmpl_var name='getmail_config_dir_txt'}</label>
- <input name="getmail_config_dir" id="getmail_config_dir" value="{tmpl_var name='getmail_config_dir'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- </fieldset>
+
+
+ <div class="form-group">
+ <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" name="getmail_config_dir" id="getmail_config_dir" value="{tmpl_var name='getmail_config_dir'}" class="form-control" />
+ </div></div>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_config_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_config_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/admin/templates/server_config_jailkit_edit.htm b/interface/web/admin/templates/server_config_jailkit_edit.htm
index 9d7864b..82ecd55 100644
--- a/interface/web/admin/templates/server_config_jailkit_edit.htm
+++ b/interface/web/admin/templates/server_config_jailkit_edit.htm
@@ -1,34 +1,31 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_server_config">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="jailkit_chroot_home">{tmpl_var name='jailkit_chroot_home_txt'}</label>
- <input name="jailkit_chroot_home" id="jailkit_chroot_home" value="{tmpl_var name='jailkit_chroot_home'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="jailkit_chroot_app_sections">{tmpl_var name='jailkit_chroot_app_sections_txt'}</label>
- <input name="jailkit_chroot_app_sections" id="jailkit_chroot_app_sections" value="{tmpl_var name='jailkit_chroot_app_sections'}" size="40" maxlength="1000" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="jailkit_chroot_app_programs">{tmpl_var name='jailkit_chroot_app_programs_txt'}</label>
- <input name="jailkit_chroot_app_programs" id="jailkit_chroot_app_programs" value="{tmpl_var name='jailkit_chroot_app_programs'}" size="40" maxlength="1000" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="jailkit_chroot_cron_programs">{tmpl_var name='jailkit_chroot_cron_programs_txt'}</label>
- <input name="jailkit_chroot_cron_programs" id="jailkit_chroot_cron_programs" value="{tmpl_var name='jailkit_chroot_cron_programs'}" size="40" maxlength="1000" type="text" class="textInput" />
- </div>
- </fieldset>
+
+
+ <div class="form-group">
+ <label for="jailkit_chroot_home" class="col-sm-3 control-label">{tmpl_var name='jailkit_chroot_home_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="jailkit_chroot_home" id="jailkit_chroot_home" value="{tmpl_var name='jailkit_chroot_home'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="jailkit_chroot_app_sections" class="col-sm-3 control-label">{tmpl_var name='jailkit_chroot_app_sections_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="jailkit_chroot_app_sections" id="jailkit_chroot_app_sections" value="{tmpl_var name='jailkit_chroot_app_sections'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="jailkit_chroot_app_programs" class="col-sm-3 control-label">{tmpl_var name='jailkit_chroot_app_programs_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="jailkit_chroot_app_programs" id="jailkit_chroot_app_programs" value="{tmpl_var name='jailkit_chroot_app_programs'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="jailkit_chroot_cron_programs" class="col-sm-3 control-label">{tmpl_var name='jailkit_chroot_cron_programs_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="jailkit_chroot_cron_programs" id="jailkit_chroot_cron_programs" value="{tmpl_var name='jailkit_chroot_cron_programs'}" class="form-control" />
+ </div></div>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_config_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_config_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/admin/templates/server_config_list.htm b/interface/web/admin/templates/server_config_list.htm
index d5b4219..8472971 100644
--- a/interface/web/admin/templates/server_config_list.htm
+++ b/interface/web/admin/templates/server_config_list.htm
@@ -1,29 +1,30 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_server_config">
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_server_name" scope="col"><tmpl_var name="server_name_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="server_name_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_server_name"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/server_config_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><div class="col-sm-9"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/server_config_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_server_name"><a href="#" onclick="loadContent('admin/server_config_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_name"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -35,11 +36,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="2"><tmpl_var name="paging"></td>
+ <td colspan="2"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
</div>
+
+ </div>
diff --git a/interface/web/admin/templates/server_config_mail_edit.htm b/interface/web/admin/templates/server_config_mail_edit.htm
index 54d6014..03f8674 100644
--- a/interface/web/admin/templates/server_config_mail_edit.htm
+++ b/interface/web/admin/templates/server_config_mail_edit.htm
@@ -1,134 +1,131 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_server_config">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="module">{tmpl_var name='module_txt'}</label>
- <select name="module" id="module" class="selectInput formLengthHalf">
+
+
+ <div class="form-group">
+ <label for="module" class="col-sm-3 control-label">{tmpl_var name='module_txt'}</label>
+ <div class="col-sm-9"><select name="module" id="module" class="form-control">
{tmpl_var name='module'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="maildir_path">{tmpl_var name='maildir_path_txt'}</label>
- <input name="maildir_path" id="maildir_path" value="{tmpl_var name='maildir_path'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="homedir_path">{tmpl_var name='homedir_path_txt'}</label>
- <input name="homedir_path" id="homedir_path" value="{tmpl_var name='homedir_path'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="dkim_path">{tmpl_var name='dkim_path_txt'}</label>
- <input name="dkim_path" id="dkim_path" value="{tmpl_var name='dkim_path'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='dkim_strength_txt'}</p>
- <div class="multiField">
- <select name="dkim_strength" id="dkim_strength" class="selectInput">
+ </div></div>
+ <div class="form-group">
+ <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" name="maildir_path" id="maildir_path" value="{tmpl_var name='maildir_path'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <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" name="homedir_path" id="homedir_path" value="{tmpl_var name='homedir_path'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="dkim_path" class="col-sm-3 control-label">{tmpl_var name='dkim_path_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="dkim_path" id="dkim_path" value="{tmpl_var name='dkim_path'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='dkim_strength_txt'}</label>
+ <div class="col-sm-9">
+ <div class="col-sm-9"><select name="dkim_strength" id="dkim_strength" class="form-control">
{tmpl_var name='dkim_strength'}
</select>
- </div>
+ </div></div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='pop3_imap_daemon_txt'}</p>
- <div class="multiField">
- <select name="pop3_imap_daemon" id="pop3_imap_daemon" class="selectInput">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='pop3_imap_daemon_txt'}</label>
+ <div class="col-sm-9">
+ <div class="col-sm-9"><select name="pop3_imap_daemon" id="pop3_imap_daemon" class="form-control">
{tmpl_var name='pop3_imap_daemon'}
</select>
- </div>
+ </div></div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='mail_filter_syntax_txt'}</p>
- <div class="multiField">
- <select name="mail_filter_syntax" id="mail_filter_syntax" class="selectInput">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='mail_filter_syntax_txt'}</label>
+ <div class="col-sm-9">
+ <div class="col-sm-9"><select name="mail_filter_syntax" id="mail_filter_syntax" class="form-control">
{tmpl_var name='mail_filter_syntax'}
</select>
- </div>
+ </div></div>
</div>
- <div class="ctrlHolder">
- <label for="mailuser_uid">{tmpl_var name='mailuser_uid_txt'}</label>
- <input name="mailuser_uid" id="mailuser_uid" value="{tmpl_var name='mailuser_uid'}" size="10" maxlength="255" type="text" class="textInput formLengthHalf" />
- </div>
- <div class="ctrlHolder">
- <label for="mailuser_gid">{tmpl_var name='mailuser_gid_txt'}</label>
- <input name="mailuser_gid" id="mailuser_gid" value="{tmpl_var name='mailuser_gid'}" size="10" maxlength="255" type="text" class="textInput formLengthHalf" />
- </div>
- <div class="ctrlHolder">
- <label for="mailuser_name">{tmpl_var name='mailuser_name_txt'}</label>
- <input name="mailuser_name" id="mailuser_name" value="{tmpl_var name='mailuser_name'}" size="10" maxlength="255" type="text" class="textInput formLengthHalf" />
- </div>
- <div class="ctrlHolder">
- <label for="mailuser_group">{tmpl_var name='mailuser_group_txt'}</label>
- <input name="mailuser_group" id="mailuser_group" value="{tmpl_var name='mailuser_group'}" size="10" maxlength="255" type="text" class="textInput formLengthHalf" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='mailbox_virtual_uidgid_maps_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <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" name="mailuser_uid" id="mailuser_uid" value="{tmpl_var name='mailuser_uid'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <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" name="mailuser_gid" id="mailuser_gid" value="{tmpl_var name='mailuser_gid'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <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" name="mailuser_name" id="mailuser_name" value="{tmpl_var name='mailuser_name'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <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" name="mailuser_group" id="mailuser_group" value="{tmpl_var name='mailuser_group'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='mailbox_virtual_uidgid_maps_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='mailbox_virtual_uidgid_maps'} {tmpl_var name='mailbox_virtual_uidgid_maps_info_txt'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="relayhost">{tmpl_var name='relayhost_txt'}</label>
- <input name="relayhost" id="relayhost" value="{tmpl_var name='relayhost'}" size="40" maxlength="255" type="text" class="textInput formLengthHalf" />
- </div>
- <div class="ctrlHolder">
- <label for="relayhost_user">{tmpl_var name='relayhost_user_txt'}</label>
- <input name="relayhost_user" id="relayhost_user" value="{tmpl_var name='relayhost_user'}" size="40" maxlength="255" type="text" autocomplete="off" class="textInput formLengthHalf" autocomplete="off" />
- </div>
- <div class="ctrlHolder">
- <label for="relayhost_password">{tmpl_var name='relayhost_password_txt'}</label>
+ <div class="form-group">
+ <label for="relayhost" class="col-sm-3 control-label">{tmpl_var name='relayhost_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="relayhost" id="relayhost" value="{tmpl_var name='relayhost'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <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" name="relayhost_user" id="relayhost_user" value="{tmpl_var name='relayhost_user'}" autocomplete="off" class="form-control" autocomplete="off" />
+ </div></div>
+ <div class="form-group">
+ <label for="relayhost_password" class="col-sm-3 control-label">{tmpl_var name='relayhost_password_txt'}</label>
<input name="relayhost_password" id="relayhost_password" value="{tmpl_var name='relayhost_password'}" size="40" maxlength="255" type="password" autocomplete="off" class="textInput formLengthHalf" autocomplete="off" />
</div>
- <div class="ctrlHolder">
- <label for="mailbox_size_limit">{tmpl_var name='mailbox_size_limit_txt'}</label>
- <input name="mailbox_size_limit" id="mailbox_size_limit" value="{tmpl_var name='mailbox_size_limit'}" size="10" maxlength="15" type="text" class="textInput formLengthLimit" /> MB
- </div>
- <div class="ctrlHolder">
- <label for="message_size_limit">{tmpl_var name='message_size_limit_txt'}</label>
- <input name="message_size_limit" id="message_size_limit" value="{tmpl_var name='message_size_limit'}" size="10" maxlength="15" type="text" class="textInput formLengthLimit" /> MB
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='mailbox_quota_stats_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <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" name="mailbox_size_limit" id="mailbox_size_limit" value="{tmpl_var name='mailbox_size_limit'}" class="form-control" /> MB
+ </div></div>
+ <div class="form-group">
+ <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" name="message_size_limit" id="message_size_limit" value="{tmpl_var name='message_size_limit'}" class="form-control" /> MB
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='mailbox_quota_stats_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='mailbox_quota_stats'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="realtime_blackhole_list">{tmpl_var name='realtime_blackhole_list_txt'}</label>
- <input name="realtime_blackhole_list" id="realtime_blackhole_list" value="{tmpl_var name='realtime_blackhole_list'}" size="40" maxlength="255" type="text" class="textInput" /> {tmpl_var name='realtime_blackhole_list_note_txt'}
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='overquota_notify_admin_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label for="realtime_blackhole_list" class="col-sm-3 control-label">{tmpl_var name='realtime_blackhole_list_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="realtime_blackhole_list" id="realtime_blackhole_list" value="{tmpl_var name='realtime_blackhole_list'}" class="form-control" /> {tmpl_var name='realtime_blackhole_list_note_txt'}
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='overquota_notify_admin_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='overquota_notify_admin'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='overquota_notify_client_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='overquota_notify_client_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='overquota_notify_client'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="overquota_notify_freq">{tmpl_var name='overquota_notify_freq_txt'}</label>
- <input name="overquota_notify_freq" id="overquota_notify_freq" value="{tmpl_var name='overquota_notify_freq'}" size="40" maxlength="255" type="text" class="textInput" /> {tmpl_var name='overquota_notify_freq_note_txt'}
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='overquota_notify_onok_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label for="overquota_notify_freq" class="col-sm-3 control-label">{tmpl_var name='overquota_notify_freq_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="overquota_notify_freq" id="overquota_notify_freq" value="{tmpl_var name='overquota_notify_freq'}" class="form-control" /> {tmpl_var name='overquota_notify_freq_note_txt'}
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='overquota_notify_onok_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='overquota_notify_onok'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_config_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_config_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
diff --git a/interface/web/admin/templates/server_config_rescue_edit.htm b/interface/web/admin/templates/server_config_rescue_edit.htm
index 28b5cb4..783628e 100644
--- a/interface/web/admin/templates/server_config_rescue_edit.htm
+++ b/interface/web/admin/templates/server_config_rescue_edit.htm
@@ -1,50 +1,47 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_server_config">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>Rescue</legend>
- <div class="ctrlHolder">
+ <legend>Rescue</legend>
+ <div class="form-group">
<p class="label" style="width:300px">{tmpl_var name='try_rescue_txt'}</p>
<div class="multiField" style="width:100px">
{tmpl_var name='try_rescue'}
</div>
</div>
- <div class="ctrlHolder">
+ <div class="form-group">
<p class="label" style="width:300px">{tmpl_var name='do_not_try_rescue_httpd_txt'}</p>
<div class="multiField" style="width:100px">
{tmpl_var name='do_not_try_rescue_httpd'}
</div>
</div>
- <div class="ctrlHolder">
+ <div class="form-group">
<p class="label" style="width:300px">{tmpl_var name='do_not_try_rescue_mongodb_txt'}</p>
<div class="multiField" style="width:100px">
{tmpl_var name='do_not_try_rescue_mongodb'}
</div>
</div>
- <div class="ctrlHolder">
+ <div class="form-group">
<p class="label" style="width:300px">{tmpl_var name='do_not_try_rescue_mysql_txt'}</p>
<div class="multiField" style="width:100px">
{tmpl_var name='do_not_try_rescue_mysql'}
</div>
</div>
- <div class="ctrlHolder">
+ <div class="form-group">
<p class="label" style="width:300px">{tmpl_var name='do_not_try_rescue_mail_txt'}</p>
<div class="multiField" style="width:100px">
{tmpl_var name='do_not_try_rescue_mail'}
</div>
</div>
- </fieldset>
+
<tmpl_var name="rescue_description_txt">
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_config_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_config_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
diff --git a/interface/web/admin/templates/server_config_server_edit.htm b/interface/web/admin/templates/server_config_server_edit.htm
index 2c08129..7c19805 100644
--- a/interface/web/admin/templates/server_config_server_edit.htm
+++ b/interface/web/admin/templates/server_config_server_edit.htm
@@ -1,119 +1,116 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_server_config">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='auto_network_configuration_txt'}</p>
- <div class="multiField">
+
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='auto_network_configuration_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='auto_network_configuration'} {tmpl_var name='network_config_warning_txt'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="ip_address">{tmpl_var name='ip_address_txt'}</label>
- <input name="ip_address" id="ip_address" value="{tmpl_var name='ip_address'}" size="15" maxlength="255" type="text" class="textInput formLengthIPv4" />
+ <div class="form-group">
+ <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" name="ip_address" id="ip_address" value="{tmpl_var name='ip_address'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="netmask" class="col-sm-3 control-label">{tmpl_var name='netmask_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="netmask" id="netmask" value="{tmpl_var name='netmask'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="v6_prefix" class="col-sm-3 control-label">{tmpl_var name='v6_prefix_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="v6_prefix" id="v6_prefix" value="{tmpl_var name='v6_prefix'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="gateway" class="col-sm-3 control-label">{tmpl_var name='gateway_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="gateway" id="gateway" value="{tmpl_var name='gateway'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="hostname" class="col-sm-3 control-label">{tmpl_var name='hostname_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="hostname" id="hostname" value="{tmpl_var name='hostname'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="nameservers" class="col-sm-3 control-label">{tmpl_var name='nameservers_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="nameservers" id="nameservers" value="{tmpl_var name='nameservers'}" class="form-control" />
+ </div><p class="formHint">{tmpl_var name='nameservers_hint_txt'}</p>
</div>
- <div class="ctrlHolder">
- <label for="netmask">{tmpl_var name='netmask_txt'}</label>
- <input name="netmask" id="netmask" value="{tmpl_var name='netmask'}" size="15" maxlength="255" type="text" class="textInput formLengthIPv4" />
- </div>
- <div class="ctrlHolder">
- <label for="v6_prefix">{tmpl_var name='v6_prefix_txt'}</label>
- <input name="v6_prefix" id="v6_prefix" value="{tmpl_var name='v6_prefix'}" size="15" maxlength="255" type="text" class="textInput formLengthIPv4" />
- </div>
- <div class="ctrlHolder">
- <label for="gateway">{tmpl_var name='gateway_txt'}</label>
- <input name="gateway" id="gateway" value="{tmpl_var name='gateway'}" size="15" maxlength="255" type="text" class="textInput formLengthIPv4" />
- </div>
- <div class="ctrlHolder">
- <label for="hostname">{tmpl_var name='hostname_txt'}</label>
- <input name="hostname" id="hostname" value="{tmpl_var name='hostname'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="nameservers">{tmpl_var name='nameservers_txt'}</label>
- <input name="nameservers" id="nameservers" value="{tmpl_var name='nameservers'}" size="40" maxlength="255" type="text" class="textInput" />
- <p class="formHint">{tmpl_var name='nameservers_hint_txt'}</p>
- </div>
- <div class="ctrlHolder">
- <label for="firewall">{tmpl_var name='firewall_txt'}</label>
- <select name="firewall" id="firewall" class="selectInput">
+ <div class="form-group">
+ <label for="firewall" class="col-sm-3 control-label">{tmpl_var name='firewall_txt'}</label>
+ <div class="col-sm-9"><select name="firewall" id="firewall" class="form-control">
{tmpl_var name='firewall'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="loglevel">{tmpl_var name='loglevel_txt'}</label>
- <select name="loglevel" id="loglevel" class="selectInput">
+ </div></div>
+ <div class="form-group">
+ <label for="loglevel" class="col-sm-3 control-label">{tmpl_var name='loglevel_txt'}</label>
+ <div class="col-sm-9"><select name="loglevel" id="loglevel" class="form-control">
{tmpl_var name='loglevel'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="admin_notify_events">{tmpl_var name='admin_notify_events_txt'}</label>
- <select name="admin_notify_events" id="admin_notify_events" class="selectInput">
+ </div></div>
+ <div class="form-group">
+ <label for="admin_notify_events" class="col-sm-3 control-label">{tmpl_var name='admin_notify_events_txt'}</label>
+ <div class="col-sm-9"><select name="admin_notify_events" id="admin_notify_events" class="form-control">
{tmpl_var name='admin_notify_events'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="backup_dir">{tmpl_var name='backup_dir_txt'}</label>
- <input name="backup_dir" id="backup_dir" value="{tmpl_var name='backup_dir'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='backup_dir_is_mount_txt'}</p>
- <div class="multiField">
+ </div></div>
+ <div class="form-group">
+ <label for="backup_dir" class="col-sm-3 control-label">{tmpl_var name='backup_dir_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="backup_dir" id="backup_dir" value="{tmpl_var name='backup_dir'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='backup_dir_is_mount_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='backup_dir_is_mount'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="backup_mode">{tmpl_var name='backup_mode_txt'}</label>
- <select name="backup_mode" id="backup_mode" class="selectInput">
+ <div class="form-group">
+ <label for="backup_mode" class="col-sm-3 control-label">{tmpl_var name='backup_mode_txt'}</label>
+ <div class="col-sm-9"><select name="backup_mode" id="backup_mode" class="form-control">
{tmpl_var name='backup_mode'}
</select>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='backup_delete_txt'}</p>
- <div class="multiField">
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='backup_delete_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='backup_delete'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="monit_url">{tmpl_var name='monit_url_txt'}</label>
- <input name="monit_url" id="monit_url" value="{tmpl_var name='monit_url'}" size="40" maxlength="255" type="text" class="textInput" /> {tmpl_var name='monit_url_note_txt'} <a href="javascript:void(0);" class="addPlaceholder">[SERVERNAME]</a>
+ <div class="form-group">
+ <label for="monit_url" class="col-sm-3 control-label">{tmpl_var name='monit_url_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="monit_url" id="monit_url" value="{tmpl_var name='monit_url'}" class="form-control" /> {tmpl_var name='monit_url_note_txt'} </div><a href="javascript:void(0);" class="addPlaceholder">[SERVERNAME]</a>
</div>
- <div class="ctrlHolder">
- <label for="monit_user">{tmpl_var name='monit_user_txt'}</label>
- <input name="monit_user" id="monit_user" value="{tmpl_var name='monit_user'}" size="40" maxlength="255" type="text" class="textInput" />
+ <div class="form-group">
+ <label for="monit_user" class="col-sm-3 control-label">{tmpl_var name='monit_user_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="monit_user" id="monit_user" value="{tmpl_var name='monit_user'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="monit_password" class="col-sm-3 control-label">{tmpl_var name='monit_password_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="monit_password" id="monit_password" value="{tmpl_var name='monit_password'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="munin_url" class="col-sm-3 control-label">{tmpl_var name='munin_url_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="munin_url" id="munin_url" value="{tmpl_var name='munin_url'}" class="form-control" /> {tmpl_var name='munin_url_note_txt'} </div><a href="javascript:void(0);" class="addPlaceholder">[SERVERNAME]</a>
</div>
- <div class="ctrlHolder">
- <label for="monit_password">{tmpl_var name='monit_password_txt'}</label>
- <input name="monit_password" id="monit_password" value="{tmpl_var name='monit_password'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="munin_url">{tmpl_var name='munin_url_txt'}</label>
- <input name="munin_url" id="munin_url" value="{tmpl_var name='munin_url'}" size="40" maxlength="255" type="text" class="textInput" /> {tmpl_var name='munin_url_note_txt'} <a href="javascript:void(0);" class="addPlaceholder">[SERVERNAME]</a>
- </div>
- <div class="ctrlHolder">
- <label for="munin_user">{tmpl_var name='munin_user_txt'}</label>
- <input name="munin_user" id="munin_user" value="{tmpl_var name='munin_user'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="munin_password">{tmpl_var name='munin_password_txt'}</label>
- <input name="munin_password" id="munin_password" value="{tmpl_var name='munin_password'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='monitor_system_updates_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label for="munin_user" class="col-sm-3 control-label">{tmpl_var name='munin_user_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="munin_user" id="munin_user" value="{tmpl_var name='munin_user'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="munin_password" class="col-sm-3 control-label">{tmpl_var name='munin_password_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="munin_password" id="munin_password" value="{tmpl_var name='munin_password'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='monitor_system_updates_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='monitor_system_updates'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_config_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_config_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
diff --git a/interface/web/admin/templates/server_config_ufw_edit.htm b/interface/web/admin/templates/server_config_ufw_edit.htm
index 12a94ae..8eec848 100644
--- a/interface/web/admin/templates/server_config_ufw_edit.htm
+++ b/interface/web/admin/templates/server_config_ufw_edit.htm
@@ -1,66 +1,63 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_server_config">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>UFW Firewall</legend>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='ufw_enable_txt'}</p>
- <div class="multiField">
+ <legend>UFW Firewall</legend>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='ufw_enable_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='ufw_enable'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='ufw_manage_builtins_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='ufw_manage_builtins_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='ufw_manage_builtins'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='ufw_ipv6_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='ufw_ipv6_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='ufw_ipv6'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="ufw_default_input_policy">{tmpl_var name='ufw_default_input_policy_txt'}</label>
- <select name="ufw_default_input_policy" id="ufw_default_input_policy" class="selectInput">
+ <div class="form-group">
+ <label for="ufw_default_input_policy" class="col-sm-3 control-label">{tmpl_var name='ufw_default_input_policy_txt'}</label>
+ <div class="col-sm-9"><select name="ufw_default_input_policy" id="ufw_default_input_policy" class="form-control">
{tmpl_var name='ufw_default_input_policy'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="ufw_default_output_policy">{tmpl_var name='ufw_default_output_policy_txt'}</label>
- <select name="ufw_default_output_policy" id="ufw_default_output_policy" class="selectInput">
+ </div></div>
+ <div class="form-group">
+ <label for="ufw_default_output_policy" class="col-sm-3 control-label">{tmpl_var name='ufw_default_output_policy_txt'}</label>
+ <div class="col-sm-9"><select name="ufw_default_output_policy" id="ufw_default_output_policy" class="form-control">
{tmpl_var name='ufw_default_output_policy'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="ufw_default_forward_policy">{tmpl_var name='ufw_default_forward_policy_txt'}</label>
- <select name="ufw_default_forward_policy" id="ufw_default_forward_policy" class="selectInput">
+ </div></div>
+ <div class="form-group">
+ <label for="ufw_default_forward_policy" class="col-sm-3 control-label">{tmpl_var name='ufw_default_forward_policy_txt'}</label>
+ <div class="col-sm-9"><select name="ufw_default_forward_policy" id="ufw_default_forward_policy" class="form-control">
{tmpl_var name='ufw_default_forward_policy'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="ufw_default_application_policy">{tmpl_var name='ufw_default_application_policy_txt'}</label>
- <select name="ufw_default_application_policy" id="ufw_default_application_policy" class="selectInput">
+ </div></div>
+ <div class="form-group">
+ <label for="ufw_default_application_policy" class="col-sm-3 control-label">{tmpl_var name='ufw_default_application_policy_txt'}</label>
+ <div class="col-sm-9"><select name="ufw_default_application_policy" id="ufw_default_application_policy" class="form-control">
{tmpl_var name='ufw_default_application_policy'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="ufw_log_level">{tmpl_var name='ufw_log_level_txt'}</label>
- <select name="ufw_log_level" id="ufw_log_level" class="selectInput">
+ </div></div>
+ <div class="form-group">
+ <label for="ufw_log_level" class="col-sm-3 control-label">{tmpl_var name='ufw_log_level_txt'}</label>
+ <div class="col-sm-9"><select name="ufw_log_level" id="ufw_log_level" class="form-control">
{tmpl_var name='ufw_log_level'}
</select>
- </div>
- </fieldset>
+ </div></div>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_config_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_config_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/admin/templates/server_config_vlogger_edit.htm b/interface/web/admin/templates/server_config_vlogger_edit.htm
index 9f6c028..5feb463 100644
--- a/interface/web/admin/templates/server_config_vlogger_edit.htm
+++ b/interface/web/admin/templates/server_config_vlogger_edit.htm
@@ -1,22 +1,19 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_server_config">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="config_dir">{tmpl_var name='config_dir_txt'}</label>
- <input name="config_dir" id="config_dir" value="{tmpl_var name='config_dir'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- </fieldset>
+
+
+ <div class="form-group">
+ <label for="config_dir" class="col-sm-3 control-label">{tmpl_var name='config_dir_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="config_dir" id="config_dir" value="{tmpl_var name='config_dir'}" class="form-control" />
+ </div></div>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_config_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_config_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm
index c4079bf..699da5e 100644
--- a/interface/web/admin/templates/server_config_web_edit.htm
+++ b/interface/web/admin/templates/server_config_web_edit.htm
@@ -1,309 +1,306 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_server_config">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='server_type_txt'}</p>
- <div class="multiField">
- <select name="server_type" id="server_type" class="selectInput">
+
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='server_type_txt'}</label>
+ <div class="col-sm-9">
+ <div class="col-sm-9"><select name="server_type" id="server_type" class="form-control">
{tmpl_var name='server_type'}
</select>
- </div>
+ </div></div>
</div>
- <div class="ctrlHolder">
- <label for="website_basedir">{tmpl_var name='website_basedir_txt'}</label>
- <input name="website_basedir" id="website_basedir" value="{tmpl_var name='website_basedir'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="website_path">{tmpl_var name='website_path_txt'}</label>
- <input name="website_path" id="website_path" value="{tmpl_var name='website_path'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="website_symlinks">{tmpl_var name='website_symlinks_txt'}</label>
- <input name="website_symlinks" id="website_symlinks" value="{tmpl_var name='website_symlinks'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="website_symlinks_rel">{tmpl_var name='website_symlinks_rel_txt'}</label>
- <div class="multiField">
+ <div class="form-group">
+ <label for="website_basedir" class="col-sm-3 control-label">{tmpl_var name='website_basedir_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="website_basedir" id="website_basedir" value="{tmpl_var name='website_basedir'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="website_path" class="col-sm-3 control-label">{tmpl_var name='website_path_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="website_path" id="website_path" value="{tmpl_var name='website_path'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="website_symlinks" class="col-sm-3 control-label">{tmpl_var name='website_symlinks_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="website_symlinks" id="website_symlinks" value="{tmpl_var name='website_symlinks'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="website_symlinks_rel" class="col-sm-3 control-label">{tmpl_var name='website_symlinks_rel_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='website_symlinks_rel'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="website_symlinks_rel">{tmpl_var name='network_filesystem_txt'}</label>
- <div class="multiField">
+ <div class="form-group">
+ <label for="website_symlinks_rel" class="col-sm-3 control-label">{tmpl_var name='network_filesystem_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='network_filesystem'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="website_autoalias">{tmpl_var name='website_autoalias_txt'}</label>
- <input name="website_autoalias" id="website_autoalias" value="{tmpl_var name='website_autoalias'}" size="40" maxlength="255" type="text" class="textInput" /> {tmpl_var name='website_autoalias_note_txt'} <a href="javascript:void(0);" class="addPlaceholder">[client_id]</a>, <a href="javascript:void(0);" class="addPlaceholder">[client_username]</a>, <a href="javascript:void(0);" class="addPlaceholder">[website_id]</a>, <a href="javascript:void(0);" class="addPlaceholder">[website_domain]</a>
+ <div class="form-group">
+ <label for="website_autoalias" class="col-sm-3 control-label">{tmpl_var name='website_autoalias_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="website_autoalias" id="website_autoalias" value="{tmpl_var name='website_autoalias'}" class="form-control" /> {tmpl_var name='website_autoalias_note_txt'} </div><a href="javascript:void(0);" class="addPlaceholder">[client_id]</a>, <a href="javascript:void(0);" class="addPlaceholder">[client_username]</a>, <a href="javascript:void(0);" class="addPlaceholder">[website_id]</a>, <a href="javascript:void(0);" class="addPlaceholder">[website_domain]</a>
</div>
- <div class="ctrlHolder apache">
- <label for="vhost_rewrite_v6">{tmpl_var name='vhost_rewrite_v6_txt'}</label>
- <div class="multiField">
+ <div class="form-group apache">
+ <label for="vhost_rewrite_v6" class="col-sm-3 control-label">{tmpl_var name='vhost_rewrite_v6_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='vhost_rewrite_v6'}
</div>
</div>
- <div class="ctrlHolder apache">
- <label for="vhost_conf_dir">{tmpl_var name='vhost_conf_dir_txt'}</label>
- <input name="vhost_conf_dir" id="vhost_conf_dir" value="{tmpl_var name='vhost_conf_dir'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder apache">
- <label for="vhost_conf_enabled_dir">{tmpl_var name='vhost_conf_enabled_dir_txt'}</label>
- <input name="vhost_conf_enabled_dir" id="vhost_conf_enabled_dir" value="{tmpl_var name='vhost_conf_enabled_dir'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder nginx">
- <label for="nginx_vhost_conf_dir">{tmpl_var name='nginx_vhost_conf_dir_txt'}</label>
- <input name="nginx_vhost_conf_dir" id="nginx_vhost_conf_dir" value="{tmpl_var name='nginx_vhost_conf_dir'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder nginx">
- <label for="nginx_vhost_conf_enabled_dir">{tmpl_var name='nginx_vhost_conf_enabled_dir_txt'}</label>
- <input name="nginx_vhost_conf_enabled_dir" id="nginx_vhost_conf_enabled_dir" value="{tmpl_var name='nginx_vhost_conf_enabled_dir'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='security_level_txt'}</p>
- <div class="multiField">
- <select name="security_level" id="security_level" class="selectInput">
+ <div class="form-group apache">
+ <label for="vhost_conf_dir" class="col-sm-3 control-label">{tmpl_var name='vhost_conf_dir_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="vhost_conf_dir" id="vhost_conf_dir" value="{tmpl_var name='vhost_conf_dir'}" class="form-control" />
+ </div></div>
+ <div class="form-group apache">
+ <label for="vhost_conf_enabled_dir" class="col-sm-3 control-label">{tmpl_var name='vhost_conf_enabled_dir_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="vhost_conf_enabled_dir" id="vhost_conf_enabled_dir" value="{tmpl_var name='vhost_conf_enabled_dir'}" class="form-control" />
+ </div></div>
+ <div class="form-group nginx">
+ <label for="nginx_vhost_conf_dir" class="col-sm-3 control-label">{tmpl_var name='nginx_vhost_conf_dir_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="nginx_vhost_conf_dir" id="nginx_vhost_conf_dir" value="{tmpl_var name='nginx_vhost_conf_dir'}" class="form-control" />
+ </div></div>
+ <div class="form-group nginx">
+ <label for="nginx_vhost_conf_enabled_dir" class="col-sm-3 control-label">{tmpl_var name='nginx_vhost_conf_enabled_dir_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="nginx_vhost_conf_enabled_dir" id="nginx_vhost_conf_enabled_dir" value="{tmpl_var name='nginx_vhost_conf_enabled_dir'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='security_level_txt'}</label>
+ <div class="col-sm-9">
+ <div class="col-sm-9"><select name="security_level" id="security_level" class="form-control">
{tmpl_var name='security_level'}
</select>
- </div>
+ </div></div>
</div>
- <div class="ctrlHolder apache">
- <p class="label">{tmpl_var name='check_apache_config_txt'}</p>
- <div class="multiField">
+ <div class="form-group apache">
+ <label class="col-sm-3 control-label">{tmpl_var name='check_apache_config_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='check_apache_config'}
</div>
</div>
- <div class="ctrlHolder apache">
- <label for="user">{tmpl_var name='web_user_txt'}</label>
- <input name="user" id="user" value="{tmpl_var name='user'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder apache">
- <label for="group">{tmpl_var name='web_group_txt'}</label>
- <input name="group" id="group" value="{tmpl_var name='group'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder nginx">
- <label for="nginx_user">{tmpl_var name='nginx_user_txt'}</label>
- <input name="nginx_user" id="nginx_user" value="{tmpl_var name='nginx_user'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder nginx">
- <label for="nginx_group">{tmpl_var name='nginx_group_txt'}</label>
- <input name="nginx_group" id="nginx_group" value="{tmpl_var name='nginx_group'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder nginx">
- <label for="nginx_cgi_socket">{tmpl_var name='nginx_cgi_socket_txt'}</label>
- <input name="nginx_cgi_socket" id="nginx_cgi_socket" value="{tmpl_var name='nginx_cgi_socket'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder apache">
- <label for="htaccess_allow_override">{tmpl_var name='htaccess_allow_override_txt'}</label>
- <input name="htaccess_allow_override" id="htaccess_allow_override" value="{tmpl_var name='htaccess_allow_override'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='enable_ip_wildcard_txt'}</p>
- <div class="multiField">
+ <div class="form-group apache">
+ <label for="user" class="col-sm-3 control-label">{tmpl_var name='web_user_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="user" id="user" value="{tmpl_var name='user'}" class="form-control" />
+ </div></div>
+ <div class="form-group apache">
+ <label for="group" class="col-sm-3 control-label">{tmpl_var name='web_group_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="group" id="group" value="{tmpl_var name='group'}" class="form-control" />
+ </div></div>
+ <div class="form-group nginx">
+ <label for="nginx_user" class="col-sm-3 control-label">{tmpl_var name='nginx_user_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="nginx_user" id="nginx_user" value="{tmpl_var name='nginx_user'}" class="form-control" />
+ </div></div>
+ <div class="form-group nginx">
+ <label for="nginx_group" class="col-sm-3 control-label">{tmpl_var name='nginx_group_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="nginx_group" id="nginx_group" value="{tmpl_var name='nginx_group'}" class="form-control" />
+ </div></div>
+ <div class="form-group nginx">
+ <label for="nginx_cgi_socket" class="col-sm-3 control-label">{tmpl_var name='nginx_cgi_socket_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="nginx_cgi_socket" id="nginx_cgi_socket" value="{tmpl_var name='nginx_cgi_socket'}" class="form-control" />
+ </div></div>
+ <div class="form-group apache">
+ <label for="htaccess_allow_override" class="col-sm-3 control-label">{tmpl_var name='htaccess_allow_override_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="htaccess_allow_override" id="htaccess_allow_override" value="{tmpl_var name='htaccess_allow_override'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='enable_ip_wildcard_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='enable_ip_wildcard'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='overtraffic_notify_admin_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='overtraffic_notify_admin_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='overtraffic_notify_admin'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='overtraffic_notify_client_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='overtraffic_notify_client_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='overtraffic_notify_client'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='overquota_notify_admin_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='overquota_notify_admin_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='overquota_notify_admin'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='overquota_notify_client_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='overquota_notify_client_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='overquota_notify_client'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='overquota_db_notify_admin_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='overquota_db_notify_admin_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='overquota_db_notify_admin'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='overquota_db_notify_client_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='overquota_db_notify_client_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='overquota_db_notify_client'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="overquota_notify_freq">{tmpl_var name='overquota_notify_freq_txt'}</label>
- <input name="overquota_notify_freq" id="overquota_notify_freq" value="{tmpl_var name='overquota_notify_freq'}" size="40" maxlength="255" type="text" class="textInput" /> {tmpl_var name='overquota_notify_freq_note_txt'}
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='overquota_notify_onok_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label for="overquota_notify_freq" class="col-sm-3 control-label">{tmpl_var name='overquota_notify_freq_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="overquota_notify_freq" id="overquota_notify_freq" value="{tmpl_var name='overquota_notify_freq'}" class="form-control" /> {tmpl_var name='overquota_notify_freq_note_txt'}
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='overquota_notify_onok_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='overquota_notify_onok'}
</div>
</div>
<div class="subsectiontoggle"><span></span>{tmpl_var name='ssl_settings_txt'}<em></em></div>
<div style="display:none;">
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='enable_sni_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='enable_sni_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='enable_sni'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">
<tmpl_var name="enable_spdy_txt">
- </p>
- <div class="multiField">
+ </label>
+ <div class="col-sm-9">
<tmpl_var name="enable_spdy">
</div>
</div>
- <div class="ctrlHolder">
- <label for="CA_path">{tmpl_var name='CA_path_txt'}</label>
- <input name="CA_path" id="CA_path" value="{tmpl_var name='CA_path'}" size="40" maxlength="255" type="text" autocomplete="off" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="CA_pass">{tmpl_var name='CA_pass_txt'}</label>
+ <div class="form-group">
+ <label for="CA_path" class="col-sm-3 control-label">{tmpl_var name='CA_path_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="CA_path" id="CA_path" value="{tmpl_var name='CA_path'}" autocomplete="off" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="CA_pass" class="col-sm-3 control-label">{tmpl_var name='CA_pass_txt'}</label>
<input name="CA_pass" id="CA_pass" value="{tmpl_var name='CA_pass'}" size="40" maxlength="255" type="password" autocomplete="off" class="textInput" />
</div>
</div>
<div class="subsectiontoggle"><span></span>{tmpl_var name='permissions_txt'}<em></em></div>
<div style="display:none;">
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='set_folder_permissions_on_update_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='set_folder_permissions_on_update_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='set_folder_permissions_on_update'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='web_folder_protection_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='web_folder_protection_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='web_folder_protection'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='add_web_users_to_sshusers_group_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='add_web_users_to_sshusers_group_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='add_web_users_to_sshusers_group'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='connect_userid_to_webid_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='connect_userid_to_webid_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='connect_userid_to_webid'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="connect_userid_to_webid_start">{tmpl_var name='connect_userid_to_webid_start_txt'}</label>
- <input name="connect_userid_to_webid_start" id="connect_userid_to_webid_start" value="{tmpl_var name='connect_userid_to_webid_start'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
+ <div class="form-group">
+ <label for="connect_userid_to_webid_start" class="col-sm-3 control-label">{tmpl_var name='connect_userid_to_webid_start_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="connect_userid_to_webid_start" id="connect_userid_to_webid_start" value="{tmpl_var name='connect_userid_to_webid_start'}" class="form-control" />
+ </div></div>
</div>
<div class="subsectiontoggle"><span></span>{tmpl_var name='php_settings_txt'}<em></em></div>
<div style="display:none;">
- <div class="ctrlHolder apache">
- <label for="php_ini_path_apache">{tmpl_var name='php_ini_path_apache_txt'}</label>
- <input name="php_ini_path_apache" id="php_ini_path_apache" value="{tmpl_var name='php_ini_path_apache'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder apache">
- <label for="php_ini_path_cgi">{tmpl_var name='php_ini_path_cgi_txt'}</label>
- <input name="php_ini_path_cgi" id="php_ini_path_cgi" value="{tmpl_var name='php_ini_path_cgi'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="php_fpm_init_script">{tmpl_var name='php_fpm_init_script_txt'}</label>
- <input name="php_fpm_init_script" id="php_fpm_init_script" value="{tmpl_var name='php_fpm_init_script'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="php_fpm_ini_path">{tmpl_var name='php_fpm_ini_path_txt'}</label>
- <input name="php_fpm_ini_path" id="php_fpm_ini_path" value="{tmpl_var name='php_fpm_ini_path'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="php_fpm_pool_dir">{tmpl_var name='php_fpm_pool_dir_txt'}</label>
- <input name="php_fpm_pool_dir" id="php_fpm_pool_dir" value="{tmpl_var name='php_fpm_pool_dir'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="php_fpm_start_port">{tmpl_var name='php_fpm_start_port_txt'}</label>
- <input name="php_fpm_start_port" id="php_fpm_start_port" value="{tmpl_var name='php_fpm_start_port'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="php_fpm_socket_dir">{tmpl_var name='php_fpm_socket_dir_txt'}</label>
- <input name="php_fpm_socket_dir" id="php_fpm_socket_dir" value="{tmpl_var name='php_fpm_socket_dir'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="php_open_basedir">{tmpl_var name='php_open_basedir_txt'}</label>
- <input name="php_open_basedir" id="php_open_basedir" value="{tmpl_var name='php_open_basedir'}" size="40" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="php_ini_check_minutes">{tmpl_var name='php_ini_check_minutes_txt'}</label>
- <input name="php_ini_check_minutes" id="php_ini_check_minutes" value="{tmpl_var name='php_ini_check_minutes'}" size="40" type="text" class="textInput" /> {tmpl_var name='php_ini_check_minutes_info_txt'}
- </div>
- <div class="ctrlHolder">
- <label for="php_handler">{tmpl_var name='php_handler_txt'}</label>
- <div class="multiField">
- <select name="php_handler" id="php_handler" class="selectInput">
+ <div class="form-group apache">
+ <label for="php_ini_path_apache" class="col-sm-3 control-label">{tmpl_var name='php_ini_path_apache_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="php_ini_path_apache" id="php_ini_path_apache" value="{tmpl_var name='php_ini_path_apache'}" class="form-control" />
+ </div></div>
+ <div class="form-group apache">
+ <label for="php_ini_path_cgi" class="col-sm-3 control-label">{tmpl_var name='php_ini_path_cgi_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="php_ini_path_cgi" id="php_ini_path_cgi" value="{tmpl_var name='php_ini_path_cgi'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="php_fpm_init_script" class="col-sm-3 control-label">{tmpl_var name='php_fpm_init_script_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="php_fpm_init_script" id="php_fpm_init_script" value="{tmpl_var name='php_fpm_init_script'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="php_fpm_ini_path" class="col-sm-3 control-label">{tmpl_var name='php_fpm_ini_path_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="php_fpm_ini_path" id="php_fpm_ini_path" value="{tmpl_var name='php_fpm_ini_path'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="php_fpm_pool_dir" class="col-sm-3 control-label">{tmpl_var name='php_fpm_pool_dir_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="php_fpm_pool_dir" id="php_fpm_pool_dir" value="{tmpl_var name='php_fpm_pool_dir'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="php_fpm_start_port" class="col-sm-3 control-label">{tmpl_var name='php_fpm_start_port_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="php_fpm_start_port" id="php_fpm_start_port" value="{tmpl_var name='php_fpm_start_port'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="php_fpm_socket_dir" class="col-sm-3 control-label">{tmpl_var name='php_fpm_socket_dir_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="php_fpm_socket_dir" id="php_fpm_socket_dir" value="{tmpl_var name='php_fpm_socket_dir'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="php_open_basedir" class="col-sm-3 control-label">{tmpl_var name='php_open_basedir_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="php_open_basedir" id="php_open_basedir" value="{tmpl_var name='php_open_basedir'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="php_ini_check_minutes" class="col-sm-3 control-label">{tmpl_var name='php_ini_check_minutes_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="php_ini_check_minutes" id="php_ini_check_minutes" value="{tmpl_var name='php_ini_check_minutes'}" class="form-control" /> {tmpl_var name='php_ini_check_minutes_info_txt'}
+ </div></div>
+ <div class="form-group">
+ <label for="php_handler" class="col-sm-3 control-label">{tmpl_var name='php_handler_txt'}</label>
+ <div class="col-sm-9">
+ <div class="col-sm-9"><select name="php_handler" id="php_handler" class="form-control">
{tmpl_var name='php_handler'}
</select>
- </div>
+ </div></div>
</div>
</div>
<div class="subsectiontoggle"><span></span>{tmpl_var name='apps_vhost_settings_txt'}<em></em></div>
<div style="display:none;">
- <div class="ctrlHolder">
- <label for="apps_vhost_port">{tmpl_var name='apps_vhost_port_txt'}</label>
- <input name="apps_vhost_port" id="apps_vhost_port" value="{tmpl_var name='apps_vhost_port'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="apps_vhost_ip">{tmpl_var name='apps_vhost_ip_txt'}</label>
- <input name="apps_vhost_ip" id="apps_vhost_ip" value="{tmpl_var name='apps_vhost_ip'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="apps_vhost_servername">{tmpl_var name='apps_vhost_servername_txt'}</label>
- <input name="apps_vhost_servername" id="apps_vhost_servername" value="{tmpl_var name='apps_vhost_servername'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
+ <div class="form-group">
+ <label for="apps_vhost_port" class="col-sm-3 control-label">{tmpl_var name='apps_vhost_port_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="apps_vhost_port" id="apps_vhost_port" value="{tmpl_var name='apps_vhost_port'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="apps_vhost_ip" class="col-sm-3 control-label">{tmpl_var name='apps_vhost_ip_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="apps_vhost_ip" id="apps_vhost_ip" value="{tmpl_var name='apps_vhost_ip'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="apps_vhost_servername" class="col-sm-3 control-label">{tmpl_var name='apps_vhost_servername_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="apps_vhost_servername" id="apps_vhost_servername" value="{tmpl_var name='apps_vhost_servername'}" class="form-control" />
+ </div></div>
</div>
<div class="subsectiontoggle"><span></span>{tmpl_var name='awstats_settings_txt'}<em></em></div>
<div style="display:none;">
- <div class="ctrlHolder">
- <label for="awstats_conf_dir">{tmpl_var name='awstats_conf_dir_txt'}</label>
- <input name="awstats_conf_dir" id="awstats_conf_dir" value="{tmpl_var name='awstats_conf_dir'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="awstats_data_dir">{tmpl_var name='awstats_data_dir_txt'}</label>
- <input name="awstats_data_dir" id="awstats_data_dir" value="{tmpl_var name='awstats_data_dir'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="awstats_pl">{tmpl_var name='awstats_pl_txt'}</label>
- <input name="awstats_pl" id="awstats_pl" value="{tmpl_var name='awstats_pl'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="awstats_buildstaticpages_pl">{tmpl_var name='awstats_buildstaticpages_pl_txt'}</label>
- <input name="awstats_buildstaticpages_pl" id="awstats_buildstaticpages_pl" value="{tmpl_var name='awstats_buildstaticpages_pl'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
+ <div class="form-group">
+ <label for="awstats_conf_dir" class="col-sm-3 control-label">{tmpl_var name='awstats_conf_dir_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="awstats_conf_dir" id="awstats_conf_dir" value="{tmpl_var name='awstats_conf_dir'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="awstats_data_dir" class="col-sm-3 control-label">{tmpl_var name='awstats_data_dir_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="awstats_data_dir" id="awstats_data_dir" value="{tmpl_var name='awstats_data_dir'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="awstats_pl" class="col-sm-3 control-label">{tmpl_var name='awstats_pl_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="awstats_pl" id="awstats_pl" value="{tmpl_var name='awstats_pl'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="awstats_buildstaticpages_pl" class="col-sm-3 control-label">{tmpl_var name='awstats_buildstaticpages_pl_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="awstats_buildstaticpages_pl" id="awstats_buildstaticpages_pl" value="{tmpl_var name='awstats_buildstaticpages_pl'}" class="form-control" />
+ </div></div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_config_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_config_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
<script language="JavaScript" type="text/javascript">
var serverType = jQuery('#server_type').val();
- jQuery('#server_type').replaceWith('<label for="server_Type">'+serverType+'</label><input type="hidden" name="server_type" value="'+serverType+'">');
+ jQuery('#server_type').replaceWith('<label for="server_Type" class="col-sm-3 control-label">'+serverType+'</label><input type="hidden" name="server_type" value="'+serverType+'">');
adjustForm();
jQuery('#server_type').change(function(){
serverType = $(this).val();
diff --git a/interface/web/admin/templates/server_edit_config.htm b/interface/web/admin/templates/server_edit_config.htm
index d6ad468..0c9df75 100644
--- a/interface/web/admin/templates/server_edit_config.htm
+++ b/interface/web/admin/templates/server_edit_config.htm
@@ -1,22 +1,19 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_server">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="config">{tmpl_var name='config_txt'}</label>
+
+
+ <div class="form-group">
+ <label for="config" class="col-sm-3 control-label">{tmpl_var name='config_txt'}</label>
<textarea name="config" id="config" rows='20' cols='40'>{tmpl_var name='config'}</textarea>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/server_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/admin/templates/server_edit_services.htm b/interface/web/admin/templates/server_edit_services.htm
index 595f16d..44bb29f 100644
--- a/interface/web/admin/templates/server_edit_services.htm
+++ b/interface/web/admin/templates/server_edit_services.htm
@@ -1,70 +1,67 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_server">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="server_name">{tmpl_var name='server_name_txt'}</label>
- <input name="server_name" id="server_name" value="{tmpl_var name='server_name'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='mail_server_txt'}</p>
- <div class="multiField">
+
+
+ <div class="form-group">
+ <label for="server_name" class="col-sm-3 control-label">{tmpl_var name='server_name_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="server_name" id="server_name" value="{tmpl_var name='server_name'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='mail_server_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='mail_server'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='web_server_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='web_server_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='web_server'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='dns_server_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='dns_server_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='dns_server'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='file_server_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='file_server_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='file_server'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='db_server_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='db_server_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='db_server'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='vserver_server_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='vserver_server_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='vserver_server'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="mirror_server_id">{tmpl_var name='mirror_server_id_txt'}</label>
- <select name="mirror_server_id" id="server_id" class="selectInput">
+ <div class="form-group">
+ <label for="mirror_server_id" class="col-sm-3 control-label">{tmpl_var name='mirror_server_id_txt'}</label>
+ <div class="col-sm-9"><select name="mirror_server_id" id="server_id" class="form-control">
{tmpl_var name='mirror_server_id'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="active">{tmpl_var name='active_txt'}</label>
- <select name="active" id="active" class="selectInput formLengthBool">
+ </div></div>
+ <div class="form-group">
+ <label for="active" class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9"><select name="active" id="active" class="form-control">
{tmpl_var name='active'}
</select>
- </div>
- </fieldset>
+ </div></div>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/server_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/admin/templates/server_ip_edit.htm b/interface/web/admin/templates/server_ip_edit.htm
index 09055c4..112534e 100644
--- a/interface/web/admin/templates/server_ip_edit.htm
+++ b/interface/web/admin/templates/server_ip_edit.htm
@@ -1,50 +1,47 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_server_ip">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>IP Address</legend>
- <div class="ctrlHolder">
- <label for="server_id">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id" id="server_id" class="selectInput">
+ <legend>IP Address</legend>
+ <div class="form-group">
+ <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
{tmpl_var name='server_id'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="client_id">{tmpl_var name='client_id_txt'}</label>
- <select name="client_id" id="client_id" class="selectInput">
+ </div></div>
+ <div class="form-group">
+ <label for="client_id" class="col-sm-3 control-label">{tmpl_var name='client_id_txt'}</label>
+ <div class="col-sm-9"><select name="client_id" id="client_id" class="form-control">
{tmpl_var name='client_id'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="ip_type">{tmpl_var name='ip_type_txt'}</label>
- <select name="ip_type" id="ip_type" class="selectInput">
+ </div></div>
+ <div class="form-group">
+ <label for="ip_type" class="col-sm-3 control-label">{tmpl_var name='ip_type_txt'}</label>
+ <div class="col-sm-9"><select name="ip_type" id="ip_type" class="form-control">
{tmpl_var name='ip_type'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="ip_address">{tmpl_var name='ip_address_txt'}</label>
- <input name="ip_address" id="ip_address" value="{tmpl_var name='ip_address'}" size="15" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='virtualhost_txt'}</p>
- <div class="multiField">
+ </div></div>
+ <div class="form-group">
+ <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" name="ip_address" id="ip_address" value="{tmpl_var name='ip_address'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='virtualhost_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='virtualhost'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="virtualhost_port">{tmpl_var name='virtualhost_port_txt'}</label>
- <input name="virtualhost_port" id="virtualhost_port" value="{tmpl_var name='virtualhost_port'}" size="15" maxlength="15" type="text" class="textInput" />
- </div>
- </fieldset>
+ <div class="form-group">
+ <label for="virtualhost_port" class="col-sm-3 control-label">{tmpl_var name='virtualhost_port_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="virtualhost_port" id="virtualhost_port" value="{tmpl_var name='virtualhost_port'}" class="form-control" />
+ </div></div>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_ip_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/server_ip_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_ip_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_ip_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/admin/templates/server_ip_list.htm b/interface/web/admin/templates/server_ip_list.htm
index d83724c..211f721 100644
--- a/interface/web/admin/templates/server_ip_list.htm
+++ b/interface/web/admin/templates/server_ip_list.htm
@@ -1,53 +1,53 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
-<div class="panel panel_list_server_ip">
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('admin/server_ip_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="admin/server_ip_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
- <th class="tbl_col_ip_type" scope="col"><tmpl_var name="ip_type_txt"></th>
- <th class="tbl_col_ip_address" scope="col"><tmpl_var name="ip_address_txt"></th>
- <th class="tbl_col_virtualhost" scope="col"><tmpl_var name="virtualhost_txt"></th>
- <th class="tbl_col_virtualhost_port" scope="col"><tmpl_var name="virtualhost_port_txt"></th>
- <th class="tbl_col_buttons" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="server_id_txt"></th>
+ <th><tmpl_var name="client_id_txt"></th>
+ <th><tmpl_var name="ip_type_txt"></th>
+ <th><tmpl_var name="ip_address_txt"></th>
+ <th><tmpl_var name="virtualhost_txt"></th>
+ <th><tmpl_var name="virtualhost_port_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_client_id"><select name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
- <td class="tbl_col_ip_type"><select name="search_ip_type">{tmpl_var name='search_ip_type'}</select></td>
- <td class="tbl_col_ip_address"><input type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" /></td>
- <td class="tbl_col_virtualhost"><select name="search_virtualhost">{tmpl_var name='search_virtualhost'}</select></td>
- <td class="tbl_col_virtualhost_port"><input type="text" name="search_virtualhost_port" value="{tmpl_var name='search_virtualhost_port'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/server_ip_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <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><div class="col-sm-9"><input type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" /></div></td>
+ <td><select name="search_virtualhost">{tmpl_var name='search_virtualhost'}</select></td>
+ <td><div class="col-sm-9"><input type="text" name="search_virtualhost_port" value="{tmpl_var name='search_virtualhost_port'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/server_ip_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_client_id"><a href="#" onclick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
- <td class="tbl_col_ip_type"><a href="#" onclick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ip_type"}</a></td>
- <td class="tbl_col_ip_address"><a href="#" onclick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ip_address"}</a></td>
- <td class="tbl_col_virtualhost"><a href="#" onclick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="virtualhost"}</a></td>
- <td class="tbl_col_virtualhost_port"><a href="#" onclick="loadContent('admin/server_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="virtualhost_port"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="admin/server_ip_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
+ <td><a href="#" data-load-content="admin/server_ip_edit.php?id={tmpl_var name='id'}">{tmpl_var name="client_id"}</a></td>
+ <td><a href="#" data-load-content="admin/server_ip_edit.php?id={tmpl_var name='id'}">{tmpl_var name="ip_type"}</a></td>
+ <td><a href="#" data-load-content="admin/server_ip_edit.php?id={tmpl_var name='id'}">{tmpl_var name="ip_address"}</a></td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -59,11 +59,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="7"><tmpl_var name="paging"></td>
+ <td colspan="7"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/admin/templates/server_list.htm b/interface/web/admin/templates/server_list.htm
index 3545e32..666bc2b 100644
--- a/interface/web/admin/templates/server_list.htm
+++ b/interface/web/admin/templates/server_list.htm
@@ -1,47 +1,48 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_server">
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_server_name" scope="col"><tmpl_var name="server_name_txt"></th>
- <th class="tbl_col_mail_server" scope="col"><tmpl_var name="mail_server_txt"></th>
- <th class="tbl_col_web_server" scope="col"><tmpl_var name="web_server_txt"></th>
- <th class="tbl_col_dns_server" scope="col"><tmpl_var name="dns_server_txt"></th>
- <th class="tbl_col_file_server" scope="col"><tmpl_var name="file_server_txt"></th>
- <th class="tbl_col_db_server" scope="col"><tmpl_var name="db_server_txt"></th>
- <th class="tbl_col_vserver_server" scope="col"><tmpl_var name="vserver_server_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="server_name_txt"></th>
+ <th><tmpl_var name="mail_server_txt"></th>
+ <th><tmpl_var name="web_server_txt"></th>
+ <th><tmpl_var name="dns_server_txt"></th>
+ <th><tmpl_var name="file_server_txt"></th>
+ <th><tmpl_var name="db_server_txt"></th>
+ <th><tmpl_var name="vserver_server_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_server_name"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></td>
- <td class="tbl_col_mail_server"><select name="search_active">{tmpl_var name='search_mail_server'}</select></td>
- <td class="tbl_col_web_server"><select name="search_active">{tmpl_var name='search_web_server'}</select></td>
- <td class="tbl_col_dns_server"><select name="search_active">{tmpl_var name='search_dns_server'}</select></td>
- <td class="tbl_col_file_server"><select name="search_active">{tmpl_var name='search_file_server'}</select></td>
- <td class="tbl_col_db_server"><select name="search_active">{tmpl_var name='search_db_server'}</select></td>
- <td class="tbl_col_vserver_server"><select name="search_active">{tmpl_var name='search_vserver_server'}</select></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/server_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><div class="col-sm-9"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></div></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>
+ <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>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_server_name"><a href="#" onclick="loadContent('admin/server_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_name"}</a></td>
- <td class="tbl_col_mail_server">{tmpl_var name="mail_server"}</td>
- <td class="tbl_col_web_server">{tmpl_var name="web_server"}</td>
- <td class="tbl_col_dns_server">{tmpl_var name="dns_server"}</td>
- <td class="tbl_col_file_server">{tmpl_var name="file_server"}</td>
- <td class="tbl_col_db_server">{tmpl_var name="db_server"}</td>
- <td class="tbl_col_vserver_server">{tmpl_var name="vserver_server"}</td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" href="javascript: del_record('admin/server_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="admin/server_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_name"}</a></td>
+ <td>{tmpl_var name="mail_server"}</td>
+ <td>{tmpl_var name="web_server"}</td>
+ <td>{tmpl_var name="dns_server"}</td>
+ <td>{tmpl_var name="file_server"}</td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -53,11 +54,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="8"><tmpl_var name="paging"></td>
+ <td colspan="8"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+ </div>
\ No newline at end of file
diff --git a/interface/web/admin/templates/server_php_fastcgi_edit.htm b/interface/web/admin/templates/server_php_fastcgi_edit.htm
index bfc2978..d58be8f 100644
--- a/interface/web/admin/templates/server_php_fastcgi_edit.htm
+++ b/interface/web/admin/templates/server_php_fastcgi_edit.htm
@@ -1,26 +1,23 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_server_php">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="php_fastcgi_binary">{tmpl_var name='php_fastcgi_binary_txt'}</label>
- <input name="php_fastcgi_binary" id="php_fastcgi_binary" value="{tmpl_var name='php_fastcgi_binary'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="php_fastcgi_ini_dir">{tmpl_var name='php_fastcgi_ini_dir_txt'}</label>
- <input name="php_fastcgi_ini_dir" id="php_fastcgi_ini_dir" value="{tmpl_var name='php_fastcgi_ini_dir'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- </fieldset>
+
+ <div class="form-group">
+ <label for="php_fastcgi_binary" class="col-sm-3 control-label">{tmpl_var name='php_fastcgi_binary_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="php_fastcgi_binary" id="php_fastcgi_binary" value="{tmpl_var name='php_fastcgi_binary'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="php_fastcgi_ini_dir" class="col-sm-3 control-label">{tmpl_var name='php_fastcgi_ini_dir_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="php_fastcgi_ini_dir" id="php_fastcgi_ini_dir" value="{tmpl_var name='php_fastcgi_ini_dir'}" class="form-control" />
+ </div></div>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_php_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/server_php_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_php_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_php_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/admin/templates/server_php_fpm_edit.htm b/interface/web/admin/templates/server_php_fpm_edit.htm
index 869af3c..c538cf0 100644
--- a/interface/web/admin/templates/server_php_fpm_edit.htm
+++ b/interface/web/admin/templates/server_php_fpm_edit.htm
@@ -1,30 +1,27 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_server_php">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="php_fpm_init_script">{tmpl_var name='php_fpm_init_script_txt'}</label>
- <input name="php_fpm_init_script" id="php_fpm_init_script" value="{tmpl_var name='php_fpm_init_script'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="php_fpm_ini_dir">{tmpl_var name='php_fpm_ini_dir_txt'}</label>
- <input name="php_fpm_ini_dir" id="php_fpm_ini_dir" value="{tmpl_var name='php_fpm_ini_dir'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="php_fpm_pool_dir">{tmpl_var name='php_fpm_pool_dir_txt'}</label>
- <input name="php_fpm_pool_dir" id="php_fpm_pool_dir" value="{tmpl_var name='php_fpm_pool_dir'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- </fieldset>
+
+ <div class="form-group">
+ <label for="php_fpm_init_script" class="col-sm-3 control-label">{tmpl_var name='php_fpm_init_script_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="php_fpm_init_script" id="php_fpm_init_script" value="{tmpl_var name='php_fpm_init_script'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="php_fpm_ini_dir" class="col-sm-3 control-label">{tmpl_var name='php_fpm_ini_dir_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="php_fpm_ini_dir" id="php_fpm_ini_dir" value="{tmpl_var name='php_fpm_ini_dir'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="php_fpm_pool_dir" class="col-sm-3 control-label">{tmpl_var name='php_fpm_pool_dir_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="php_fpm_pool_dir" id="php_fpm_pool_dir" value="{tmpl_var name='php_fpm_pool_dir'}" class="form-control" />
+ </div></div>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_php_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/server_php_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_php_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_php_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/admin/templates/server_php_list.htm b/interface/web/admin/templates/server_php_list.htm
index f6b989c..2ed907f 100644
--- a/interface/web/admin/templates/server_php_list.htm
+++ b/interface/web/admin/templates/server_php_list.htm
@@ -1,44 +1,44 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
-<div class="panel panel_list_server_php">
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('admin/server_php_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="admin/server_php_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
- <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
- <th class="tbl_col_buttons" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="server_id_txt"></th>
+ <th><tmpl_var name="client_id_txt"></th>
+ <th><tmpl_var name="name_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_client_id"><select name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
- <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/server_php_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><select name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
+ <td><div class="col-sm-9"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/server_php_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_client_id"><a href="#" onclick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
- <td class="tbl_col_name"><a href="#" onclick="loadContent('admin/server_php_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="admin/server_php_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -50,11 +50,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+ <td colspan="4"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/admin/templates/server_php_name_edit.htm b/interface/web/admin/templates/server_php_name_edit.htm
index c1e02a1..e5ac65a 100644
--- a/interface/web/admin/templates/server_php_name_edit.htm
+++ b/interface/web/admin/templates/server_php_name_edit.htm
@@ -1,34 +1,31 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_server_php">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="server_id">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id" id="server_id" class="selectInput">
+
+ <div class="form-group">
+ <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
{tmpl_var name='server_id'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="client_id">{tmpl_var name='client_id_txt'}</label>
- <select name="client_id" id="client_id" class="selectInput">
+ </div></div>
+ <div class="form-group">
+ <label for="client_id" class="col-sm-3 control-label">{tmpl_var name='client_id_txt'}</label>
+ <div class="col-sm-9"><select name="client_id" id="client_id" class="form-control">
{tmpl_var name='client_id'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="name">{tmpl_var name='name_txt'}</label>
- <input name="name" id="name" value="{tmpl_var name='name'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- </fieldset>
+ </div></div>
+ <div class="form-group">
+ <label for="name" class="col-sm-3 control-label">{tmpl_var name='name_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="name" id="name" value="{tmpl_var name='name'}" class="form-control" />
+ </div></div>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_php_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/server_php_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_php_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_php_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/admin/templates/software_package_edit.htm b/interface/web/admin/templates/software_package_edit.htm
index c2a0254..e29647e 100644
--- a/interface/web/admin/templates/software_package_edit.htm
+++ b/interface/web/admin/templates/software_package_edit.htm
@@ -1,27 +1,23 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_software_package">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="package_title">{tmpl_var name='package_title_txt'}</label>
+
+
+ <div class="form-group">
+ <label for="package_title" class="col-sm-3 control-label">{tmpl_var name='package_title_txt'}</label>
{tmpl_var name='package_title'}<input name="package_title" id="package_title" value="{tmpl_var name='package_title'}" size="40" maxlength="40" type="hidden" class="textInput" />
</div>
- <div class="ctrlHolder">
- <label for="package_key">{tmpl_var name='package_key_txt'}</label>
- <input name="package_key" id="package_key" value="{tmpl_var name='package_key'}" size="40" maxlength="40" type="text" class="textInput" />
- </div>
+ <div class="form-group">
+ <label for="package_key" class="col-sm-3 control-label">{tmpl_var name='package_key_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="package_key" id="package_key" value="{tmpl_var name='package_key'}" class="form-control" />
+ </div></div>
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/software_package_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/software_package_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/software_package_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/software_package_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/admin/templates/software_package_install.htm b/interface/web/admin/templates/software_package_install.htm
index 3c28144..a24b3b9 100644
--- a/interface/web/admin/templates/software_package_install.htm
+++ b/interface/web/admin/templates/software_package_install.htm
@@ -1,4 +1,6 @@
-<h2><tmpl_var name="head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="head_txt"></h1>
+</div>
<p><tmpl_var name="desc_txt"></p>
<div class="panel panel_software_repo">
@@ -10,21 +12,21 @@
</tmpl_if>
<tmpl_if name="insert_key">
<div class="pnl_formsarea">
- <fieldset class="inlineLabels">
+
<p> </p>
- <div class="ctrlHolder">
- <label for="install_key">{tmpl_var name='install_key_txt'}</label>
- <input name="install_key" id="install_key" value="{tmpl_var name='install_key'}" size="40" maxlength="40" type="text" class="textInput" />
- </div>
+ <div class="form-group">
+ <label for="install_key" class="col-sm-3 control-label">{tmpl_var name='install_key_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="install_key" id="install_key" value="{tmpl_var name='install_key'}" class="form-control" />
+ </div></div>
<input type="hidden" name="package" value="{tmpl_var name='package_name'}">
<input type="hidden" name="server_id" value="{tmpl_var name='server_id'}">
<p> </p>
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/software_package_install.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/software_package_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </fieldset>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/software_package_install.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/software_package_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
+
</div>
</tmpl_if>
</div>
\ No newline at end of file
diff --git a/interface/web/admin/templates/software_package_list.htm b/interface/web/admin/templates/software_package_list.htm
index c15b79b..416e699 100644
--- a/interface/web/admin/templates/software_package_list.htm
+++ b/interface/web/admin/templates/software_package_list.htm
@@ -1,41 +1,41 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_package">
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('admin/software_package_list.php?action=repoupdate');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="admin/software_package_list.php?action=repoupdate">
<span>{tmpl_var name="repoupdate_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_installed" scope="col"><tmpl_var name="installed_txt"></th>
- <th class="tbl_col_package_title" scope="col"><tmpl_var name="package_title_txt"></th>
- <th class="tbl_col_package_description" scope="col"><tmpl_var name="package_description_txt"></th>
- <th class="tbl_col_package_id" scope="col"><tmpl_var name="package_id_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="installed_txt"></th>
+ <th><tmpl_var name="package_title_txt"></th>
+ <th><tmpl_var name="package_description_txt"></th>
+ <th><tmpl_var name="package_id_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tmpl_if name="has_packages">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_installed">{tmpl_var name="installed"}</td>
- <td class="tbl_col_package_title">{tmpl_var name="package_title"}</td>
- <td class="tbl_col_package_description">{tmpl_var name="package_description"}</td>
- <td class="tbl_col_package_id">ispapp{tmpl_var name="package_id"}</td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoEdit" href="javascript: loadContent('admin/software_package_edit.php?id={tmpl_var name='package_id'}');"><span>{tmpl_var name='edit_txt'}</span></a>
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <td>{tmpl_var name="installed"}</td>
+ <td>{tmpl_var name="package_title"}</td>
+ <td>{tmpl_var name="package_description"}</td>
+ <td>ispapp{tmpl_var name="package_id"}</td>
+ <td>
+ <a class="button icons16 icoEdit" data-load-content="admin/software_package_edit.php?id={tmpl_var name='package_id'}"><span>{tmpl_var name='edit_txt'}</span></a>
+ <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>
</td>
</tr>
</tmpl_if>
@@ -48,11 +48,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="5"></td>
+ <td colspan="5"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/admin/templates/software_repo_edit.htm b/interface/web/admin/templates/software_repo_edit.htm
index 2efa85e..544f7a9 100644
--- a/interface/web/admin/templates/software_repo_edit.htm
+++ b/interface/web/admin/templates/software_repo_edit.htm
@@ -1,40 +1,37 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_software_repo">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="repo_name">{tmpl_var name='repo_name_txt'}</label>
- <input name="repo_name" id="repo_name" value="{tmpl_var name='repo_name'}" size="40" maxlength="40" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="repo_url">{tmpl_var name='repo_url_txt'}</label>
- <input name="repo_url" id="repo_url" value="{tmpl_var name='repo_url'}" size="40" maxlength="40" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="repo_username">{tmpl_var name='repo_username_txt'}</label>
- <input name="repo_username" id="repo_username" value="{tmpl_var name='repo_username'}" size="30" maxlength="30" type="text" autocomplete="off" class="textInput formLengthHalf" />
- </div>
- <div class="ctrlHolder">
- <label for="repo_password">{tmpl_var name='repo_password_txt'}</label>
+
+
+ <div class="form-group">
+ <label for="repo_name" class="col-sm-3 control-label">{tmpl_var name='repo_name_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="repo_name" id="repo_name" value="{tmpl_var name='repo_name'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="repo_url" class="col-sm-3 control-label">{tmpl_var name='repo_url_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="repo_url" id="repo_url" value="{tmpl_var name='repo_url'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="repo_username" class="col-sm-3 control-label">{tmpl_var name='repo_username_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="repo_username" id="repo_username" value="{tmpl_var name='repo_username'}" autocomplete="off" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="repo_password" class="col-sm-3 control-label">{tmpl_var name='repo_password_txt'}</label>
<input name="repo_password" id="repo_password" value="{tmpl_var name='repo_password'}" size="30" maxlength="30" type="password" autocomplete="off" class="textInput formLengthHalf" />
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/software_repo_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/software_repo_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/software_repo_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/software_repo_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/admin/templates/software_repo_list.htm b/interface/web/admin/templates/software_repo_list.htm
index 1a7964b..b443ce6 100644
--- a/interface/web/admin/templates/software_repo_list.htm
+++ b/interface/web/admin/templates/software_repo_list.htm
@@ -1,45 +1,45 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_software_repo">
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('admin/software_repo_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="admin/software_repo_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_repo_name" scope="col"><tmpl_var name="repo_name_txt"></th>
- <th class="tbl_col_repo_url" scope="col"><tmpl_var name="repo_url_txt"></th>
- <th class="tbl_col_buttons" scope="col"> </th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="active_txt"></th>
+ <th><tmpl_var name="repo_name_txt"></th>
+ <th><tmpl_var name="repo_url_txt"></th>
+ <th> </th>
</tr>
- <tr class="filter">
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_repo_name"><input type="text" name="search_repo_name" value="{tmpl_var name='search_repo_name'}" /></td>
- <td class="tbl_col_repo_url"><input type="text" name="search_repo_url" value="{tmpl_var name='search_repo_url'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/software_repo_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><select name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><div class="col-sm-9"><input type="text" name="search_repo_name" value="{tmpl_var name='search_repo_name'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_repo_url" value="{tmpl_var name='search_repo_url'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/software_repo_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('admin/software_repo_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_repo_name"><a href="#" onclick="loadContent('admin/software_repo_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="repo_name"}</a></td>
- <td class="tbl_col_repo_url"><a href="#" onclick="loadContent('admin/software_repo_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="repo_url"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="admin/software_repo_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -51,11 +51,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+ <td colspan="4"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/admin/templates/software_update_list.htm b/interface/web/admin/templates/software_update_list.htm
index 1b49e9e..c1b88d0 100644
--- a/interface/web/admin/templates/software_update_list.htm
+++ b/interface/web/admin/templates/software_update_list.htm
@@ -1,39 +1,40 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_software_update">
- <div class="pnl_toolsarea">
- <fieldset class="inlineLabels"><legend>Tools</legend>
- <div class="buttons">
- <div class="ctrlHolder">
- <label for="server_id">{tmpl_var name='server_select_txt'}</label>
- <select name="server_id" id="server_id" class="selectInput" onChange="submitForm('pageForm','admin/software_update_list.php');">
+ <legend>Tools</legend>
+
+ <div class="form-group">
+ <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_select_txt'}</label>
+ <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control" onChange="submitForm('pageForm','admin/software_update_list.php');">
<tmpl_loop name="servers">
<option value="{tmpl_var name='server_id'}" {tmpl_var name='selected'}>{tmpl_var name='server_name'}</option>
</tmpl_loop>
</select>
- </div>
+
</div>
- </fieldset>
+
</div>
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_installed" scope="col"><tmpl_var name="installed_txt"></th>
- <th class="tbl_col_update_title" scope="col"><tmpl_var name="update_title_txt"></th>
- <th class="tbl_col_version" scope="col"><tmpl_var name="version_txt"></th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="installed_txt"></th>
+ <th><tmpl_var name="update_title_txt"></th>
+ <th><tmpl_var name="version_txt"></th>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_installed">{tmpl_var name="installed"}</td>
- <td class="tbl_col_update_title">{tmpl_var name="update_title"}</td>
- <td class="tbl_col_version">{tmpl_var name="version"}</td>
+ <td>{tmpl_var name="installed"}</td>
+ <td>{tmpl_var name="update_title"}</td>
+ <td>{tmpl_var name="version"}</td>
</tr>
</tmpl_loop>
<tmpl_unless name="records">
@@ -44,11 +45,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="3"></td>
+ <td colspan="3"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/admin/templates/system_config_domains_edit.htm b/interface/web/admin/templates/system_config_domains_edit.htm
index 748729d..72a6638 100644
--- a/interface/web/admin/templates/system_config_domains_edit.htm
+++ b/interface/web/admin/templates/system_config_domains_edit.htm
@@ -1,33 +1,30 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_system_config">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
+
+
+ <div class="form-group">
<div style="float:left;width:100%">
<p class="label" style="width:270px">{tmpl_var name='use_domain_module_txt'}</p>
- <div class="multiField">
+ <div class="col-sm-9">
{tmpl_var name='use_domain_module'}
</div>
</div>
<div style="float:left;width:500px;margin-top:20px">{tmpl_var name='use_domain_module_hint'}</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='new_domain_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='new_domain_txt'}</label>
+ <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>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/system_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/users_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/system_config_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/users_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/admin/templates/system_config_mail_edit.htm b/interface/web/admin/templates/system_config_mail_edit.htm
index b231495..ec2f70d 100644
--- a/interface/web/admin/templates/system_config_mail_edit.htm
+++ b/interface/web/admin/templates/system_config_mail_edit.htm
@@ -1,104 +1,101 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_system_config">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='enable_custom_login_txt'}</p>
- <div class="multiField">
+
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='enable_custom_login_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='enable_custom_login'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='mailbox_show_autoresponder_tab_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='mailbox_show_autoresponder_tab_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='mailbox_show_autoresponder_tab'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='mailbox_show_mail_filter_tab_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='mailbox_show_mail_filter_tab_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='mailbox_show_mail_filter_tab'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='mailbox_show_custom_rules_tab_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='mailbox_show_custom_rules_tab_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='mailbox_show_custom_rules_tab'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='mailboxlist_webmail_link_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='mailboxlist_webmail_link_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='mailboxlist_webmail_link'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="webmail_url">{tmpl_var name='webmail_url_txt'}</label>
- <input name="webmail_url" id="webmail_url" value="{tmpl_var name='webmail_url'}" size="30" maxlength="255" type="text" class="textInput" /> {tmpl_var name='webmail_url_note_txt'} <a href="javascript:void(0);" class="addPlaceholder">[SERVERNAME]</a>
+ <div class="form-group">
+ <label for="webmail_url" class="col-sm-3 control-label">{tmpl_var name='webmail_url_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="webmail_url" id="webmail_url" value="{tmpl_var name='webmail_url'}" class="form-control" /> {tmpl_var name='webmail_url_note_txt'} </div><a href="javascript:void(0);" class="addPlaceholder">[SERVERNAME]</a>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='mailmailinglist_link_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='mailmailinglist_link_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='mailmailinglist_link'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="mailmailinglist_url">{tmpl_var name='mailmailinglist_url_txt'}</label>
- <input name="mailmailinglist_url" id="mailmailinglist_url" value="{tmpl_var name='mailmailinglist_url'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="admin_mail">{tmpl_var name='admin_mail_txt'}</label>
- <input name="admin_mail" id="admin_mail" value="{tmpl_var name='admin_mail'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="admin_name">{tmpl_var name='admin_name_txt'}</label>
- <input name="admin_name" id="admin_name" value="{tmpl_var name='admin_name'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='smtp_enabled_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label for="mailmailinglist_url" class="col-sm-3 control-label">{tmpl_var name='mailmailinglist_url_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="mailmailinglist_url" id="mailmailinglist_url" value="{tmpl_var name='mailmailinglist_url'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="admin_mail" class="col-sm-3 control-label">{tmpl_var name='admin_mail_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="admin_mail" id="admin_mail" value="{tmpl_var name='admin_mail'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="admin_name" class="col-sm-3 control-label">{tmpl_var name='admin_name_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="admin_name" id="admin_name" value="{tmpl_var name='admin_name'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='smtp_enabled_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='smtp_enabled'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="smtp_host">{tmpl_var name='smtp_host_txt'}</label>
- <input name="smtp_host" id="smtp_host" value="{tmpl_var name='smtp_host'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="smtp_port">{tmpl_var name='smtp_port_txt'}</label>
- <input name="smtp_port" id="smtp_port" value="{tmpl_var name='smtp_port'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="smtp_user">{tmpl_var name='smtp_user_txt'}</label>
- <input name="smtp_user" id="smtp_user" value="{tmpl_var name='smtp_user'}" size="30" maxlength="255" type="text" autocomplete="off" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="smtp_pass">{tmpl_var name='smtp_pass_txt'}</label>
+ <div class="form-group">
+ <label for="smtp_host" class="col-sm-3 control-label">{tmpl_var name='smtp_host_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="smtp_host" id="smtp_host" value="{tmpl_var name='smtp_host'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="smtp_port" class="col-sm-3 control-label">{tmpl_var name='smtp_port_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="smtp_port" id="smtp_port" value="{tmpl_var name='smtp_port'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="smtp_user" class="col-sm-3 control-label">{tmpl_var name='smtp_user_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="smtp_user" id="smtp_user" value="{tmpl_var name='smtp_user'}" autocomplete="off" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="smtp_pass" class="col-sm-3 control-label">{tmpl_var name='smtp_pass_txt'}</label>
<input name="smtp_pass" id="smtp_pass" value="" size="30" maxlength="255" type="password" autocomplete="off" class="textInput" />
</div>
- <div class="ctrlHolder">
- <label for="smtp_crypt">{tmpl_var name='smtp_crypt_txt'}</label>
- <select name="smtp_crypt" id="smtp_crypt" class="selectInput formLengthHalf">
+ <div class="form-group">
+ <label for="smtp_crypt" class="col-sm-3 control-label">{tmpl_var name='smtp_crypt_txt'}</label>
+ <div class="col-sm-9"><select name="smtp_crypt" id="smtp_crypt" class="form-control">
{tmpl_var name='smtp_crypt'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="default_mailserver">{tmpl_var name='default_mailserver_txt'}</label>
- <select name="default_mailserver" id="default_mailserver" class="selectInput">
+ </div></div>
+ <div class="form-group">
+ <label for="default_mailserver" class="col-sm-3 control-label">{tmpl_var name='default_mailserver_txt'}</label>
+ <div class="col-sm-9"><select name="default_mailserver" id="default_mailserver" class="form-control">
{tmpl_var name='default_mailserver'}
</select>
- </div>
- </fieldset>
+ </div></div>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/system_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/users_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/system_config_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/users_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
diff --git a/interface/web/admin/templates/system_config_misc_edit.htm b/interface/web/admin/templates/system_config_misc_edit.htm
index 2fd6eef..8910b85 100644
--- a/interface/web/admin/templates/system_config_misc_edit.htm
+++ b/interface/web/admin/templates/system_config_misc_edit.htm
@@ -1,118 +1,115 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_system_config">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>Misc</legend>
- <div class="ctrlHolder">
- <label for="dashboard_atom_url_admin">{tmpl_var name='dashboard_atom_url_admin_txt'}</label>
- <input name="dashboard_atom_url_admin" id="dashboard_atom_url_admin" value="{tmpl_var name='dashboard_atom_url_admin'}" size="" maxlength="" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="dashboard_atom_url_reseller">{tmpl_var name='dashboard_atom_url_reseller_txt'}</label>
- <input name="dashboard_atom_url_reseller" id="dashboard_atom_url_reseller" value="{tmpl_var name='dashboard_atom_url_reseller'}" size="" maxlength="" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="dashboard_atom_url_client">{tmpl_var name='dashboard_atom_url_client_txt'}</label>
- <input name="dashboard_atom_url_client" id="dashboard_atom_url_client" value="{tmpl_var name='dashboard_atom_url_client'}" size="" maxlength="" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="monitor_key">{tmpl_var name='monitor_key_txt'}</label>
- <input name="monitor_key" id="monitor_key" value="{tmpl_var name='monitor_key'}" size="" maxlength="" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="admin_dashlets_left">{tmpl_var name='admin_dashlets_left_txt'}</label>
- <input name="admin_dashlets_left" id="admin_dashlets_left" value="{tmpl_var name='admin_dashlets_left'}" size="" maxlength="" type="text" class="textInput" /> {tmpl_var name='available_dashlets_note_txt'} {tmpl_var name="available_dashlets_txt"}
- </div>
- <div class="ctrlHolder">
- <label for="admin_dashlets_right">{tmpl_var name='admin_dashlets_right_txt'}</label>
- <input name="admin_dashlets_right" id="admin_dashlets_right" value="{tmpl_var name='admin_dashlets_right'}" size="" maxlength="" type="text" class="textInput" /> {tmpl_var name='available_dashlets_note_txt'} {tmpl_var name="available_dashlets_txt"}
- </div>
- <div class="ctrlHolder">
- <label for="reseller_dashlets_left">{tmpl_var name='reseller_dashlets_left_txt'}</label>
- <input name="reseller_dashlets_left" id="reseller_dashlets_left" value="{tmpl_var name='reseller_dashlets_left'}" size="" maxlength="" type="text" class="textInput" /> {tmpl_var name='available_dashlets_note_txt'} {tmpl_var name="available_dashlets_txt"}
- </div>
- <div class="ctrlHolder">
- <label for="reseller_dashlets_right">{tmpl_var name='reseller_dashlets_right_txt'}</label>
- <input name="reseller_dashlets_right" id="reseller_dashlets_right" value="{tmpl_var name='reseller_dashlets_right'}" size="" maxlength="" type="text" class="textInput" /> {tmpl_var name='available_dashlets_note_txt'} {tmpl_var name="available_dashlets_txt"}
- </div>
- <div class="ctrlHolder">
- <label for="client_dashlets_left">{tmpl_var name='client_dashlets_left_txt'}</label>
- <input name="client_dashlets_left" id="client_dashlets_left" value="{tmpl_var name='client_dashlets_left'}" size="" maxlength="" type="text" class="textInput" /> {tmpl_var name='available_dashlets_note_txt'} {tmpl_var name="available_dashlets_txt"}
- </div>
- <div class="ctrlHolder">
- <label for="client_dashlets_right">{tmpl_var name='client_dashlets_right_txt'}</label>
- <input name="client_dashlets_right" id="client_dashlets_right" value="{tmpl_var name='client_dashlets_right'}" size="" maxlength="" type="text" class="textInput" /> {tmpl_var name='available_dashlets_note_txt'} {tmpl_var name="available_dashlets_txt"}
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='tab_change_discard_txt'}</p>
- <div class="multiField">
+
+ <legend>Misc</legend>
+ <div class="form-group">
+ <label for="dashboard_atom_url_admin" class="col-sm-3 control-label">{tmpl_var name='dashboard_atom_url_admin_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="dashboard_atom_url_admin" id="dashboard_atom_url_admin" value="{tmpl_var name='dashboard_atom_url_admin'}" size="" maxlength="" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="dashboard_atom_url_reseller" class="col-sm-3 control-label">{tmpl_var name='dashboard_atom_url_reseller_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="dashboard_atom_url_reseller" id="dashboard_atom_url_reseller" value="{tmpl_var name='dashboard_atom_url_reseller'}" size="" maxlength="" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="dashboard_atom_url_client" class="col-sm-3 control-label">{tmpl_var name='dashboard_atom_url_client_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="dashboard_atom_url_client" id="dashboard_atom_url_client" value="{tmpl_var name='dashboard_atom_url_client'}" size="" maxlength="" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="monitor_key" class="col-sm-3 control-label">{tmpl_var name='monitor_key_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="monitor_key" id="monitor_key" value="{tmpl_var name='monitor_key'}" size="" maxlength="" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="admin_dashlets_left" class="col-sm-3 control-label">{tmpl_var name='admin_dashlets_left_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="admin_dashlets_left" id="admin_dashlets_left" value="{tmpl_var name='admin_dashlets_left'}" size="" maxlength="" class="form-control" /> {tmpl_var name='available_dashlets_note_txt'} {tmpl_var name="available_dashlets_txt"}
+ </div></div>
+ <div class="form-group">
+ <label for="admin_dashlets_right" class="col-sm-3 control-label">{tmpl_var name='admin_dashlets_right_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="admin_dashlets_right" id="admin_dashlets_right" value="{tmpl_var name='admin_dashlets_right'}" size="" maxlength="" class="form-control" /> {tmpl_var name='available_dashlets_note_txt'} {tmpl_var name="available_dashlets_txt"}
+ </div></div>
+ <div class="form-group">
+ <label for="reseller_dashlets_left" class="col-sm-3 control-label">{tmpl_var name='reseller_dashlets_left_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="reseller_dashlets_left" id="reseller_dashlets_left" value="{tmpl_var name='reseller_dashlets_left'}" size="" maxlength="" class="form-control" /> {tmpl_var name='available_dashlets_note_txt'} {tmpl_var name="available_dashlets_txt"}
+ </div></div>
+ <div class="form-group">
+ <label for="reseller_dashlets_right" class="col-sm-3 control-label">{tmpl_var name='reseller_dashlets_right_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="reseller_dashlets_right" id="reseller_dashlets_right" value="{tmpl_var name='reseller_dashlets_right'}" size="" maxlength="" class="form-control" /> {tmpl_var name='available_dashlets_note_txt'} {tmpl_var name="available_dashlets_txt"}
+ </div></div>
+ <div class="form-group">
+ <label for="client_dashlets_left" class="col-sm-3 control-label">{tmpl_var name='client_dashlets_left_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="client_dashlets_left" id="client_dashlets_left" value="{tmpl_var name='client_dashlets_left'}" size="" maxlength="" class="form-control" /> {tmpl_var name='available_dashlets_note_txt'} {tmpl_var name="available_dashlets_txt"}
+ </div></div>
+ <div class="form-group">
+ <label for="client_dashlets_right" class="col-sm-3 control-label">{tmpl_var name='client_dashlets_right_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="client_dashlets_right" id="client_dashlets_right" value="{tmpl_var name='client_dashlets_right'}" size="" maxlength="" class="form-control" /> {tmpl_var name='available_dashlets_note_txt'} {tmpl_var name="available_dashlets_txt"}
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='tab_change_discard_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='tab_change_discard'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='tab_change_warning_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='tab_change_warning_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='tab_change_warning'}<br/>{tmpl_var name='tab_change_warning_note_txt'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='use_loadindicator_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='use_loadindicator_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='use_loadindicator'}<br/>{tmpl_var name='f5_to_reload_js_txt'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='use_combobox_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='use_combobox_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='use_combobox'}<br/>{tmpl_var name='f5_to_reload_js_txt'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="customer_no_template">{tmpl_var name='customer_no_template_txt'}</label>
- <input name="customer_no_template" id="customer_no_template" value="{tmpl_var name='customer_no_template'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
- </div>
- <div class="ctrlHolder">
- <label for="customer_no_start">{tmpl_var name='customer_no_start_txt'}</label>
- <input name="customer_no_start" id="customer_no_start" value="{tmpl_var name='customer_no_start'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
- </div>
- <div class="ctrlHolder">
- <label for="customer_no_counter">{tmpl_var name='customer_no_counter_txt'}</label>
- <input name="customer_no_counter" id="customer_no_counter" value="{tmpl_var name='customer_no_counter'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
- </div>
- <div class="ctrlHolder">
- <label for="session_timeout">{tmpl_var name='session_timeout_txt'}</label>
- <input name="session_timeout" id="session_timeout" value="{tmpl_var name='session_timeout'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='session_allow_endless_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label for="customer_no_template" class="col-sm-3 control-label">{tmpl_var name='customer_no_template_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="customer_no_template" id="customer_no_template" value="{tmpl_var name='customer_no_template'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="customer_no_start" class="col-sm-3 control-label">{tmpl_var name='customer_no_start_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="customer_no_start" id="customer_no_start" value="{tmpl_var name='customer_no_start'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="customer_no_counter" class="col-sm-3 control-label">{tmpl_var name='customer_no_counter_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="customer_no_counter" id="customer_no_counter" value="{tmpl_var name='customer_no_counter'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="session_timeout" class="col-sm-3 control-label">{tmpl_var name='session_timeout_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="session_timeout" id="session_timeout" value="{tmpl_var name='session_timeout'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='session_allow_endless_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='session_allow_endless'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="min_password_length">{tmpl_var name='min_password_length_txt'}</label>
- <input name="min_password_length" id="min_password_length" value="{tmpl_var name='min_password_length'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="min_password_strength">{tmpl_var name='min_password_strength_txt'}</label>
- <select name="min_password_strength" id="min_password_strength" class="selectInput formLengthHalf">
+ <div class="form-group">
+ <label for="min_password_length" class="col-sm-3 control-label">{tmpl_var name='min_password_length_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="min_password_length" id="min_password_length" value="{tmpl_var name='min_password_length'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="min_password_strength" class="col-sm-3 control-label">{tmpl_var name='min_password_strength_txt'}</label>
+ <div class="col-sm-9"><select name="min_password_strength" id="min_password_strength" class="form-control">
{tmpl_var name='min_password_strength'}
</select>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='maintenance_mode_txt'}</p>
- <div class="multiField">
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='maintenance_mode_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='maintenance_mode'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/system_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/server_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/system_config_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/admin/templates/system_config_sites_edit.htm b/interface/web/admin/templates/system_config_sites_edit.htm
index 7811b17..b9fa0c9 100644
--- a/interface/web/admin/templates/system_config_sites_edit.htm
+++ b/interface/web/admin/templates/system_config_sites_edit.htm
@@ -1,88 +1,85 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_system_config">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="dbname_prefix">{tmpl_var name='dbname_prefix_txt'}</label>
- <input name="dbname_prefix" id="dbname_prefix" value="{tmpl_var name='dbname_prefix'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
- </div>
- <div class="ctrlHolder">
- <label for="dbuser_prefix">{tmpl_var name='dbuser_prefix_txt'}</label>
- <input name="dbuser_prefix" id="dbuser_prefix" value="{tmpl_var name='dbuser_prefix'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
- </div>
- <div class="ctrlHolder">
- <label for="ftpuser_prefix">{tmpl_var name='ftpuser_prefix_txt'}</label>
- <input name="ftpuser_prefix" id="ftpuser_prefix" value="{tmpl_var name='ftpuser_prefix'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
- </div>
- <div class="ctrlHolder">
- <label for="shelluser_prefix">{tmpl_var name='shelluser_prefix_txt'}</label>
- <input name="shelluser_prefix" id="shelluser_prefix" value="{tmpl_var name='shelluser_prefix'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
- </div>
- <div class="ctrlHolder">
- <label for="webdavuser_prefix">{tmpl_var name='webdavuser_prefix_txt'}</label>
- <input name="webdavuser_prefix" id="webdavuser_prefix" value="{tmpl_var name='webdavuser_prefix'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='dblist_phpmyadmin_link_txt'}</p>
- <div class="multiField">
+
+
+ <div class="form-group">
+ <label for="dbname_prefix" class="col-sm-3 control-label">{tmpl_var name='dbname_prefix_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="dbname_prefix" id="dbname_prefix" value="{tmpl_var name='dbname_prefix'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="dbuser_prefix" class="col-sm-3 control-label">{tmpl_var name='dbuser_prefix_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="dbuser_prefix" id="dbuser_prefix" value="{tmpl_var name='dbuser_prefix'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="ftpuser_prefix" class="col-sm-3 control-label">{tmpl_var name='ftpuser_prefix_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="ftpuser_prefix" id="ftpuser_prefix" value="{tmpl_var name='ftpuser_prefix'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="shelluser_prefix" class="col-sm-3 control-label">{tmpl_var name='shelluser_prefix_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="shelluser_prefix" id="shelluser_prefix" value="{tmpl_var name='shelluser_prefix'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="webdavuser_prefix" class="col-sm-3 control-label">{tmpl_var name='webdavuser_prefix_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="webdavuser_prefix" id="webdavuser_prefix" value="{tmpl_var name='webdavuser_prefix'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='dblist_phpmyadmin_link_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='dblist_phpmyadmin_link'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="phpmyadmin_url">{tmpl_var name='phpmyadmin_url_txt'}</label>
- <input name="phpmyadmin_url" id="phpmyadmin_url" value="{tmpl_var name='phpmyadmin_url'}" size="30" maxlength="255" type="text" class="textInput" /> {tmpl_var name='phpmyadmin_url_note_txt'} <a href="javascript:void(0);" class="addPlaceholder">[SERVERNAME]</a>, <a href="javascript:void(0);" class="addPlaceholder">[DATABASENAME]</a>
+ <div class="form-group">
+ <label for="phpmyadmin_url" class="col-sm-3 control-label">{tmpl_var name='phpmyadmin_url_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="phpmyadmin_url" id="phpmyadmin_url" value="{tmpl_var name='phpmyadmin_url'}" class="form-control" /> {tmpl_var name='phpmyadmin_url_note_txt'} </div><a href="javascript:void(0);" class="addPlaceholder">[SERVERNAME]</a>, <a href="javascript:void(0);" class="addPlaceholder">[DATABASENAME]</a>
</div>
- <div class="ctrlHolder">
- <label for="webftp_url">{tmpl_var name='webftp_url_txt'}</label>
- <input name="webftp_url" id="webftp_url" value="{tmpl_var name='webftp_url'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='vhost_subdomains_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label for="webftp_url" class="col-sm-3 control-label">{tmpl_var name='webftp_url_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="webftp_url" id="webftp_url" value="{tmpl_var name='webftp_url'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='vhost_subdomains_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='vhost_subdomains'} {tmpl_var name='vhost_subdomains_note_txt'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='vhost_aliasdomains_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='vhost_aliasdomains_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='vhost_aliasdomains'} {tmpl_var name='vhost_aliasdomains_note_txt'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='client_username_web_check_disabled_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='client_username_web_check_disabled_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='client_username_web_check_disabled'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='reseller_can_use_options_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='reseller_can_use_options_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='reseller_can_use_options'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="default_webserver">{tmpl_var name='default_webserver_txt'}</label>
- <select name="default_webserver" id="default_webserver" class="selectInput">
+ <div class="form-group">
+ <label for="default_webserver" class="col-sm-3 control-label">{tmpl_var name='default_webserver_txt'}</label>
+ <div class="col-sm-9"><select name="default_webserver" id="default_webserver" class="form-control">
{tmpl_var name='default_webserver'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="default_dbserver">{tmpl_var name='default_dbserver_txt'}</label>
- <select name="default_dbserver" id="default_dbserver" class="selectInput">
+ </div></div>
+ <div class="form-group">
+ <label for="default_dbserver" class="col-sm-3 control-label">{tmpl_var name='default_dbserver_txt'}</label>
+ <div class="col-sm-9"><select name="default_dbserver" id="default_dbserver" class="form-control">
{tmpl_var name='default_dbserver'}
</select>
- </div>
- </fieldset>
+ </div></div>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/system_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/users_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/system_config_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/users_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
diff --git a/interface/web/admin/templates/tpl_default_basic.htm b/interface/web/admin/templates/tpl_default_basic.htm
index a525331..66dc914 100644
--- a/interface/web/admin/templates/tpl_default_basic.htm
+++ b/interface/web/admin/templates/tpl_default_basic.htm
@@ -1,23 +1,20 @@
-<h2><tmpl_var name="tpl_default_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="tpl_default_head_txt"></h1>
+</div>
<p><tmpl_var name="tpl_default_desc_txt"></p>
-<div class="panel panel_tools_interface">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="logo_url">{tmpl_var name='logo_url_txt'}Logo URL</label>
- <input name="logo_url" id="logo_url" value="{tmpl_var name='logo_url'}" size="" maxlength="" type="text" class="textInput" /> 152x46px
- </div>
- </fieldset>
+
+ <div class="form-group">
+ <label for="logo_url" class="col-sm-3 control-label">{tmpl_var name='logo_url_txt'}Logo URL</label>
+ <div class="col-sm-9"><input type="text" name="logo_url" id="logo_url" value="{tmpl_var name='logo_url'}" size="" maxlength="" class="form-control" /> 152x46px
+ </div></div>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input type="hidden" name="username" value="global">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/tpl_default.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/server_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/tpl_default.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/admin/templates/users_groups_edit.htm b/interface/web/admin/templates/users_groups_edit.htm
index 3d3644d..18b2ea0 100644
--- a/interface/web/admin/templates/users_groups_edit.htm
+++ b/interface/web/admin/templates/users_groups_edit.htm
@@ -1,30 +1,27 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_users">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="default_group">{tmpl_var name='default_group_txt'}</label>
- <select name="default_group" id="default_group" class="selectInput">
+
+
+ <div class="form-group">
+ <label for="default_group" class="col-sm-3 control-label">{tmpl_var name='default_group_txt'}</label>
+ <div class="col-sm-9"><select name="default_group" id="default_group" class="form-control">
{tmpl_var name='default_group'}
</select>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='groups_txt'}</p>
- <div class="multiField">
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='groups_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='groups'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/users_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/users_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/users_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/users_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/admin/templates/users_list.htm b/interface/web/admin/templates/users_list.htm
index cac25f5..45fd9a7 100644
--- a/interface/web/admin/templates/users_list.htm
+++ b/interface/web/admin/templates/users_list.htm
@@ -1,51 +1,51 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_users">
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('admin/users_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="admin/users_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
<p><tmpl_var name="warning_txt"></p>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
- <th class="tbl_col_groups" scope="col"><tmpl_var name="groups_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="client_id_txt"></th>
+ <th><tmpl_var name="active_txt"></th>
+ <th><tmpl_var name="username_txt"></th>
+ <th><tmpl_var name="groups_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_client_id"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></td>
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
- <td class="tbl_col_groups"><select name="search_groups">{tmpl_var name='search_groups'}</select></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/users_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><div class="col-sm-9"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></div></td>
+ <td><select name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><div class="col-sm-9"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></div></td>
+ <td><select name="search_groups">{tmpl_var name='search_groups'}</select></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/users_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_client_id"><a href="#" onclick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
- <td class="tbl_col_active"><a href="#" onclick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_username"><div class="icons16 group-{tmpl_var name="typ"}" title="{tmpl_var name="typ"}"><span>{tmpl_var name="typ"}</span></div> <div class="group-icon"><a href="#" onclick="loadContent('admin/users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></div></td>
- <td class="tbl_col_groups">{tmpl_var name="groups"}</td>
- <td class="tbl_col_buttons">
+ <td><a href="#" data-load-content="admin/users_edit.php?id={tmpl_var name='id'}">{tmpl_var name="client_id"}</a></td>
+ <td><a href="#" data-load-content="admin/users_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
+ <td><div class="icons16 group-{tmpl_var name="typ"}" title="{tmpl_var name="typ"}"><span>{tmpl_var name="typ"}</span></div> <div class="group-icon"><a href="#" data-load-content="admin/users_edit.php?id={tmpl_var name='id'}">{tmpl_var name="username"}</a></div></td>
+ <td>{tmpl_var name="groups"}</td>
+ <td>
<tmpl_if name="username" op="!=" value="admin">
- <a class="button icons16 icoLoginAs" href="javascript: loadContent('login/login_as.php?cid={tmpl_var name='client_id'}');"><span>{tmpl_var name='login_as_txt'}</span></a>
- <a class="button icons16 icoDelete" href="javascript: del_record('admin/users_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+ <a class="button icons16 icoLoginAs" data-load-content="login/login_as.php?cid={tmpl_var name='client_id'}"><span>{tmpl_var name='login_as_txt'}</span></a>
+ <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>
</tmpl_if>
</td>
</tr>
@@ -58,11 +58,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+ <td colspan="5"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/admin/templates/users_user_edit.htm b/interface/web/admin/templates/users_user_edit.htm
index 91c35bb..068eedc 100644
--- a/interface/web/admin/templates/users_user_edit.htm
+++ b/interface/web/admin/templates/users_user_edit.htm
@@ -1,79 +1,76 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_users">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="username">{tmpl_var name='username_txt'}</label>
- <input name="username" id="username" value="{tmpl_var name='username'}" size="15" maxlength="30" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="passwort">{tmpl_var name='passwort_txt'}</label>
+
+
+ <div class="form-group">
+ <label for="username" class="col-sm-3 control-label">{tmpl_var name='username_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="username" id="username" value="{tmpl_var name='username'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="passwort" class="col-sm-3 control-label">{tmpl_var name='passwort_txt'}</label>
<input name="passwort" id="passwort" value="{tmpl_var name='passwort'}" size="15" maxlength="100" type="password" class="textInput" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('passwort','repeat_password');"/> <a href="javascript:void(0);" onclick="generatePassword('passwort','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='password_strength_txt'}</p>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='password_strength_txt'}</label>
<div id="passBar"></div>
<p class="formHint"><span id="passText"> </span></p>
</div>
- <div class="ctrlHolder">
- <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+ <div class="form-group">
+ <label for="repeat_password" class="col-sm-3 control-label">{tmpl_var name='repeat_password_txt'}</label>
<input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;" autocomplete="off" onkeyup="checkPassMatch('passwort','repeat_password');" />
</div>
<div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
<div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='modules_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='modules_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='modules'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="startmodule">{tmpl_var name='startmodule_txt'}</label>
- <select name="startmodule" id="startmodule" class="selectInput formLengthHalf">
+ <div class="form-group">
+ <label for="startmodule" class="col-sm-3 control-label">{tmpl_var name='startmodule_txt'}</label>
+ <div class="col-sm-9"><select name="startmodule" id="startmodule" class="form-control">
{tmpl_var name='startmodule'}
</select>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='app_theme_txt'}</p>
- <div class="multiField">
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='app_theme_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='app_theme'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='typ_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='typ_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='typ'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="language">{tmpl_var name='language_txt'}</label>
- <select name="language" id="language" class="selectInput flags">
+ <div class="form-group">
+ <label for="language" class="col-sm-3 control-label">{tmpl_var name='language_txt'}</label>
+ <div class="col-sm-9"><select name="language" id="language" class="form-control">
{tmpl_var name='language'}
</select>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='lost_password_function_txt'}</p>
- <div class="multiField">
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='lost_password_function_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='lost_password_function'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/users_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/users_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/users_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/users_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
diff --git a/interface/web/client/templates/client_circle_edit.htm b/interface/web/client/templates/client_circle_edit.htm
index 95c5f32..3080b3c 100644
--- a/interface/web/client/templates/client_circle_edit.htm
+++ b/interface/web/client/templates/client_circle_edit.htm
@@ -1,39 +1,36 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_client">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>{tmpl_var name='circle_txt'}</legend>
- <div class="ctrlHolder">
- <label for="circle_name">{tmpl_var name='circle_name_txt'}*</label>
- <input name="circle_name" id="circle_name" value="{tmpl_var name='circle_name'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='client_ids_txt'}</p>
- <div class="multiField">
+ <legend>{tmpl_var name='circle_txt'}</legend>
+ <div class="form-group">
+ <label for="circle_name" class="col-sm-3 control-label">{tmpl_var name='circle_name_txt'}*</label>
+ <div class="col-sm-9"><input type="text" name="circle_name" id="circle_name" value="{tmpl_var name='circle_name'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='client_ids_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='client_ids'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="description">{tmpl_var name='description_txt'}</label>
+ <div class="form-group">
+ <label for="description" class="col-sm-3 control-label">{tmpl_var name='description_txt'}</label>
<textarea name="description" id="description" rows='10' cols='30'>{tmpl_var name='description'}</textarea>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
{tmpl_var name='required_fields_txt'}
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','client/client_circle_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('client/client_circle_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','client/client_circle_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="client/client_circle_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/client/templates/client_circle_list.htm b/interface/web/client/templates/client_circle_list.htm
index a0d7991..a9b3de4 100644
--- a/interface/web/client/templates/client_circle_list.htm
+++ b/interface/web/client/templates/client_circle_list.htm
@@ -1,48 +1,48 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_clients">
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('client/client_circle_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="client/client_circle_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_circle_id" scope="col"><tmpl_var name="circle_id_txt"></th>
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_circle_name" scope="col"><tmpl_var name="circle_name_txt"></th>
- <th class="tbl_col_description" scope="col"><tmpl_var name="description_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="circle_id_txt"></th>
+ <th><tmpl_var name="active_txt"></th>
+ <th><tmpl_var name="circle_name_txt"></th>
+ <th><tmpl_var name="description_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_circle_pid"><input type="text" name="search_circle_id" value="{tmpl_var name='search_circle_id'}" /></td>
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_circle_name"><input type="text" name="search_circle_name" value="{tmpl_var name='search_circle_name'}" /></td>
- <td class="tbl_col_description"><input type="text" name="search_description" value="{tmpl_var name='search_description'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','client/client_circle_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><div class="col-sm-9"><input type="text" name="search_circle_id" value="{tmpl_var name='search_circle_id'}" /></div></td>
+ <td><select name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><div class="col-sm-9"><input type="text" name="search_circle_name" value="{tmpl_var name='search_circle_name'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_description" value="{tmpl_var name='search_description'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','client/client_circle_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_circle_pid"><a href="#" onclick="loadContent('client/client_circle_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="circle_id"}</a></td>
- <td class="tbl_col_active"><a href="#" onclick="loadContent('client/client_circle_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_circle_name"><a href="#" onclick="loadContent('client/client_circle_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="circle_name"}</a></td>
- <td class="tbl_col_description"><a href="#" onclick="loadContent('client/client_circle_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="description"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="client/client_circle_edit.php?id={tmpl_var name='id'}">{tmpl_var name="circle_id"}</a></td>
+ <td><a href="#" data-load-content="client/client_circle_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -54,11 +54,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+ <td colspan="5"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/client/templates/client_del.htm b/interface/web/client/templates/client_del.htm
index efde39d..68086a1 100644
--- a/interface/web/client/templates/client_del.htm
+++ b/interface/web/client/templates/client_del.htm
@@ -1,9 +1,9 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_client_del">
- <div class="pnl_formsarea">
<div id="OKMsg">
<tmpl_if name='number_records'>
@@ -16,14 +16,11 @@
</tmpl_if>
</div>
- <input type="checkbox" name="confirm" value="yes" /> <b><tmpl_var name="confirm_action_txt"></b>
+ <div class="col-sm-9"><input 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'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','client/client_del.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('client/client_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','client/client_del.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="client/client_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/client/templates/client_edit_address.htm b/interface/web/client/templates/client_edit_address.htm
index b3c5757..2da3216 100644
--- a/interface/web/client/templates/client_edit_address.htm
+++ b/interface/web/client/templates/client_edit_address.htm
@@ -1,179 +1,176 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_client">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>Address</legend>
- <div class="ctrlHolder">
- <label for="company_name">{tmpl_var name='company_name_txt'}</label>
- <input name="company_name" id="company_name" value="{tmpl_var name='company_name'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="gender">{tmpl_var name='gender_txt'}</label>
- <select name="gender" id="gender" class="selectInput">
+ <legend>Address</legend>
+ <div class="form-group">
+ <label for="company_name" class="col-sm-3 control-label">{tmpl_var name='company_name_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="company_name" id="company_name" value="{tmpl_var name='company_name'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="gender" class="col-sm-3 control-label">{tmpl_var name='gender_txt'}</label>
+ <div class="col-sm-9"><select name="gender" id="gender" class="form-control">
{tmpl_var name='gender'}
</select>
+ </div></div>
+ <div class="form-group">
+ <label for="contact_firstname" class="col-sm-3 control-label">{tmpl_var name='contact_firstname_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="contact_firstname" id="contact_firstname" value="{tmpl_var name='contact_firstname'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="contact_name" class="col-sm-3 control-label">{tmpl_var name='contact_name_txt'}*</label>
+ <div class="col-sm-9"><input type="text" name="contact_name" id="contact_name" value="{tmpl_var name='contact_name'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="customer_no" class="col-sm-3 control-label">{tmpl_var name='customer_no_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="customer_no" id="customer_no" value="{tmpl_var name='customer_no'}" class="form-control" />
+ </div><input name="customer_no_org" id="customer_no_org" value="{tmpl_var name='customer_no'}" type="hidden" />
</div>
- <div class="ctrlHolder">
- <label for="contact_firstname">{tmpl_var name='contact_firstname_txt'}</label>
- <input name="contact_firstname" id="contact_firstname" value="{tmpl_var name='contact_firstname'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="contact_name">{tmpl_var name='contact_name_txt'}*</label>
- <input name="contact_name" id="contact_name" value="{tmpl_var name='contact_name'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="customer_no">{tmpl_var name='customer_no_txt'}</label>
- <input name="customer_no" id="customer_no" value="{tmpl_var name='customer_no'}" size="30" maxlength="255" type="text" class="textInput" />
- <input name="customer_no_org" id="customer_no_org" value="{tmpl_var name='customer_no'}" type="hidden" />
- </div>
- <div class="ctrlHolder">
- <label for="username">{tmpl_var name='username_txt'}*</label>
- <input name="username" id="username" value="{tmpl_var name='username'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="password">{tmpl_var name='password_txt'}</label>
+ <div class="form-group">
+ <label for="username" class="col-sm-3 control-label">{tmpl_var name='username_txt'}*</label>
+ <div class="col-sm-9"><input type="text" name="username" id="username" value="{tmpl_var name='username'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="password" class="col-sm-3 control-label">{tmpl_var name='password_txt'}</label>
<input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" /> <a href="javascript:void(0);" onclick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='password_strength_txt'}</p>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='password_strength_txt'}</label>
<div id="passBar"></div>
<p class="formHint"><span id="passText"> </span></p>
</div>
- <div class="ctrlHolder">
- <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+ <div class="form-group">
+ <label for="repeat_password" class="col-sm-3 control-label">{tmpl_var name='repeat_password_txt'}</label>
<input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;" autocomplete="off" onkeyup="checkPassMatch('password','repeat_password');" />
</div>
<div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
<div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
- <div class="ctrlHolder">
- <label for="language">{tmpl_var name='language_txt'}</label>
- <select name="language" id="language" class="selectInput flags">
+ <div class="form-group">
+ <label for="language" class="col-sm-3 control-label">{tmpl_var name='language_txt'}</label>
+ <div class="col-sm-9"><select name="language" id="language" class="form-control">
{tmpl_var name='language'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="usertheme">{tmpl_var name='usertheme_txt'}</label>
- <select name="usertheme" id="usertheme" class="selectInput">
+ </div></div>
+ <div class="form-group">
+ <label for="usertheme" class="col-sm-3 control-label">{tmpl_var name='usertheme_txt'}</label>
+ <div class="col-sm-9"><select name="usertheme" id="usertheme" class="form-control">
{tmpl_var name='usertheme'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="street">{tmpl_var name='street_txt'}</label>
- <input name="street" id="street" value="{tmpl_var name='street'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="zip">{tmpl_var name='zip_txt'}</label>
- <input name="zip" id="zip" value="{tmpl_var name='zip'}" size="10" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="city">{tmpl_var name='city_txt'}</label>
- <input name="city" id="city" value="{tmpl_var name='city'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="state">{tmpl_var name='state_txt'}</label>
- <input name="state" id="state" value="{tmpl_var name='state'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="country">{tmpl_var name='country_txt'}</label>
- <select name="country" id="country" class="selectInput flags">
+ </div></div>
+ <div class="form-group">
+ <label for="street" class="col-sm-3 control-label">{tmpl_var name='street_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="street" id="street" value="{tmpl_var name='street'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="zip" class="col-sm-3 control-label">{tmpl_var name='zip_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="zip" id="zip" value="{tmpl_var name='zip'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="city" class="col-sm-3 control-label">{tmpl_var name='city_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="city" id="city" value="{tmpl_var name='city'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="state" class="col-sm-3 control-label">{tmpl_var name='state_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="state" id="state" value="{tmpl_var name='state'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="country" class="col-sm-3 control-label">{tmpl_var name='country_txt'}</label>
+ <div class="col-sm-9"><select name="country" id="country" class="form-control">
{tmpl_var name='country'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="telephone">{tmpl_var name='telephone_txt'}</label>
- <input name="telephone" id="telephone" value="{tmpl_var name='telephone'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="mobile">{tmpl_var name='mobile_txt'}</label>
- <input name="mobile" id="mobile" value="{tmpl_var name='mobile'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="fax">{tmpl_var name='fax_txt'}</label>
- <input name="fax" id="fax" value="{tmpl_var name='fax'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="email">{tmpl_var name='email_txt'}</label>
- <input name="email" id="email" value="{tmpl_var name='email'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="internet">{tmpl_var name='internet_txt'}</label>
- <input name="internet" id="internet" value="{tmpl_var name='internet'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="icq">{tmpl_var name='icq_txt'}</label>
- <input name="icq" id="icq" value="{tmpl_var name='icq'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="vat_id">{tmpl_var name='vat_id_txt'}</label>
- <input name="vat_id" id="vat_id" value="{tmpl_var name='vat_id'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="company_id">{tmpl_var name='company_id_txt'}</label>
- <input name="company_id" id="company_id" value="{tmpl_var name='company_id'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="bank_account_owner">{tmpl_var name='bank_account_owner_txt'}</label>
- <input name="bank_account_owner" id="bank_account_owner" value="{tmpl_var name='bank_account_owner'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="bank_account_number">{tmpl_var name='bank_account_number_txt'}</label>
- <input name="bank_account_number" id="bank_account_number" value="{tmpl_var name='bank_account_number'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="bank_code">{tmpl_var name='bank_code_txt'}</label>
- <input name="bank_code" id="bank_code" value="{tmpl_var name='bank_code'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="bank_name">{tmpl_var name='bank_name_txt'}</label>
- <input name="bank_name" id="bank_name" value="{tmpl_var name='bank_name'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="bank_account_iban">{tmpl_var name='bank_account_iban_txt'}</label>
- <input name="bank_account_iban" id="bank_account_iban" value="{tmpl_var name='bank_account_iban'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="bank_account_swift">{tmpl_var name='bank_account_swift_txt'}</label>
- <input name="bank_account_swift" id="bank_account_swift" value="{tmpl_var name='bank_account_swift'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="paypal_email">{tmpl_var name='paypal_email_txt'}</label>
- <input name="paypal_email" id="paypal_email" value="{tmpl_var name='paypal_email'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="added_date">{tmpl_var name='added_date_txt'}</label>
- <input name="added_date" id="added_date" value="{tmpl_var name='added_date'}" size="10" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="added_by">{tmpl_var name='added_by_txt'}</label>
- <input name="added_by" id="added_by" value="{tmpl_var name='added_by'}" size="10" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="notes">{tmpl_var name='notes_txt'}</label>
+ </div></div>
+ <div class="form-group">
+ <label for="telephone" class="col-sm-3 control-label">{tmpl_var name='telephone_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="telephone" id="telephone" value="{tmpl_var name='telephone'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="mobile" class="col-sm-3 control-label">{tmpl_var name='mobile_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="mobile" id="mobile" value="{tmpl_var name='mobile'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="fax" class="col-sm-3 control-label">{tmpl_var name='fax_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="fax" id="fax" value="{tmpl_var name='fax'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="email" class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="email" id="email" value="{tmpl_var name='email'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="internet" class="col-sm-3 control-label">{tmpl_var name='internet_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="internet" id="internet" value="{tmpl_var name='internet'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="icq" class="col-sm-3 control-label">{tmpl_var name='icq_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="icq" id="icq" value="{tmpl_var name='icq'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="vat_id" class="col-sm-3 control-label">{tmpl_var name='vat_id_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="vat_id" id="vat_id" value="{tmpl_var name='vat_id'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="company_id" class="col-sm-3 control-label">{tmpl_var name='company_id_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="company_id" id="company_id" value="{tmpl_var name='company_id'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="bank_account_owner" class="col-sm-3 control-label">{tmpl_var name='bank_account_owner_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="bank_account_owner" id="bank_account_owner" value="{tmpl_var name='bank_account_owner'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="bank_account_number" class="col-sm-3 control-label">{tmpl_var name='bank_account_number_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="bank_account_number" id="bank_account_number" value="{tmpl_var name='bank_account_number'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="bank_code" class="col-sm-3 control-label">{tmpl_var name='bank_code_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="bank_code" id="bank_code" value="{tmpl_var name='bank_code'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="bank_name" class="col-sm-3 control-label">{tmpl_var name='bank_name_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="bank_name" id="bank_name" value="{tmpl_var name='bank_name'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="bank_account_iban" class="col-sm-3 control-label">{tmpl_var name='bank_account_iban_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="bank_account_iban" id="bank_account_iban" value="{tmpl_var name='bank_account_iban'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="bank_account_swift" class="col-sm-3 control-label">{tmpl_var name='bank_account_swift_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="bank_account_swift" id="bank_account_swift" value="{tmpl_var name='bank_account_swift'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="paypal_email" class="col-sm-3 control-label">{tmpl_var name='paypal_email_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="paypal_email" id="paypal_email" value="{tmpl_var name='paypal_email'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="added_date" class="col-sm-3 control-label">{tmpl_var name='added_date_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="added_date" id="added_date" value="{tmpl_var name='added_date'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="added_by" class="col-sm-3 control-label">{tmpl_var name='added_by_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="added_by" id="added_by" value="{tmpl_var name='added_by'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="notes" class="col-sm-3 control-label">{tmpl_var name='notes_txt'}</label>
<textarea name="notes" id="notes" rows='10' cols='30'>{tmpl_var name='notes'}</textarea>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='locked_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='locked_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='locked'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='canceled_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='canceled_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='canceled'}
</div>
</div>
{tmpl_var name='required_fields_txt'}
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','client/client_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('client/client_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','client/client_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="client/client_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm
index 43aad6f..029734e 100644
--- a/interface/web/client/templates/client_edit_limits.htm
+++ b/interface/web/client/templates/client_edit_limits.htm
@@ -1,32 +1,34 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
<div class="panel panel_client">
<div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
<div class="buttons topbuttons">
- <button class="positive iconstxt icoAdd" type="button" value="{tmpl_var name='add_additional_template_txt'}" onclick="addAdditionalTemplate();"><span>{tmpl_var name='add_additional_template_txt'}</span></button>
+ <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='add_additional_template_txt'}" onclick="addAdditionalTemplate();">{tmpl_var name='add_additional_template_txt'}</button>
</div>
- </fieldset>
+
</div>
<div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>Limits</legend>
- <div class="ctrlHolder">
- <label for="template_master">{tmpl_var name='template_master_txt'}</label>
- <select name="template_master" id="template_master" class="selectInput">
+ <legend>Limits</legend>
+ <div class="form-group">
+ <label for="template_master" class="col-sm-3 control-label">{tmpl_var name='template_master_txt'}</label>
+ <div class="col-sm-9"><select name="template_master" id="template_master" class="form-control">
{tmpl_var name='template_master'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="template_additional">{tmpl_var name='template_additional_txt'}</label>
- <select name="tpl_add_select" id="tpl_add_select" class="selectInput">
+ </div></div>
+ <div class="form-group">
+ <label for="template_additional" class="col-sm-3 control-label">{tmpl_var name='template_additional_txt'}</label>
+ <div class="col-sm-9"><select name="tpl_add_select" id="tpl_add_select" class="form-control">
{tmpl_var name='tpl_add_select'}
</select>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_template_additional_txt'}</p>
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_template_additional_txt'}</label>
<div id="template_additional_list" class="multiField">
<ul>
{tmpl_var name='template_additional_list'}
@@ -34,288 +36,288 @@
</div>
<input type="hidden" id="template_additional" name="template_additional" value="{tmpl_var name='template_additional'}">
</div>
- <div class="ctrlHolder">
+ <div class="form-group">
</div>
<tmpl_if name="is_admin">
- <div class="ctrlHolder">
- <label for="parent_client_id_id">{tmpl_var name='parent_client_id_txt'}</label>
- <select name="parent_client_id" id="parent_client_id" class="selectInput">
+ <div class="form-group">
+ <label for="parent_client_id_id" class="col-sm-3 control-label">{tmpl_var name='parent_client_id_txt'}</label>
+ <div class="col-sm-9"><select name="parent_client_id" id="parent_client_id" class="form-control">
{tmpl_var name='parent_client_id'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="reseller">{tmpl_var name='reseller_txt'}</label>
- <input type="checkbox" name="reseller" value="1" id="reseller" />
- </div>
+ </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></div>
</tmpl_if>
<div class="subsectiontoggle"><span class="showing"></span>{tmpl_var name='web_limits_txt'}<em class="showing"></em></div>
<div>
- <div class="ctrlHolder">
- <label for="web_servers">{tmpl_var name='web_servers_txt'}</label>
- <select data-placeholder="{tmpl_var name='web_servers_placeholder'}" multiple name="web_servers[]" id="web_servers" class="selectInput chosen-select">
+ <div class="form-group">
+ <label for="web_servers" class="col-sm-3 control-label">{tmpl_var name='web_servers_txt'}</label>
+ <div class="col-sm-9"><select data-placeholder="{tmpl_var name='web_servers_placeholder'}" multiple name="web_servers[]" id="web_servers" class="form-control">
{tmpl_var name='web_servers'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="limit_web_domain">{tmpl_var name='limit_web_domain_txt'}</label>
- <input name="limit_web_domain" id="limit_web_domain" value="{tmpl_var name='limit_web_domain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_web_quota">{tmpl_var name='limit_web_quota_txt'}</label>
- <input name="limit_web_quota" id="limit_web_quota" value="{tmpl_var name='limit_web_quota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" /> MB
- </div>
- <div class="ctrlHolder">
- <label for="limit_traffic_quota">{tmpl_var name='limit_traffic_quota_txt'}</label>
- <input name="limit_traffic_quota" id="limit_traffic_quota" value="{tmpl_var name='limit_traffic_quota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" /> MB
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='web_php_options_txt'}</p>
- <div class="multiField">
+ </div></div>
+ <div class="form-group">
+ <label for="limit_web_domain" class="col-sm-3 control-label">{tmpl_var name='limit_web_domain_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_web_domain" id="limit_web_domain" value="{tmpl_var name='limit_web_domain'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_web_quota" class="col-sm-3 control-label">{tmpl_var name='limit_web_quota_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_web_quota" id="limit_web_quota" value="{tmpl_var name='limit_web_quota'}" class="form-control" /> MB
+ </div></div>
+ <div class="form-group">
+ <label for="limit_traffic_quota" class="col-sm-3 control-label">{tmpl_var name='limit_traffic_quota_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_traffic_quota" id="limit_traffic_quota" value="{tmpl_var name='limit_traffic_quota'}" class="form-control" /> MB
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='web_php_options_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='web_php_options'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='limit_cgi_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='limit_cgi_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='limit_cgi'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='limit_ssi_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='limit_ssi_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='limit_ssi'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='limit_perl_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='limit_perl_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='limit_perl'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='limit_ruby_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='limit_ruby_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='limit_ruby'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='limit_python_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='limit_python_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='limit_python'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='force_suexec_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='force_suexec_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='force_suexec'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='limit_hterror_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='limit_hterror_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='limit_hterror'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='limit_wildcard_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='limit_wildcard_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='limit_wildcard'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='limit_ssl_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='limit_ssl_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='limit_ssl'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="limit_web_aliasdomain">{tmpl_var name='limit_web_aliasdomain_txt'}</label>
- <input name="limit_web_aliasdomain" id="limit_web_aliasdomain" value="{tmpl_var name='limit_web_aliasdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_web_subdomain">{tmpl_var name='limit_web_subdomain_txt'}</label>
- <input name="limit_web_subdomain" id="limit_web_subdomain" value="{tmpl_var name='limit_web_subdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_ftp_user">{tmpl_var name='limit_ftp_user_txt'}</label>
- <input name="limit_ftp_user" id="limit_ftp_user" value="{tmpl_var name='limit_ftp_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_shell_user">{tmpl_var name='limit_shell_user_txt'}</label>
- <input name="limit_shell_user" id="limit_shell_user" value="{tmpl_var name='limit_shell_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='ssh_chroot_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label for="limit_web_aliasdomain" class="col-sm-3 control-label">{tmpl_var name='limit_web_aliasdomain_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_web_aliasdomain" id="limit_web_aliasdomain" value="{tmpl_var name='limit_web_aliasdomain'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_web_subdomain" class="col-sm-3 control-label">{tmpl_var name='limit_web_subdomain_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_web_subdomain" id="limit_web_subdomain" value="{tmpl_var name='limit_web_subdomain'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_ftp_user" class="col-sm-3 control-label">{tmpl_var name='limit_ftp_user_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_ftp_user" id="limit_ftp_user" value="{tmpl_var name='limit_ftp_user'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_shell_user" class="col-sm-3 control-label">{tmpl_var name='limit_shell_user_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_shell_user" id="limit_shell_user" value="{tmpl_var name='limit_shell_user'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='ssh_chroot_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='ssh_chroot'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="limit_webdav_user">{tmpl_var name='limit_webdav_user_txt'}</label>
- <input name="limit_webdav_user" id="limit_webdav_user" value="{tmpl_var name='limit_webdav_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='limit_backup_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label for="limit_webdav_user" class="col-sm-3 control-label">{tmpl_var name='limit_webdav_user_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_webdav_user" id="limit_webdav_user" value="{tmpl_var name='limit_webdav_user'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='limit_backup_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='limit_backup'}
</div>
</div>
</div>
<div class="subsectiontoggle"><span></span>{tmpl_var name='email_limits_txt'}<em></em></div>
<div style="display:none;">
- <div class="ctrlHolder">
- <label for="mail_servers">{tmpl_var name='mail_servers_txt'}</label>
- <select data-placeholder="{tmpl_var name='mail_servers_placeholder'}" multiple name="mail_servers[]" id="mail_servers" class="selectInput chosen-select">
+ <div class="form-group">
+ <label for="mail_servers" class="col-sm-3 control-label">{tmpl_var name='mail_servers_txt'}</label>
+ <div class="col-sm-9"><select data-placeholder="{tmpl_var name='mail_servers_placeholder'}" multiple name="mail_servers[]" id="mail_servers" class="form-control">
{tmpl_var name='mail_servers'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="limit_maildomain">{tmpl_var name='limit_maildomain_txt'}</label>
- <input name="limit_maildomain" id="limit_maildomain" value="{tmpl_var name='limit_maildomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_mailbox">{tmpl_var name='limit_mailbox_txt'}</label>
- <input name="limit_mailbox" id="limit_mailbox" value="{tmpl_var name='limit_mailbox'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_mailalias">{tmpl_var name='limit_mailalias_txt'}</label>
- <input name="limit_mailalias" id="limit_mailalias" value="{tmpl_var name='limit_mailalias'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_mailaliasdomain">{tmpl_var name='limit_mailaliasdomain_txt'}</label>
- <input name="limit_mailaliasdomain" id="limit_mailaliasdomain" value="{tmpl_var name='limit_mailaliasdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_mailmailinglist">{tmpl_var name='limit_mailmailinglist_txt'}</label>
- <input name="limit_mailmailinglist" id="limit_mailmailinglist" value="{tmpl_var name='limit_mailmailinglist'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_mailforward">{tmpl_var name='limit_mailforward_txt'}</label>
- <input name="limit_mailforward" id="limit_mailforward" value="{tmpl_var name='limit_mailforward'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_mailcatchall">{tmpl_var name='limit_mailcatchall_txt'}</label>
- <input name="limit_mailcatchall" id="limit_mailcatchall" value="{tmpl_var name='limit_mailcatchall'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_mailrouting">{tmpl_var name='limit_mailrouting_txt'}</label>
- <input name="limit_mailrouting" id="limit_mailrouting" value="{tmpl_var name='limit_mailrouting'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_mailfilter">{tmpl_var name='limit_mailfilter_txt'}</label>
- <input name="limit_mailfilter" id="limit_mailfilter" value="{tmpl_var name='limit_mailfilter'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_fetchmail">{tmpl_var name='limit_fetchmail_txt'}</label>
- <input name="limit_fetchmail" id="limit_fetchmail" value="{tmpl_var name='limit_fetchmail'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_mailquota">{tmpl_var name='limit_mailquota_txt'}</label>
- <input name="limit_mailquota" id="limit_mailquota" value="{tmpl_var name='limit_mailquota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" /> MB
- </div>
- <div class="ctrlHolder">
- <label for="limit_spamfilter_wblist">{tmpl_var name='limit_spamfilter_wblist_txt'}</label>
- <input name="limit_spamfilter_wblist" id="limit_spamfilter_wblist" value="{tmpl_var name='limit_spamfilter_wblist'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_spamfilter_user">{tmpl_var name='limit_spamfilter_user_txt'}</label>
- <input name="limit_spamfilter_user" id="limit_spamfilter_user" value="{tmpl_var name='limit_spamfilter_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_spamfilter_policy">{tmpl_var name='limit_spamfilter_policy_txt'}</label>
- <input name="limit_spamfilter_policy" id="limit_spamfilter_policy" value="{tmpl_var name='limit_spamfilter_policy'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
+ </div></div>
+ <div class="form-group">
+ <label for="limit_maildomain" class="col-sm-3 control-label">{tmpl_var name='limit_maildomain_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_maildomain" id="limit_maildomain" value="{tmpl_var name='limit_maildomain'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_mailbox" class="col-sm-3 control-label">{tmpl_var name='limit_mailbox_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_mailbox" id="limit_mailbox" value="{tmpl_var name='limit_mailbox'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_mailalias" class="col-sm-3 control-label">{tmpl_var name='limit_mailalias_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_mailalias" id="limit_mailalias" value="{tmpl_var name='limit_mailalias'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_mailaliasdomain" class="col-sm-3 control-label">{tmpl_var name='limit_mailaliasdomain_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_mailaliasdomain" id="limit_mailaliasdomain" value="{tmpl_var name='limit_mailaliasdomain'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_mailmailinglist" class="col-sm-3 control-label">{tmpl_var name='limit_mailmailinglist_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_mailmailinglist" id="limit_mailmailinglist" value="{tmpl_var name='limit_mailmailinglist'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_mailforward" class="col-sm-3 control-label">{tmpl_var name='limit_mailforward_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_mailforward" id="limit_mailforward" value="{tmpl_var name='limit_mailforward'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_mailcatchall" class="col-sm-3 control-label">{tmpl_var name='limit_mailcatchall_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_mailcatchall" id="limit_mailcatchall" value="{tmpl_var name='limit_mailcatchall'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_mailrouting" class="col-sm-3 control-label">{tmpl_var name='limit_mailrouting_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_mailrouting" id="limit_mailrouting" value="{tmpl_var name='limit_mailrouting'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_mailfilter" class="col-sm-3 control-label">{tmpl_var name='limit_mailfilter_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_mailfilter" id="limit_mailfilter" value="{tmpl_var name='limit_mailfilter'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_fetchmail" class="col-sm-3 control-label">{tmpl_var name='limit_fetchmail_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_fetchmail" id="limit_fetchmail" value="{tmpl_var name='limit_fetchmail'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_mailquota" class="col-sm-3 control-label">{tmpl_var name='limit_mailquota_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_mailquota" id="limit_mailquota" value="{tmpl_var name='limit_mailquota'}" class="form-control" /> MB
+ </div></div>
+ <div class="form-group">
+ <label for="limit_spamfilter_wblist" class="col-sm-3 control-label">{tmpl_var name='limit_spamfilter_wblist_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_spamfilter_wblist" id="limit_spamfilter_wblist" value="{tmpl_var name='limit_spamfilter_wblist'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_spamfilter_user" class="col-sm-3 control-label">{tmpl_var name='limit_spamfilter_user_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_spamfilter_user" id="limit_spamfilter_user" value="{tmpl_var name='limit_spamfilter_user'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_spamfilter_policy" class="col-sm-3 control-label">{tmpl_var name='limit_spamfilter_policy_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_spamfilter_policy" id="limit_spamfilter_policy" value="{tmpl_var name='limit_spamfilter_policy'}" class="form-control" />
+ </div></div>
</div>
<div class="subsectiontoggle"><span></span>{tmpl_var name='database_limits_txt'}<em></em></div>
<div style="display:none;">
- <div class="ctrlHolder">
- <label for="db_servers">{tmpl_var name='db_servers_txt'}</label>
- <select data-placeholder="{tmpl_var name='db_servers_placeholder'}" multiple name="db_servers[]" id="db_servers" class="selectInput chosen-select">
+ <div class="form-group">
+ <label for="db_servers" class="col-sm-3 control-label">{tmpl_var name='db_servers_txt'}</label>
+ <div class="col-sm-9"><select data-placeholder="{tmpl_var name='db_servers_placeholder'}" multiple name="db_servers[]" id="db_servers" class="form-control">
{tmpl_var name='db_servers'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="limit_database">{tmpl_var name='limit_database_txt'}</label>
- <input name="limit_database" id="limit_database" value="{tmpl_var name='limit_database'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_database_quota">{tmpl_var name='limit_database_quota_txt'}</label>
- <input name="limit_database_quota" id="limit_database_quota" value="{tmpl_var name='limit_database_quota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" /> MB
- </div>
+ </div></div>
+ <div class="form-group">
+ <label for="limit_database" class="col-sm-3 control-label">{tmpl_var name='limit_database_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_database" id="limit_database" value="{tmpl_var name='limit_database'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_database_quota" class="col-sm-3 control-label">{tmpl_var name='limit_database_quota_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_database_quota" id="limit_database_quota" value="{tmpl_var name='limit_database_quota'}" class="form-control" /> MB
+ </div></div>
</div>
<div class="subsectiontoggle"><span></span>{tmpl_var name='cron_job_limits_txt'}<em></em></div>
<div style="display:none;">
- <div class="ctrlHolder">
- <label for="limit_cron">{tmpl_var name='limit_cron_txt'}</label>
- <input name="limit_cron" id="limit_cron" value="{tmpl_var name='limit_cron'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_cron_type">{tmpl_var name='limit_cron_type_txt'}</label>
- <select name="limit_cron_type" id="limit_cron_type" class="selectInput formLengthHalf">
+ <div class="form-group">
+ <label for="limit_cron" class="col-sm-3 control-label">{tmpl_var name='limit_cron_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_cron" id="limit_cron" value="{tmpl_var name='limit_cron'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_cron_type" class="col-sm-3 control-label">{tmpl_var name='limit_cron_type_txt'}</label>
+ <div class="col-sm-9"><select name="limit_cron_type" id="limit_cron_type" class="form-control">
{tmpl_var name='limit_cron_type'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="limit_cron_frequency">{tmpl_var name='limit_cron_frequency_txt'}</label>
- <input name="limit_cron_frequency" id="limit_cron_frequency" value="{tmpl_var name='limit_cron_frequency'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
+ </div></div>
+ <div class="form-group">
+ <label for="limit_cron_frequency" class="col-sm-3 control-label">{tmpl_var name='limit_cron_frequency_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_cron_frequency" id="limit_cron_frequency" value="{tmpl_var name='limit_cron_frequency'}" class="form-control" />
+ </div></div>
</div>
<div class="subsectiontoggle"><span></span>{tmpl_var name='dns_limits_txt'}<em></em></div>
<div style="display:none;">
- <div class="ctrlHolder">
- <label for="dns_servers">{tmpl_var name='dns_servers_txt'}</label>
- <select data-placeholder="{tmpl_var name='dns_servers_placeholder'}" multiple name="dns_servers[]" id="dns_servers" class="selectInput chosen-select">
+ <div class="form-group">
+ <label for="dns_servers" class="col-sm-3 control-label">{tmpl_var name='dns_servers_txt'}</label>
+ <div class="col-sm-9"><select data-placeholder="{tmpl_var name='dns_servers_placeholder'}" multiple name="dns_servers[]" id="dns_servers" class="form-control">
{tmpl_var name='dns_servers'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="limit_dns_zone">{tmpl_var name='limit_dns_zone_txt'}</label>
- <input name="limit_dns_zone" id="limit_dns_zone" value="{tmpl_var name='limit_dns_zone'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="default_slave_dnsserver">{tmpl_var name='default_slave_dnsserver_txt'}</label>
- <select name="default_slave_dnsserver" id="default_slave_dnsserver" class="selectInput">
+ </div></div>
+ <div class="form-group">
+ <label for="limit_dns_zone" class="col-sm-3 control-label">{tmpl_var name='limit_dns_zone_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_dns_zone" id="limit_dns_zone" value="{tmpl_var name='limit_dns_zone'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="default_slave_dnsserver" class="col-sm-3 control-label">{tmpl_var name='default_slave_dnsserver_txt'}</label>
+ <div class="col-sm-9"><select name="default_slave_dnsserver" id="default_slave_dnsserver" class="form-control">
{tmpl_var name='default_slave_dnsserver'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="limit_dns_slave_zone">{tmpl_var name='limit_dns_slave_zone_txt'}</label>
- <input name="limit_dns_slave_zone" id="limit_dns_slave_zone" value="{tmpl_var name='limit_dns_slave_zone'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_dns_record">{tmpl_var name='limit_dns_record_txt'}</label>
- <input name="limit_dns_record" id="limit_dns_record" value="{tmpl_var name='limit_dns_record'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
+ </div></div>
+ <div class="form-group">
+ <label for="limit_dns_slave_zone" class="col-sm-3 control-label">{tmpl_var name='limit_dns_slave_zone_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_dns_slave_zone" id="limit_dns_slave_zone" value="{tmpl_var name='limit_dns_slave_zone'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_dns_record" class="col-sm-3 control-label">{tmpl_var name='limit_dns_record_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_dns_record" id="limit_dns_record" value="{tmpl_var name='limit_dns_record'}" class="form-control" />
+ </div></div>
</div>
<div class="subsectiontoggle"><span></span>{tmpl_var name='virtualization_limits_txt'}<em></em></div>
<div style="display:none;">
- <div class="ctrlHolder">
- <label for="limit_openvz_vm">{tmpl_var name='limit_openvz_vm_txt'}</label>
- <input name="limit_openvz_vm" id="limit_openvz_vm" value="{tmpl_var name='limit_openvz_vm'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_openvz_vm_template_id">{tmpl_var name='limit_openvz_vm_template_id_txt'}</label>
- <select name="limit_openvz_vm_template_id" id="limit_openvz_vm_template_id" class="selectInput">
+ <div class="form-group">
+ <label for="limit_openvz_vm" class="col-sm-3 control-label">{tmpl_var name='limit_openvz_vm_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_openvz_vm" id="limit_openvz_vm" value="{tmpl_var name='limit_openvz_vm'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_openvz_vm_template_id" class="col-sm-3 control-label">{tmpl_var name='limit_openvz_vm_template_id_txt'}</label>
+ <div class="col-sm-9"><select name="limit_openvz_vm_template_id" id="limit_openvz_vm_template_id" class="form-control">
{tmpl_var name='limit_openvz_vm_template_id'}
</select>
- </div>
+ </div></div>
</div>
<div class="subsectiontoggle"><span></span>{tmpl_var name='aps_limits_txt'}<em></em></div>
<div style="display:none;">
- <div class="ctrlHolder">
- <label for="limit_aps">{tmpl_var name='limit_aps_txt'}</label>
- <input name="limit_aps" id="limit_aps" value="{tmpl_var name='limit_aps'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
+ <div class="form-group">
+ <label for="limit_aps" class="col-sm-3 control-label">{tmpl_var name='limit_aps_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_aps" id="limit_aps" value="{tmpl_var name='limit_aps'}" class="form-control" />
+ </div></div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','client/client_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('client/client_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','client/client_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="client/client_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
</div>
</div>
diff --git a/interface/web/client/templates/client_message.htm b/interface/web/client/templates/client_message.htm
index 6cff710..7880c82 100644
--- a/interface/web/client/templates/client_message.htm
+++ b/interface/web/client/templates/client_message.htm
@@ -1,39 +1,36 @@
-<h2><tmpl_var name="page_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="page_head_txt"></h1>
+</div>
<p><tmpl_var name="form_desc_txt"></p>
-<div class="panel panel_client">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>{tmpl_var name='form_legend_txt'}</legend>
+
+ <legend>{tmpl_var name='form_legend_txt'}</legend>
<tmpl_if name="okmsg">
<div id="OKMsg"><p><tmpl_var name="okmsg"></p></div>
</tmpl_if>
<tmpl_if name="error">
<div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
</tmpl_if>
- <div class="ctrlHolder">
- <label for="sender">{tmpl_var name='sender_txt'}</label>
- <input name="sender" id="sender" value="{tmpl_var name='sender'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="recipient">{tmpl_var name='recipient_txt'}</label>
- <select name="recipient" id="recipient" class="selectInput">
+ <div class="form-group">
+ <label for="sender" class="col-sm-3 control-label">{tmpl_var name='sender_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="sender" id="sender" value="{tmpl_var name='sender'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="recipient" class="col-sm-3 control-label">{tmpl_var name='recipient_txt'}</label>
+ <div class="col-sm-9"><select name="recipient" id="recipient" class="form-control">
{tmpl_var name='recipient'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="subject">{tmpl_var name='subject_txt'}</label>
- <input name="subject" id="subject" value="{tmpl_var name='subject'}" style="width:500px" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="message">{tmpl_var name='message_txt'}</label>
+ </div></div>
+ <div class="form-group">
+ <label for="subject" class="col-sm-3 control-label">{tmpl_var name='subject_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="subject" id="subject" value="{tmpl_var name='subject'}" style="width:500px" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="message" class="col-sm-3 control-label">{tmpl_var name='message_txt'}</label>
<textarea name="message" id="message" rows='' cols='' style="width:500px">{tmpl_var name='message'}</textarea> {tmpl_var name="variables_txt"} {tmpl_var name="message_variables"}
</div>
- </fieldset>
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_send_txt'}" onclick="submitForm('pageForm','client/client_message.php');"><span>{tmpl_var name='btn_send_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('client/client_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_send_txt'}" onclick="submitForm('pageForm','client/client_message.php');">{tmpl_var name='btn_send_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="client/client_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/client/templates/client_message_template_list.htm b/interface/web/client/templates/client_message_template_list.htm
index 95f6f00..01b741a 100644
--- a/interface/web/client/templates/client_message_template_list.htm
+++ b/interface/web/client/templates/client_message_template_list.htm
@@ -1,40 +1,40 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
-<div class="panel panel_list_client_message_template">
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="iconstxt icoAdd" type="button" onclick="loadContent('client/message_template_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="iconstxt icoAdd" type="button" data-load-content="client/message_template_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
<tr>
- <th class="tbl_col_template_type" scope="col"><tmpl_var name="template_type_txt"></th>
- <th class="tbl_col_template_name" scope="col"><tmpl_var name="template_name_txt"></th>
- <th class="tbl_col_buttons" scope="col"> </th>
+ <th><tmpl_var name="template_type_txt"></th>
+ <th><tmpl_var name="template_name_txt"></th>
+ <th> </th>
</tr>
<tr>
- <td class="tbl_col_template_type"><select name="search_template_type" onChange="submitForm('pageForm','client/message_template_list.php');">{tmpl_var name='search_template_type'}</select></td>
- <td class="tbl_col_template_name"><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></td>
- <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','client/message_template_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+ <td><select name="search_template_type" onChange="submitForm('pageForm','client/message_template_list.php');">{tmpl_var name='search_template_type'}</select></td>
+ <td><div class="col-sm-9"><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></div></td>
+ <td><div class="buttons"><button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','client/message_template_list.php');">{tmpl_var name="filter_txt"}</button></div></td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_template_type"><a href="#" onclick="loadContent('client/message_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_type"}</a></td>
- <td class="tbl_col_template_name"><a href="#" onclick="loadContent('client/message_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_name"}</a></td>
- <td class="tbl_col_buttons">
+ <td><a href="#" data-load-content="client/message_template_edit.php?id={tmpl_var name='id'}">{tmpl_var name="template_type"}</a></td>
+ <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="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <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>
</div>
</td>
</tr>
@@ -47,11 +47,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+ <td colspan="3"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
</div>
+
+
\ No newline at end of file
diff --git a/interface/web/client/templates/client_template_edit_limits.htm b/interface/web/client/templates/client_template_edit_limits.htm
index 71ab963..61123c2 100644
--- a/interface/web/client/templates/client_template_edit_limits.htm
+++ b/interface/web/client/templates/client_template_edit_limits.htm
@@ -1,290 +1,287 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_client_template">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>Limits</legend>
+ <legend>Limits</legend>
<div class="subsectiontoggle"><span class="showing"></span>{tmpl_var name='web_limits_txt'}<em class="showing"></em></div>
<div>
- <div class="ctrlHolder">
- <label for="default_webserver">{tmpl_var name='default_webserver_txt'}</label>
- <select name="default_webserver" id="default_webserver" class="selectInput">
+ <div class="form-group">
+ <label for="default_webserver" class="col-sm-3 control-label">{tmpl_var name='default_webserver_txt'}</label>
+ <div class="col-sm-9"><select name="default_webserver" id="default_webserver" class="form-control">
{tmpl_var name='default_webserver'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="limit_web_domain">{tmpl_var name='limit_web_domain_txt'}</label>
- <input name="limit_web_domain" id="limit_web_domain" value="{tmpl_var name='limit_web_domain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_web_quota">{tmpl_var name='limit_web_quota_txt'}</label>
- <input name="limit_web_quota" id="limit_web_quota" value="{tmpl_var name='limit_web_quota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" /> MB
- </div>
- <div class="ctrlHolder">
- <label for="limit_traffic_quota">{tmpl_var name='limit_traffic_quota_txt'}</label>
- <input name="limit_traffic_quota" id="limit_traffic_quota" value="{tmpl_var name='limit_traffic_quota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" /> MB
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='web_php_options_txt'}</p>
- <div class="multiField">
+ </div></div>
+ <div class="form-group">
+ <label for="limit_web_domain" class="col-sm-3 control-label">{tmpl_var name='limit_web_domain_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_web_domain" id="limit_web_domain" value="{tmpl_var name='limit_web_domain'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_web_quota" class="col-sm-3 control-label">{tmpl_var name='limit_web_quota_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_web_quota" id="limit_web_quota" value="{tmpl_var name='limit_web_quota'}" class="form-control" /> MB
+ </div></div>
+ <div class="form-group">
+ <label for="limit_traffic_quota" class="col-sm-3 control-label">{tmpl_var name='limit_traffic_quota_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_traffic_quota" id="limit_traffic_quota" value="{tmpl_var name='limit_traffic_quota'}" class="form-control" /> MB
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='web_php_options_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='web_php_options'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='limit_cgi_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='limit_cgi_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='limit_cgi'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='limit_ssi_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='limit_ssi_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='limit_ssi'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='limit_perl_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='limit_perl_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='limit_perl'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='limit_ruby_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='limit_ruby_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='limit_ruby'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='limit_python_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='limit_python_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='limit_python'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='force_suexec_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='force_suexec_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='force_suexec'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='limit_hterror_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='limit_hterror_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='limit_hterror'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='limit_wildcard_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='limit_wildcard_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='limit_wildcard'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='limit_ssl_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='limit_ssl_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='limit_ssl'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="limit_web_aliasdomain">{tmpl_var name='limit_web_aliasdomain_txt'}</label>
- <input name="limit_web_aliasdomain" id="limit_web_aliasdomain" value="{tmpl_var name='limit_web_aliasdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_web_subdomain">{tmpl_var name='limit_web_subdomain_txt'}</label>
- <input name="limit_web_subdomain" id="limit_web_subdomain" value="{tmpl_var name='limit_web_subdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_ftp_user">{tmpl_var name='limit_ftp_user_txt'}</label>
- <input name="limit_ftp_user" id="limit_ftp_user" value="{tmpl_var name='limit_ftp_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_shell_user">{tmpl_var name='limit_shell_user_txt'}</label>
- <input name="limit_shell_user" id="limit_shell_user" value="{tmpl_var name='limit_shell_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='ssh_chroot_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label for="limit_web_aliasdomain" class="col-sm-3 control-label">{tmpl_var name='limit_web_aliasdomain_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_web_aliasdomain" id="limit_web_aliasdomain" value="{tmpl_var name='limit_web_aliasdomain'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_web_subdomain" class="col-sm-3 control-label">{tmpl_var name='limit_web_subdomain_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_web_subdomain" id="limit_web_subdomain" value="{tmpl_var name='limit_web_subdomain'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_ftp_user" class="col-sm-3 control-label">{tmpl_var name='limit_ftp_user_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_ftp_user" id="limit_ftp_user" value="{tmpl_var name='limit_ftp_user'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_shell_user" class="col-sm-3 control-label">{tmpl_var name='limit_shell_user_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_shell_user" id="limit_shell_user" value="{tmpl_var name='limit_shell_user'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='ssh_chroot_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='ssh_chroot'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="limit_webdav_user">{tmpl_var name='limit_webdav_user_txt'}</label>
- <input name="limit_webdav_user" id="limit_webdav_user" value="{tmpl_var name='limit_webdav_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='limit_backup_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label for="limit_webdav_user" class="col-sm-3 control-label">{tmpl_var name='limit_webdav_user_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_webdav_user" id="limit_webdav_user" value="{tmpl_var name='limit_webdav_user'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='limit_backup_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='limit_backup'}
</div>
</div>
</div>
<div class="subsectiontoggle"><span></span>{tmpl_var name='email_limits_txt'}<em></em></div>
<div style="display:none;">
- <div class="ctrlHolder">
- <label for="default_mailserver">{tmpl_var name='default_mailserver_txt'}</label>
- <select name="default_mailserver" id="default_mailserver" class="selectInput">
+ <div class="form-group">
+ <label for="default_mailserver" class="col-sm-3 control-label">{tmpl_var name='default_mailserver_txt'}</label>
+ <div class="col-sm-9"><select name="default_mailserver" id="default_mailserver" class="form-control">
{tmpl_var name='default_mailserver'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="limit_maildomain">{tmpl_var name='limit_maildomain_txt'}</label>
- <input name="limit_maildomain" id="limit_maildomain" value="{tmpl_var name='limit_maildomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_mailbox">{tmpl_var name='limit_mailbox_txt'}</label>
- <input name="limit_mailbox" id="limit_mailbox" value="{tmpl_var name='limit_mailbox'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_mailalias">{tmpl_var name='limit_mailalias_txt'}</label>
- <input name="limit_mailalias" id="limit_mailalias" value="{tmpl_var name='limit_mailalias'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_mailaliasdomain">{tmpl_var name='limit_mailaliasdomain_txt'}</label>
- <input name="limit_mailaliasdomain" id="limit_mailaliasdomain" value="{tmpl_var name='limit_mailaliasdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_mailmailinglist">{tmpl_var name='limit_mailmailinglist_txt'}</label>
- <input name="limit_mailmailinglist" id="limit_mailmailinglist" value="{tmpl_var name='limit_mailmailinglist'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_mailforward">{tmpl_var name='limit_mailforward_txt'}</label>
- <input name="limit_mailforward" id="limit_mailforward" value="{tmpl_var name='limit_mailforward'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_mailcatchall">{tmpl_var name='limit_mailcatchall_txt'}</label>
- <input name="limit_mailcatchall" id="limit_mailcatchall" value="{tmpl_var name='limit_mailcatchall'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_mailrouting">{tmpl_var name='limit_mailrouting_txt'}</label>
- <input name="limit_mailrouting" id="limit_mailrouting" value="{tmpl_var name='limit_mailrouting'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_mailfilter">{tmpl_var name='limit_mailfilter_txt'}</label>
- <input name="limit_mailfilter" id="limit_mailfilter" value="{tmpl_var name='limit_mailfilter'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_fetchmail">{tmpl_var name='limit_fetchmail_txt'}</label>
- <input name="limit_fetchmail" id="limit_fetchmail" value="{tmpl_var name='limit_fetchmail'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_mailquota">{tmpl_var name='limit_mailquota_txt'}</label>
- <input name="limit_mailquota" id="limit_mailquota" value="{tmpl_var name='limit_mailquota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_spamfilter_wblist">{tmpl_var name='limit_spamfilter_wblist_txt'}</label>
- <input name="limit_spamfilter_wblist" id="limit_spamfilter_wblist" value="{tmpl_var name='limit_spamfilter_wblist'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_spamfilter_user">{tmpl_var name='limit_spamfilter_user_txt'}</label>
- <input name="limit_spamfilter_user" id="limit_spamfilter_user" value="{tmpl_var name='limit_spamfilter_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_spamfilter_policy">{tmpl_var name='limit_spamfilter_policy_txt'}</label>
- <input name="limit_spamfilter_policy" id="limit_spamfilter_policy" value="{tmpl_var name='limit_spamfilter_policy'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
+ </div></div>
+ <div class="form-group">
+ <label for="limit_maildomain" class="col-sm-3 control-label">{tmpl_var name='limit_maildomain_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_maildomain" id="limit_maildomain" value="{tmpl_var name='limit_maildomain'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_mailbox" class="col-sm-3 control-label">{tmpl_var name='limit_mailbox_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_mailbox" id="limit_mailbox" value="{tmpl_var name='limit_mailbox'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_mailalias" class="col-sm-3 control-label">{tmpl_var name='limit_mailalias_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_mailalias" id="limit_mailalias" value="{tmpl_var name='limit_mailalias'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_mailaliasdomain" class="col-sm-3 control-label">{tmpl_var name='limit_mailaliasdomain_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_mailaliasdomain" id="limit_mailaliasdomain" value="{tmpl_var name='limit_mailaliasdomain'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_mailmailinglist" class="col-sm-3 control-label">{tmpl_var name='limit_mailmailinglist_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_mailmailinglist" id="limit_mailmailinglist" value="{tmpl_var name='limit_mailmailinglist'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_mailforward" class="col-sm-3 control-label">{tmpl_var name='limit_mailforward_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_mailforward" id="limit_mailforward" value="{tmpl_var name='limit_mailforward'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_mailcatchall" class="col-sm-3 control-label">{tmpl_var name='limit_mailcatchall_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_mailcatchall" id="limit_mailcatchall" value="{tmpl_var name='limit_mailcatchall'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_mailrouting" class="col-sm-3 control-label">{tmpl_var name='limit_mailrouting_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_mailrouting" id="limit_mailrouting" value="{tmpl_var name='limit_mailrouting'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_mailfilter" class="col-sm-3 control-label">{tmpl_var name='limit_mailfilter_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_mailfilter" id="limit_mailfilter" value="{tmpl_var name='limit_mailfilter'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_fetchmail" class="col-sm-3 control-label">{tmpl_var name='limit_fetchmail_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_fetchmail" id="limit_fetchmail" value="{tmpl_var name='limit_fetchmail'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_mailquota" class="col-sm-3 control-label">{tmpl_var name='limit_mailquota_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_mailquota" id="limit_mailquota" value="{tmpl_var name='limit_mailquota'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_spamfilter_wblist" class="col-sm-3 control-label">{tmpl_var name='limit_spamfilter_wblist_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_spamfilter_wblist" id="limit_spamfilter_wblist" value="{tmpl_var name='limit_spamfilter_wblist'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_spamfilter_user" class="col-sm-3 control-label">{tmpl_var name='limit_spamfilter_user_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_spamfilter_user" id="limit_spamfilter_user" value="{tmpl_var name='limit_spamfilter_user'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_spamfilter_policy" class="col-sm-3 control-label">{tmpl_var name='limit_spamfilter_policy_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_spamfilter_policy" id="limit_spamfilter_policy" value="{tmpl_var name='limit_spamfilter_policy'}" class="form-control" />
+ </div></div>
</div>
<div class="subsectiontoggle"><span></span>{tmpl_var name='database_limits_txt'}<em></em></div>
<div style="display:none;">
- <div class="ctrlHolder">
- <label for="default_dbserver">{tmpl_var name='default_dbserver_txt'}</label>
- <select name="default_dbserver" id="default_dbserver" class="selectInput">
+ <div class="form-group">
+ <label for="default_dbserver" class="col-sm-3 control-label">{tmpl_var name='default_dbserver_txt'}</label>
+ <div class="col-sm-9"><select name="default_dbserver" id="default_dbserver" class="form-control">
{tmpl_var name='default_dbserver'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="limit_database">{tmpl_var name='limit_database_txt'}</label>
- <input name="limit_database" id="limit_database" value="{tmpl_var name='limit_database'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_database_quota">{tmpl_var name='limit_database_quota_txt'}</label>
- <input name="limit_database_quota" id="limit_database_quota" value="{tmpl_var name='limit_database_quota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" /> MB
- </div>
+ </div></div>
+ <div class="form-group">
+ <label for="limit_database" class="col-sm-3 control-label">{tmpl_var name='limit_database_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_database" id="limit_database" value="{tmpl_var name='limit_database'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_database_quota" class="col-sm-3 control-label">{tmpl_var name='limit_database_quota_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_database_quota" id="limit_database_quota" value="{tmpl_var name='limit_database_quota'}" class="form-control" /> MB
+ </div></div>
</div>
<div class="subsectiontoggle"><span></span>{tmpl_var name='cron_job_limits_txt'}<em></em></div>
<div style="display:none;">
- <div class="ctrlHolder">
- <label for="limit_cron">{tmpl_var name='limit_cron_txt'}</label>
- <input name="limit_cron" id="limit_cron" value="{tmpl_var name='limit_cron'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_cron_type">{tmpl_var name='limit_cron_type_txt'}</label>
- <select name="limit_cron_type" id="limit_cron_type" class="selectInput formLengthHalf">
+ <div class="form-group">
+ <label for="limit_cron" class="col-sm-3 control-label">{tmpl_var name='limit_cron_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_cron" id="limit_cron" value="{tmpl_var name='limit_cron'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_cron_type" class="col-sm-3 control-label">{tmpl_var name='limit_cron_type_txt'}</label>
+ <div class="col-sm-9"><select name="limit_cron_type" id="limit_cron_type" class="form-control">
{tmpl_var name='limit_cron_type'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="limit_cron_frequency">{tmpl_var name='limit_cron_frequency_txt'}</label>
- <input name="limit_cron_frequency" id="limit_cron_frequency" value="{tmpl_var name='limit_cron_frequency'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
+ </div></div>
+ <div class="form-group">
+ <label for="limit_cron_frequency" class="col-sm-3 control-label">{tmpl_var name='limit_cron_frequency_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_cron_frequency" id="limit_cron_frequency" value="{tmpl_var name='limit_cron_frequency'}" class="form-control" />
+ </div></div>
</div>
<div class="subsectiontoggle"><span></span>{tmpl_var name='dns_limits_txt'}<em></em></div>
<div style="display:none;">
- <div class="ctrlHolder">
- <label for="default_dnsserver">{tmpl_var name='default_dnsserver_txt'}</label>
- <select name="default_dnsserver" id="default_dnsserver" class="selectInput">
+ <div class="form-group">
+ <label for="default_dnsserver" class="col-sm-3 control-label">{tmpl_var name='default_dnsserver_txt'}</label>
+ <div class="col-sm-9"><select name="default_dnsserver" id="default_dnsserver" class="form-control">
{tmpl_var name='default_dnsserver'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="limit_dns_zone">{tmpl_var name='limit_dns_zone_txt'}</label>
- <input name="limit_dns_zone" id="limit_dns_zone" value="{tmpl_var name='limit_dns_zone'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="default_slave_dnsserver">{tmpl_var name='default_slave_dnsserver_txt'}</label>
- <select name="default_slave_dnsserver" id="default_slave_dnsserver" class="selectInput">
+ </div></div>
+ <div class="form-group">
+ <label for="limit_dns_zone" class="col-sm-3 control-label">{tmpl_var name='limit_dns_zone_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_dns_zone" id="limit_dns_zone" value="{tmpl_var name='limit_dns_zone'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="default_slave_dnsserver" class="col-sm-3 control-label">{tmpl_var name='default_slave_dnsserver_txt'}</label>
+ <div class="col-sm-9"><select name="default_slave_dnsserver" id="default_slave_dnsserver" class="form-control">
{tmpl_var name='default_slave_dnsserver'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="limit_dns_slave_zone">{tmpl_var name='limit_dns_slave_zone_txt'}</label>
- <input name="limit_dns_slave_zone" id="limit_dns_slave_zone" value="{tmpl_var name='limit_dns_slave_zone'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_dns_record">{tmpl_var name='limit_dns_record_txt'}</label>
- <input name="limit_dns_record" id="limit_dns_record" value="{tmpl_var name='limit_dns_record'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
+ </div></div>
+ <div class="form-group">
+ <label for="limit_dns_slave_zone" class="col-sm-3 control-label">{tmpl_var name='limit_dns_slave_zone_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_dns_slave_zone" id="limit_dns_slave_zone" value="{tmpl_var name='limit_dns_slave_zone'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_dns_record" class="col-sm-3 control-label">{tmpl_var name='limit_dns_record_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_dns_record" id="limit_dns_record" value="{tmpl_var name='limit_dns_record'}" class="form-control" />
+ </div></div>
</div>
<div class="subsectiontoggle"><span></span>{tmpl_var name='virtualization_limits_txt'}<em></em></div>
<div style="display:none;">
- <div class="ctrlHolder">
- <label for="limit_openvz_vm">{tmpl_var name='limit_openvz_vm_txt'}</label>
- <input name="limit_openvz_vm" id="limit_openvz_vm" value="{tmpl_var name='limit_openvz_vm'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_openvz_vm_template_id">{tmpl_var name='limit_openvz_vm_template_id_txt'}</label>
- <select name="limit_openvz_vm_template_id" id="limit_openvz_vm_template_id" class="selectInput">
+ <div class="form-group">
+ <label for="limit_openvz_vm" class="col-sm-3 control-label">{tmpl_var name='limit_openvz_vm_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_openvz_vm" id="limit_openvz_vm" value="{tmpl_var name='limit_openvz_vm'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_openvz_vm_template_id" class="col-sm-3 control-label">{tmpl_var name='limit_openvz_vm_template_id_txt'}</label>
+ <div class="col-sm-9"><select name="limit_openvz_vm_template_id" id="limit_openvz_vm_template_id" class="form-control">
{tmpl_var name='limit_openvz_vm_template_id'}
</select>
- </div>
+ </div></div>
</div>
<div class="subsectiontoggle"><span></span>{tmpl_var name='aps_limits_txt'}<em></em></div>
<div style="display:none;">
- <div class="ctrlHolder">
- <label for="limit_aps">{tmpl_var name='limit_aps_txt'}</label>
- <input name="limit_aps" id="limit_aps" value="{tmpl_var name='limit_aps'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
+ <div class="form-group">
+ <label for="limit_aps" class="col-sm-3 control-label">{tmpl_var name='limit_aps_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_aps" id="limit_aps" value="{tmpl_var name='limit_aps'}" class="form-control" />
+ </div></div>
</div>
<tmpl_if name="is_admin">
<div class="subsectiontoggle"><span></span>{tmpl_var name='client_limits_txt'}<em></em></div>
<div style="display:none;">
- <div class="ctrlHolder">
- <label for="limit_client">{tmpl_var name='limit_client_txt'}</label>
- <input name="limit_client" id="limit_client" value="{tmpl_var name='limit_client'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_domainmodule">{tmpl_var name='limit_domainmodule_txt'}</label>
- <input name="limit_domainmodule" id="limit_domainmodule" value="{tmpl_var name='limit_domainmodule'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
+ <div class="form-group">
+ <label for="limit_client" class="col-sm-3 control-label">{tmpl_var name='limit_client_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_client" id="limit_client" value="{tmpl_var name='limit_client'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_domainmodule" class="col-sm-3 control-label">{tmpl_var name='limit_domainmodule_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_domainmodule" id="limit_domainmodule" value="{tmpl_var name='limit_domainmodule'}" class="form-control" />
+ </div></div>
</div>
</tmpl_if>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','client/client_template_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('client/client_template_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','client/client_template_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="client/client_template_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
diff --git a/interface/web/client/templates/client_template_edit_template.htm b/interface/web/client/templates/client_template_edit_template.htm
index 79ea109..afcbee8 100644
--- a/interface/web/client/templates/client_template_edit_template.htm
+++ b/interface/web/client/templates/client_template_edit_template.htm
@@ -1,28 +1,25 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_client_template">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>Template</legend>
- <div class="ctrlHolder">
- <label for="template_type">{tmpl_var name='template_type_txt'}</label>
- <select name="template_type" id="template_type" class="selectInput">
+ <legend>Template</legend>
+ <div class="form-group">
+ <label for="template_type" class="col-sm-3 control-label">{tmpl_var name='template_type_txt'}</label>
+ <div class="col-sm-9"><select name="template_type" id="template_type" class="form-control">
{tmpl_var name='template_type'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="template_name">{tmpl_var name='template_name_txt'}</label>
- <input name="template_name" id="template_name" value="{tmpl_var name='template_name'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- </fieldset>
+ </div></div>
+ <div class="form-group">
+ <label for="template_name" class="col-sm-3 control-label">{tmpl_var name='template_name_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="template_name" id="template_name" value="{tmpl_var name='template_name'}" class="form-control" />
+ </div></div>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','client/client_template_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('client/client_template_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','client/client_template_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="client/client_template_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
diff --git a/interface/web/client/templates/client_template_list.htm b/interface/web/client/templates/client_template_list.htm
index 5106aef..bc5885b 100644
--- a/interface/web/client/templates/client_template_list.htm
+++ b/interface/web/client/templates/client_template_list.htm
@@ -1,45 +1,45 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_limit_template">
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('client/client_template_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="client/client_template_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_template_id" scope="col"><tmpl_var name="template_id_txt"></th>
- <th class="tbl_col_template_type" scope="col"><tmpl_var name="template_type_txt"></th>
- <th class="tbl_col_template_name" scope="col"><tmpl_var name="template_name_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="template_id_txt"></th>
+ <th><tmpl_var name="template_type_txt"></th>
+ <th><tmpl_var name="template_name_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_template_id"><input type="text" name="search_template_id" value="{tmpl_var name='search_template_id'}" /></td>
- <td class="tbl_col_template_type"><select name="search_template_type">{tmpl_var name='search_template_type'}</select></td>
- <td class="tbl_col_template_name"><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','client/client_template_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><div class="col-sm-9"><input type="text" name="search_template_id" value="{tmpl_var name='search_template_id'}" /></div></td>
+ <td><select name="search_template_type">{tmpl_var name='search_template_type'}</select></td>
+ <td><div class="col-sm-9"><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','client/client_template_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_template_id"><a href="#" onclick="loadContent('client/client_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_id"}</a></td>
- <td class="tbl_col_template_type"><a href="#" onclick="loadContent('client/client_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_type"}</a></td>
- <td class="tbl_col_template_name"><a href="#" onclick="loadContent('client/client_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_name"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="client/client_template_edit.php?id={tmpl_var name='id'}">{tmpl_var name="template_id"}</a></td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -51,11 +51,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="7"><tmpl_var name="paging"></td>
+ <td colspan="7"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/client/templates/clients_list.htm b/interface/web/client/templates/clients_list.htm
index 820e27c..d2a98e0 100644
--- a/interface/web/client/templates/clients_list.htm
+++ b/interface/web/client/templates/clients_list.htm
@@ -1,62 +1,62 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_clients">
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('client/client_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="client/client_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
- <th class="tbl_col_company_name" scope="col"><tmpl_var name="company_name_txt"></th>
- <th class="tbl_col_contact_name" scope="col"><tmpl_var name="contact_name_txt"></th>
- <th class="tbl_col_customer_no" scope="col"><tmpl_var name="customer_no_txt"></th>
- <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
- <th class="tbl_col_city" scope="col"><tmpl_var name="city_txt"></th>
- <th class="tbl_col_country" scope="col"><tmpl_var name="country_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="client_id_txt"></th>
+ <th><tmpl_var name="company_name_txt"></th>
+ <th><tmpl_var name="contact_name_txt"></th>
+ <th><tmpl_var name="customer_no_txt"></th>
+ <th><tmpl_var name="username_txt"></th>
+ <th><tmpl_var name="city_txt"></th>
+ <th><tmpl_var name="country_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_client_pid"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></td>
- <td class="tbl_col_company_name"><input type="text" name="search_company_name" value="{tmpl_var name='search_company_name'}" size="10" /></td>
- <td class="tbl_col_contact_name"><input type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" size="10" /></td>
- <td class="tbl_col_customer_no"><input type="text" name="search_customer_no" value="{tmpl_var name='search_customer_no'}" size="10" /></td>
- <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" size="10" /></td>
- <td class="tbl_col_city"><input type="text" name="search_city" value="{tmpl_var name='search_city'}" size="10" /></td>
- <td class="tbl_col_country"><select name="search_country">{tmpl_var name='search_country'}</select></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','client/client_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><div class="col-sm-9"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_company_name" value="{tmpl_var name='search_company_name'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_customer_no" value="{tmpl_var name='search_customer_no'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_city" value="{tmpl_var name='search_city'}" /></div></td>
+ <td><select name="search_country">{tmpl_var name='search_country'}</select></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','client/client_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_client_pid"><a href="#" onclick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
- <td class="tbl_col_company_name"><a href="#" onclick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="company_name"}</a></td>
- <td class="tbl_col_contact_name"><a href="#" onclick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="contact_name"}</a></td>
- <td class="tbl_col_customer_no"><a href="#" onclick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="customer_no"}</a></td>
- <td class="tbl_col_username"><a href="#" onclick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
- <td class="tbl_col_city"><a href="#" onclick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="city"}</a></td>
- <td class="tbl_col_country"><a href="#" onclick="loadContent('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 class="tbl_col_buttons">
+ <td><a href="#" data-load-content="client/client_edit.php?id={tmpl_var name='id'}">{tmpl_var name="client_id"}</a></td>
+ <td><a href="#" data-load-content="client/client_edit.php?id={tmpl_var name='id'}">{tmpl_var name="company_name"}</a></td>
+ <td><a href="#" data-load-content="client/client_edit.php?id={tmpl_var name='id'}">{tmpl_var name="contact_name"}</a></td>
+ <td><a href="#" data-load-content="client/client_edit.php?id={tmpl_var name='id'}">{tmpl_var name="customer_no"}</a></td>
+ <td><a href="#" data-load-content="client/client_edit.php?id={tmpl_var name='id'}">{tmpl_var name="username"}</a></td>
+ <td><a href="#" data-load-content="client/client_edit.php?id={tmpl_var name='id'}">{tmpl_var name="city"}</a></td>
+ <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="button icons16 icoLoginAs" href="javascript: loadContent('login/login_as.php?cid={tmpl_var name='id'}');"><span>{tmpl_var name='login_as_txt'}</span></a>
+ <a class="button icons16 icoLoginAs" data-load-content="login/login_as.php?cid={tmpl_var name='id'}"><span>{tmpl_var name='login_as_txt'}</span></a>
<tmpl_elseif name="is_reseller">
- <a class="button icons16 icoLoginAs" href="javascript: loadContent('login/login_as.php?cid={tmpl_var name='id'}');"><span>{tmpl_var name='login_as_txt'}</span></a>
+ <a class="button icons16 icoLoginAs" data-load-content="login/login_as.php?cid={tmpl_var name='id'}"><span>{tmpl_var name='login_as_txt'}</span></a>
</tmpl_if>
- <a class="button icons16 icoDelete" href="javascript: del_record('client/client_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -68,11 +68,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="8"><tmpl_var name="paging"></td>
+ <td colspan="8"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/client/templates/domain_edit.htm b/interface/web/client/templates/domain_edit.htm
index 551dbbe..9e02c06 100644
--- a/interface/web/client/templates/domain_edit.htm
+++ b/interface/web/client/templates/domain_edit.htm
@@ -1,32 +1,27 @@
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_domain">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="domain">{tmpl_var name='domain_txt'}</label>
+
+ <div class="form-group">
+ <label for="domain" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}</label>
<tmpl_if name="edit_disabled">
- <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" readonly="readonly" />
- <tmpl_else>
- <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
- </tmpl_if>
+ <div class="col-sm-9"><input type="text" name="domain" id="domain" value="{tmpl_var name='domain'}" class="form-control" readonly="readonly" />
+ </div><tmpl_else>
+ <div class="col-sm-9"><input type="text" name="domain" id="domain" value="{tmpl_var name='domain'}" class="form-control" />
+ </div></tmpl_if>
</div>
- <div class="ctrlHolder">
- <label for="client_group_id">{tmpl_var name='client_txt'}</label>
- <select name="client_group_id" id="client_group_id" class="selectInput">
+ <div class="form-group">
+ <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
+ <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
{tmpl_var name='client_group_id'}
</select>
- </div>
- </fieldset>
+ </div></div>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input type="hidden" name="type" value="local">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','client/domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('client/domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','client/domain_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="client/domain_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/client/templates/domain_list.htm b/interface/web/client/templates/domain_list.htm
index 6224cbc..e6a05d6 100644
--- a/interface/web/client/templates/domain_list.htm
+++ b/interface/web/client/templates/domain_list.htm
@@ -1,40 +1,40 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_domain">
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('client/domain_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="client/domain_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
<tr>
- <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
- <th class="tbl_col_sys_groupid" scope="col"><tmpl_var name="user_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+ <th><tmpl_var name="domain_txt"></th>
+ <th><tmpl_var name="user_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
- <td class="tbl_col_user"><select name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
- <td class="tbl_col_buttons"><button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name='filter_txt'}" onclick="submitForm('pageForm','client/domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></td>
+ <td><div class="col-sm-9"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></div></td>
+ <td><select name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
+ <td><button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name='filter_txt'}" onclick="submitForm('pageForm','client/domain_list.php');">{tmpl_var name="filter_txt"}</button></td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_domain"><a href="#" onclick="loadContent('client/domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
- <td class="tbl_col_domain"><a href="#" onclick="loadContent('client/domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="sys_groupid"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" href="javascript: del_record('client/domain_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+ <td><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>
</td>
</tr>
</tmpl_loop>
@@ -47,11 +47,10 @@
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+ <td colspan="4"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/client/templates/message_template.htm b/interface/web/client/templates/message_template.htm
index 4c0c623..eccd583 100644
--- a/interface/web/client/templates/message_template.htm
+++ b/interface/web/client/templates/message_template.htm
@@ -1,35 +1,37 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
<div class="panel panel_invoice_message_template">
<div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>Settings</legend>
- <div class="ctrlHolder">
- <label for="template_type">{tmpl_var name='template_type_txt'}</label>
- <select name="template_type" id="template_type" class="selectInput">
+ <legend>Settings</legend>
+ <div class="form-group">
+ <label for="template_type" class="col-sm-3 control-label">{tmpl_var name='template_type_txt'}</label>
+ <div class="col-sm-9"><select name="template_type" id="template_type" class="form-control">
{tmpl_var name='template_type'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="template_name">{tmpl_var name='template_name_txt'}</label>
- <input name="template_name" id="template_name" value="{tmpl_var name='template_name'}" size="30" maxlength="255" type="text" class="textInput" />
+ </div></div>
+ <div class="form-group">
+ <label for="template_name" class="col-sm-3 control-label">{tmpl_var name='template_name_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="template_name" id="template_name" value="{tmpl_var name='template_name'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="subject" class="col-sm-3 control-label">{tmpl_var name='subject_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="subject" id="subject" value="{tmpl_var name='subject'}" style="width:500px" class="form-control" />
+ </div><br clear="all">{tmpl_var name='variables_txt'}: {tmpl_var name="message_variables"} <br />{tmpl_var name='variables_description_txt'}
</div>
- <div class="ctrlHolder">
- <label for="subject">{tmpl_var name='subject_txt'}</label>
- <input name="subject" id="subject" value="{tmpl_var name='subject'}" style="width:500px" size="30" maxlength="255" type="text" class="textInput" />
- <br clear="all">{tmpl_var name='variables_txt'}: {tmpl_var name="message_variables"} <br />{tmpl_var name='variables_description_txt'}
- </div>
- <div class="ctrlHolder">
- <label for="message">{tmpl_var name='message_txt'}</label>
+ <div class="form-group">
+ <label for="message" class="col-sm-3 control-label">{tmpl_var name='message_txt'}</label>
<textarea name="message" id="message" rows='' cols='' style="width:500px">{tmpl_var name='message'}</textarea>
<br clear="all">{tmpl_var name='variables_txt'}: {tmpl_var name="message_variables"} <br />{tmpl_var name='variables_description_txt'}
</div>
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','client/message_template_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('client/message_template_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </fieldset>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','client/message_template_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="client/message_template_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
diff --git a/interface/web/client/templates/message_template_list.htm b/interface/web/client/templates/message_template_list.htm
index 27b0113..ce2c50a 100644
--- a/interface/web/client/templates/message_template_list.htm
+++ b/interface/web/client/templates/message_template_list.htm
@@ -1,40 +1,40 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
-<div class="panel panel_list_invoice_message_template">
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="iconstxt icoAdd" type="button" onClick="loadContent('billing/invoice_message_template_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="iconstxt icoAdd" type="button" data-load-content="billing/invoice_message_template_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
<tr>
- <th class="tbl_col_template_type" scope="col"><tmpl_var name="template_type_txt"></th>
- <th class="tbl_col_template_name" scope="col"><tmpl_var name="template_name_txt"></th>
- <th class="tbl_col_buttons" scope="col"> </th>
+ <th><tmpl_var name="template_type_txt"></th>
+ <th><tmpl_var name="template_name_txt"></th>
+ <th> </th>
</tr>
<tr>
- <td class="tbl_col_template_type"><select name="search_template_type" onChange="submitForm('pageForm','billing/invoice_message_template_list.php');">{tmpl_var name='search_template_type'}</select></td>
- <td class="tbl_col_template_name"><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></td>
- <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','billing/invoice_message_template_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+ <td><select name="search_template_type" onChange="submitForm('pageForm','billing/invoice_message_template_list.php');">{tmpl_var name='search_template_type'}</select></td>
+ <td><div class="col-sm-9"><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></div></td>
+ <td><div class="buttons"><button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','billing/invoice_message_template_list.php');">{tmpl_var name="filter_txt"}</button></div></td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_template_type"><a href="#" onClick="loadContent('billing/invoice_message_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_type"}</a></td>
- <td class="tbl_col_template_name"><a href="#" onClick="loadContent('billing/invoice_message_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_name"}</a></td>
- <td class="tbl_col_buttons">
+ <td><a href="#" data-load-content="billing/invoice_message_template_edit.php?id={tmpl_var name='id'}">{tmpl_var name="template_type"}</a></td>
+ <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="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <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>
</div>
</td>
</tr>
@@ -42,11 +42,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+ <td colspan="3"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
</div>
+
+
\ No newline at end of file
diff --git a/interface/web/client/templates/reseller_edit_address.htm b/interface/web/client/templates/reseller_edit_address.htm
index 41160cf..aab9358 100644
--- a/interface/web/client/templates/reseller_edit_address.htm
+++ b/interface/web/client/templates/reseller_edit_address.htm
@@ -1,179 +1,176 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_client">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>Address</legend>
- <div class="ctrlHolder">
- <label for="company_name">{tmpl_var name='company_name_txt'}</label>
- <input name="company_name" id="company_name" value="{tmpl_var name='company_name'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="gender">{tmpl_var name='gender_txt'}</label>
- <select name="gender" id="gender" class="selectInput">
+ <legend>Address</legend>
+ <div class="form-group">
+ <label for="company_name" class="col-sm-3 control-label">{tmpl_var name='company_name_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="company_name" id="company_name" value="{tmpl_var name='company_name'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="gender" class="col-sm-3 control-label">{tmpl_var name='gender_txt'}</label>
+ <div class="col-sm-9"><select name="gender" id="gender" class="form-control">
{tmpl_var name='gender'}
</select>
+ </div></div>
+ <div class="form-group">
+ <label for="contact_firstname" class="col-sm-3 control-label">{tmpl_var name='contact_firstname_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="contact_firstname" id="contact_firstname" value="{tmpl_var name='contact_firstname'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="contact_name" class="col-sm-3 control-label">{tmpl_var name='contact_name_txt'}*</label>
+ <div class="col-sm-9"><input type="text" name="contact_name" id="contact_name" value="{tmpl_var name='contact_name'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="customer_no" class="col-sm-3 control-label">{tmpl_var name='customer_no_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="customer_no" id="customer_no" value="{tmpl_var name='customer_no'}" class="form-control" />
+ </div><input name="customer_no_org" id="customer_no_org" value="{tmpl_var name='customer_no'}" type="hidden" />
</div>
- <div class="ctrlHolder">
- <label for="contact_firstname">{tmpl_var name='contact_firstname_txt'}</label>
- <input name="contact_firstname" id="contact_firstname" value="{tmpl_var name='contact_firstname'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="contact_name">{tmpl_var name='contact_name_txt'}*</label>
- <input name="contact_name" id="contact_name" value="{tmpl_var name='contact_name'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="customer_no">{tmpl_var name='customer_no_txt'}</label>
- <input name="customer_no" id="customer_no" value="{tmpl_var name='customer_no'}" size="30" maxlength="255" type="text" class="textInput" />
- <input name="customer_no_org" id="customer_no_org" value="{tmpl_var name='customer_no'}" type="hidden" />
- </div>
- <div class="ctrlHolder">
- <label for="username">{tmpl_var name='username_txt'}*</label>
- <input name="username" id="username" value="{tmpl_var name='username'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="password">{tmpl_var name='password_txt'}</label>
+ <div class="form-group">
+ <label for="username" class="col-sm-3 control-label">{tmpl_var name='username_txt'}*</label>
+ <div class="col-sm-9"><input type="text" name="username" id="username" value="{tmpl_var name='username'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="password" class="col-sm-3 control-label">{tmpl_var name='password_txt'}</label>
<input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" /> <a href="javascript:void(0);" onclick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='password_strength_txt'}</p>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='password_strength_txt'}</label>
<div id="passBar"></div>
<p class="formHint"><span id="passText"> </span></p>
</div>
- <div class="ctrlHolder">
- <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+ <div class="form-group">
+ <label for="repeat_password" class="col-sm-3 control-label">{tmpl_var name='repeat_password_txt'}</label>
<input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;" autocomplete="off" onkeyup="checkPassMatch('password','repeat_password');" />
</div>
<div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
<div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
- <div class="ctrlHolder">
- <label for="language">{tmpl_var name='language_txt'}</label>
- <select name="language" id="language" class="selectInput flags">
+ <div class="form-group">
+ <label for="language" class="col-sm-3 control-label">{tmpl_var name='language_txt'}</label>
+ <div class="col-sm-9"><select name="language" id="language" class="form-control">
{tmpl_var name='language'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="usertheme">{tmpl_var name='usertheme_txt'}</label>
- <select name="usertheme" id="usertheme" class="selectInput">
+ </div></div>
+ <div class="form-group">
+ <label for="usertheme" class="col-sm-3 control-label">{tmpl_var name='usertheme_txt'}</label>
+ <div class="col-sm-9"><select name="usertheme" id="usertheme" class="form-control">
{tmpl_var name='usertheme'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="street">{tmpl_var name='street_txt'}</label>
- <input name="street" id="street" value="{tmpl_var name='street'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="zip">{tmpl_var name='zip_txt'}</label>
- <input name="zip" id="zip" value="{tmpl_var name='zip'}" size="10" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="city">{tmpl_var name='city_txt'}</label>
- <input name="city" id="city" value="{tmpl_var name='city'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="state">{tmpl_var name='state_txt'}</label>
- <input name="state" id="state" value="{tmpl_var name='state'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="country">{tmpl_var name='country_txt'}</label>
- <select name="country" id="country" class="selectInput flags">
+ </div></div>
+ <div class="form-group">
+ <label for="street" class="col-sm-3 control-label">{tmpl_var name='street_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="street" id="street" value="{tmpl_var name='street'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="zip" class="col-sm-3 control-label">{tmpl_var name='zip_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="zip" id="zip" value="{tmpl_var name='zip'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="city" class="col-sm-3 control-label">{tmpl_var name='city_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="city" id="city" value="{tmpl_var name='city'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="state" class="col-sm-3 control-label">{tmpl_var name='state_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="state" id="state" value="{tmpl_var name='state'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="country" class="col-sm-3 control-label">{tmpl_var name='country_txt'}</label>
+ <div class="col-sm-9"><select name="country" id="country" class="form-control">
{tmpl_var name='country'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="telephone">{tmpl_var name='telephone_txt'}</label>
- <input name="telephone" id="telephone" value="{tmpl_var name='telephone'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="mobile">{tmpl_var name='mobile_txt'}</label>
- <input name="mobile" id="mobile" value="{tmpl_var name='mobile'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="fax">{tmpl_var name='fax_txt'}</label>
- <input name="fax" id="fax" value="{tmpl_var name='fax'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="email">{tmpl_var name='email_txt'}</label>
- <input name="email" id="email" value="{tmpl_var name='email'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="internet">{tmpl_var name='internet_txt'}</label>
- <input name="internet" id="internet" value="{tmpl_var name='internet'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="icq">{tmpl_var name='icq_txt'}</label>
- <input name="icq" id="icq" value="{tmpl_var name='icq'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="vat_id">{tmpl_var name='vat_id_txt'}</label>
- <input name="vat_id" id="vat_id" value="{tmpl_var name='vat_id'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="company_id">{tmpl_var name='company_id_txt'}</label>
- <input name="company_id" id="company_id" value="{tmpl_var name='company_id'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="bank_account_owner">{tmpl_var name='bank_account_owner_txt'}</label>
- <input name="bank_account_owner" id="bank_account_owner" value="{tmpl_var name='bank_account_owner'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="bank_account_number">{tmpl_var name='bank_account_number_txt'}</label>
- <input name="bank_account_number" id="bank_account_number" value="{tmpl_var name='bank_account_number'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="bank_code">{tmpl_var name='bank_code_txt'}</label>
- <input name="bank_code" id="bank_code" value="{tmpl_var name='bank_code'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="bank_name">{tmpl_var name='bank_name_txt'}</label>
- <input name="bank_name" id="bank_name" value="{tmpl_var name='bank_name'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="bank_account_iban">{tmpl_var name='bank_account_iban_txt'}</label>
- <input name="bank_account_iban" id="bank_account_iban" value="{tmpl_var name='bank_account_iban'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="bank_account_swift">{tmpl_var name='bank_account_swift_txt'}</label>
- <input name="bank_account_swift" id="bank_account_swift" value="{tmpl_var name='bank_account_swift'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="paypal_email">{tmpl_var name='paypal_email_txt'}</label>
- <input name="paypal_email" id="paypal_email" value="{tmpl_var name='paypal_email'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="added_date">{tmpl_var name='added_date_txt'}</label>
- <input name="added_date" id="added_date" value="{tmpl_var name='added_date'}" size="10" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="added_by">{tmpl_var name='added_by_txt'}</label>
- <input name="added_by" id="added_by" value="{tmpl_var name='added_by'}" size="10" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="notes">{tmpl_var name='notes_txt'}</label>
+ </div></div>
+ <div class="form-group">
+ <label for="telephone" class="col-sm-3 control-label">{tmpl_var name='telephone_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="telephone" id="telephone" value="{tmpl_var name='telephone'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="mobile" class="col-sm-3 control-label">{tmpl_var name='mobile_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="mobile" id="mobile" value="{tmpl_var name='mobile'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="fax" class="col-sm-3 control-label">{tmpl_var name='fax_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="fax" id="fax" value="{tmpl_var name='fax'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="email" class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="email" id="email" value="{tmpl_var name='email'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="internet" class="col-sm-3 control-label">{tmpl_var name='internet_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="internet" id="internet" value="{tmpl_var name='internet'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="icq" class="col-sm-3 control-label">{tmpl_var name='icq_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="icq" id="icq" value="{tmpl_var name='icq'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="vat_id" class="col-sm-3 control-label">{tmpl_var name='vat_id_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="vat_id" id="vat_id" value="{tmpl_var name='vat_id'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="company_id" class="col-sm-3 control-label">{tmpl_var name='company_id_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="company_id" id="company_id" value="{tmpl_var name='company_id'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="bank_account_owner" class="col-sm-3 control-label">{tmpl_var name='bank_account_owner_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="bank_account_owner" id="bank_account_owner" value="{tmpl_var name='bank_account_owner'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="bank_account_number" class="col-sm-3 control-label">{tmpl_var name='bank_account_number_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="bank_account_number" id="bank_account_number" value="{tmpl_var name='bank_account_number'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="bank_code" class="col-sm-3 control-label">{tmpl_var name='bank_code_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="bank_code" id="bank_code" value="{tmpl_var name='bank_code'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="bank_name" class="col-sm-3 control-label">{tmpl_var name='bank_name_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="bank_name" id="bank_name" value="{tmpl_var name='bank_name'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="bank_account_iban" class="col-sm-3 control-label">{tmpl_var name='bank_account_iban_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="bank_account_iban" id="bank_account_iban" value="{tmpl_var name='bank_account_iban'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="bank_account_swift" class="col-sm-3 control-label">{tmpl_var name='bank_account_swift_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="bank_account_swift" id="bank_account_swift" value="{tmpl_var name='bank_account_swift'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="paypal_email" class="col-sm-3 control-label">{tmpl_var name='paypal_email_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="paypal_email" id="paypal_email" value="{tmpl_var name='paypal_email'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="added_date" class="col-sm-3 control-label">{tmpl_var name='added_date_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="added_date" id="added_date" value="{tmpl_var name='added_date'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="added_by" class="col-sm-3 control-label">{tmpl_var name='added_by_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="added_by" id="added_by" value="{tmpl_var name='added_by'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="notes" class="col-sm-3 control-label">{tmpl_var name='notes_txt'}</label>
<textarea name="notes" id="notes" rows='10' cols='30'>{tmpl_var name='notes'}</textarea>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='locked_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='locked_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='locked'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='canceled_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='canceled_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='canceled'}
</div>
</div>
{tmpl_var name='required_fields_txt'}
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','client/reseller_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('client/reseller_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','client/reseller_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="client/reseller_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/client/templates/reseller_edit_limits.htm b/interface/web/client/templates/reseller_edit_limits.htm
index 55652d5..ca7862e 100644
--- a/interface/web/client/templates/reseller_edit_limits.htm
+++ b/interface/web/client/templates/reseller_edit_limits.htm
@@ -1,35 +1,37 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
<div class="panel panel_client">
<tmpl_if name="is_admin">
<div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
<div class="buttons topbuttons">
- <button class="positive iconstxt icoAdd" type="button" value="{tmpl_var name='add_additional_template_txt'}" onclick="addAdditionalTemplate();"><span>{tmpl_var name='add_additional_template_txt'}</span></button>
+ <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='add_additional_template_txt'}" onclick="addAdditionalTemplate();">{tmpl_var name='add_additional_template_txt'}</button>
</div>
- </fieldset>
+
</div>
</tmpl_if>
<div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>Limits</legend>
+ <legend>Limits</legend>
<tmpl_if name="is_admin">
- <div class="ctrlHolder">
- <label for="template_master">{tmpl_var name='template_master_txt'}</label>
- <select name="template_master" id="template_master" class="selectInput">
+ <div class="form-group">
+ <label for="template_master" class="col-sm-3 control-label">{tmpl_var name='template_master_txt'}</label>
+ <div class="col-sm-9"><select name="template_master" id="template_master" class="form-control">
{tmpl_var name='template_master'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="template_additional">{tmpl_var name='template_additional_txt'}</label>
- <select name="tpl_add_select" id="tpl_add_select" class="selectInput">
+ </div></div>
+ <div class="form-group">
+ <label for="template_additional" class="col-sm-3 control-label">{tmpl_var name='template_additional_txt'}</label>
+ <div class="col-sm-9"><select name="tpl_add_select" id="tpl_add_select" class="form-control">
{tmpl_var name='tpl_add_select'}
</select>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_template_additional_txt'}</p>
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_template_additional_txt'}</label>
<div id="template_additional_list" class="multiField">
<ul>
{tmpl_var name='template_additional_list'}
@@ -37,296 +39,296 @@
</div>
<input type="hidden" id="template_additional" name="template_additional" value="{tmpl_var name='template_additional'}">
</div>
- <div class="ctrlHolder">
+ <div class="form-group">
</div>
</tmpl_if>
- <div class="ctrlHolder">
- <label for="customer_no_template">{tmpl_var name='customer_no_template_txt'}</label>
- <input name="customer_no_template" id="customer_no_template" value="{tmpl_var name='customer_no_template'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
- </div>
- <div class="ctrlHolder">
- <label for="customer_no_start">{tmpl_var name='customer_no_start_txt'}</label>
- <input name="customer_no_start" id="customer_no_start" value="{tmpl_var name='customer_no_start'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
- </div>
- <div class="ctrlHolder">
- <label for="customer_no_counter">{tmpl_var name='customer_no_counter_txt'}</label>
- <input name="customer_no_counter" id="customer_no_counter" value="{tmpl_var name='customer_no_counter'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
- </div>
+ <div class="form-group">
+ <label for="customer_no_template" class="col-sm-3 control-label">{tmpl_var name='customer_no_template_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="customer_no_template" id="customer_no_template" value="{tmpl_var name='customer_no_template'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="customer_no_start" class="col-sm-3 control-label">{tmpl_var name='customer_no_start_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="customer_no_start" id="customer_no_start" value="{tmpl_var name='customer_no_start'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="customer_no_counter" class="col-sm-3 control-label">{tmpl_var name='customer_no_counter_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="customer_no_counter" id="customer_no_counter" value="{tmpl_var name='customer_no_counter'}" class="form-control" />
+ </div></div>
<div class="subsectiontoggle"><span class="showing"></span>{tmpl_var name='web_limits_txt'}<em class="showing"></em></div>
<div>
- <div class="ctrlHolder">
- <label for="web_servers">{tmpl_var name='web_servers_txt'}</label>
- <select data-placeholder="{tmpl_var name='web_servers_placeholder'}" multiple name="web_servers[]" id="web_servers" class="selectInput chosen-select">
+ <div class="form-group">
+ <label for="web_servers" class="col-sm-3 control-label">{tmpl_var name='web_servers_txt'}</label>
+ <div class="col-sm-9"><select data-placeholder="{tmpl_var name='web_servers_placeholder'}" multiple name="web_servers[]" id="web_servers" class="form-control">
{tmpl_var name='web_servers'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="limit_web_domain">{tmpl_var name='limit_web_domain_txt'}</label>
- <input name="limit_web_domain" id="limit_web_domain" value="{tmpl_var name='limit_web_domain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_web_quota">{tmpl_var name='limit_web_quota_txt'}</label>
- <input name="limit_web_quota" id="limit_web_quota" value="{tmpl_var name='limit_web_quota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" /> MB
- </div>
- <div class="ctrlHolder">
- <label for="limit_traffic_quota">{tmpl_var name='limit_traffic_quota_txt'}</label>
- <input name="limit_traffic_quota" id="limit_traffic_quota" value="{tmpl_var name='limit_traffic_quota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" /> MB
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='web_php_options_txt'}</p>
- <div class="multiField">
+ </div></div>
+ <div class="form-group">
+ <label for="limit_web_domain" class="col-sm-3 control-label">{tmpl_var name='limit_web_domain_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_web_domain" id="limit_web_domain" value="{tmpl_var name='limit_web_domain'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_web_quota" class="col-sm-3 control-label">{tmpl_var name='limit_web_quota_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_web_quota" id="limit_web_quota" value="{tmpl_var name='limit_web_quota'}" class="form-control" /> MB
+ </div></div>
+ <div class="form-group">
+ <label for="limit_traffic_quota" class="col-sm-3 control-label">{tmpl_var name='limit_traffic_quota_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_traffic_quota" id="limit_traffic_quota" value="{tmpl_var name='limit_traffic_quota'}" class="form-control" /> MB
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='web_php_options_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='web_php_options'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='limit_cgi_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='limit_cgi_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='limit_cgi'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='limit_ssi_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='limit_ssi_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='limit_ssi'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='limit_perl_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='limit_perl_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='limit_perl'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='limit_ruby_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='limit_ruby_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='limit_ruby'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='limit_python_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='limit_python_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='limit_python'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='force_suexec_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='force_suexec_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='force_suexec'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='limit_hterror_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='limit_hterror_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='limit_hterror'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='limit_wildcard_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='limit_wildcard_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='limit_wildcard'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='limit_ssl_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='limit_ssl_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='limit_ssl'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="limit_web_aliasdomain">{tmpl_var name='limit_web_aliasdomain_txt'}</label>
- <input name="limit_web_aliasdomain" id="limit_web_aliasdomain" value="{tmpl_var name='limit_web_aliasdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_web_subdomain">{tmpl_var name='limit_web_subdomain_txt'}</label>
- <input name="limit_web_subdomain" id="limit_web_subdomain" value="{tmpl_var name='limit_web_subdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_ftp_user">{tmpl_var name='limit_ftp_user_txt'}</label>
- <input name="limit_ftp_user" id="limit_ftp_user" value="{tmpl_var name='limit_ftp_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_shell_user">{tmpl_var name='limit_shell_user_txt'}</label>
- <input name="limit_shell_user" id="limit_shell_user" value="{tmpl_var name='limit_shell_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='ssh_chroot_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label for="limit_web_aliasdomain" class="col-sm-3 control-label">{tmpl_var name='limit_web_aliasdomain_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_web_aliasdomain" id="limit_web_aliasdomain" value="{tmpl_var name='limit_web_aliasdomain'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_web_subdomain" class="col-sm-3 control-label">{tmpl_var name='limit_web_subdomain_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_web_subdomain" id="limit_web_subdomain" value="{tmpl_var name='limit_web_subdomain'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_ftp_user" class="col-sm-3 control-label">{tmpl_var name='limit_ftp_user_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_ftp_user" id="limit_ftp_user" value="{tmpl_var name='limit_ftp_user'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_shell_user" class="col-sm-3 control-label">{tmpl_var name='limit_shell_user_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_shell_user" id="limit_shell_user" value="{tmpl_var name='limit_shell_user'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='ssh_chroot_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='ssh_chroot'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="limit_webdav_user">{tmpl_var name='limit_webdav_user_txt'}</label>
- <input name="limit_webdav_user" id="limit_webdav_user" value="{tmpl_var name='limit_webdav_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='limit_backup_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label for="limit_webdav_user" class="col-sm-3 control-label">{tmpl_var name='limit_webdav_user_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_webdav_user" id="limit_webdav_user" value="{tmpl_var name='limit_webdav_user'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='limit_backup_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='limit_backup'}
</div>
</div>
</div>
<div class="subsectiontoggle"><span></span>{tmpl_var name='email_limits_txt'}<em></em></div>
<div style="display:none;">
- <div class="ctrlHolder">
- <label for="mail_servers">{tmpl_var name='mail_servers_txt'}</label>
- <select data-placeholder="{tmpl_var name='mail_servers_placeholder'}" multiple name="mail_servers[]" id="mail_servers" class="selectInput chosen-select">
+ <div class="form-group">
+ <label for="mail_servers" class="col-sm-3 control-label">{tmpl_var name='mail_servers_txt'}</label>
+ <div class="col-sm-9"><select data-placeholder="{tmpl_var name='mail_servers_placeholder'}" multiple name="mail_servers[]" id="mail_servers" class="form-control">
{tmpl_var name='mail_servers'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="limit_maildomain">{tmpl_var name='limit_maildomain_txt'}</label>
- <input name="limit_maildomain" id="limit_maildomain" value="{tmpl_var name='limit_maildomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_mailmailinglist">{tmpl_var name='limit_mailmailinglist_txt'}</label>
- <input name="limit_mailmailinglist" id="limit_mailmailinglist" value="{tmpl_var name='limit_mailmailinglist'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_mailbox">{tmpl_var name='limit_mailbox_txt'}</label>
- <input name="limit_mailbox" id="limit_mailbox" value="{tmpl_var name='limit_mailbox'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_mailalias">{tmpl_var name='limit_mailalias_txt'}</label>
- <input name="limit_mailalias" id="limit_mailalias" value="{tmpl_var name='limit_mailalias'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_mailaliasdomain">{tmpl_var name='limit_mailaliasdomain_txt'}</label>
- <input name="limit_mailaliasdomain" id="limit_mailaliasdomain" value="{tmpl_var name='limit_mailaliasdomain'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_mailforward">{tmpl_var name='limit_mailforward_txt'}</label>
- <input name="limit_mailforward" id="limit_mailforward" value="{tmpl_var name='limit_mailforward'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_mailcatchall">{tmpl_var name='limit_mailcatchall_txt'}</label>
- <input name="limit_mailcatchall" id="limit_mailcatchall" value="{tmpl_var name='limit_mailcatchall'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_mailrouting">{tmpl_var name='limit_mailrouting_txt'}</label>
- <input name="limit_mailrouting" id="limit_mailrouting" value="{tmpl_var name='limit_mailrouting'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_mailfilter">{tmpl_var name='limit_mailfilter_txt'}</label>
- <input name="limit_mailfilter" id="limit_mailfilter" value="{tmpl_var name='limit_mailfilter'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_fetchmail">{tmpl_var name='limit_fetchmail_txt'}</label>
- <input name="limit_fetchmail" id="limit_fetchmail" value="{tmpl_var name='limit_fetchmail'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_mailquota">{tmpl_var name='limit_mailquota_txt'}</label>
- <input name="limit_mailquota" id="limit_mailquota" value="{tmpl_var name='limit_mailquota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" /> MB
- </div>
- <div class="ctrlHolder">
- <label for="limit_spamfilter_wblist">{tmpl_var name='limit_spamfilter_wblist_txt'}</label>
- <input name="limit_spamfilter_wblist" id="limit_spamfilter_wblist" value="{tmpl_var name='limit_spamfilter_wblist'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_spamfilter_user">{tmpl_var name='limit_spamfilter_user_txt'}</label>
- <input name="limit_spamfilter_user" id="limit_spamfilter_user" value="{tmpl_var name='limit_spamfilter_user'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_spamfilter_policy">{tmpl_var name='limit_spamfilter_policy_txt'}</label>
- <input name="limit_spamfilter_policy" id="limit_spamfilter_policy" value="{tmpl_var name='limit_spamfilter_policy'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
+ </div></div>
+ <div class="form-group">
+ <label for="limit_maildomain" class="col-sm-3 control-label">{tmpl_var name='limit_maildomain_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_maildomain" id="limit_maildomain" value="{tmpl_var name='limit_maildomain'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_mailmailinglist" class="col-sm-3 control-label">{tmpl_var name='limit_mailmailinglist_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_mailmailinglist" id="limit_mailmailinglist" value="{tmpl_var name='limit_mailmailinglist'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_mailbox" class="col-sm-3 control-label">{tmpl_var name='limit_mailbox_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_mailbox" id="limit_mailbox" value="{tmpl_var name='limit_mailbox'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_mailalias" class="col-sm-3 control-label">{tmpl_var name='limit_mailalias_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_mailalias" id="limit_mailalias" value="{tmpl_var name='limit_mailalias'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_mailaliasdomain" class="col-sm-3 control-label">{tmpl_var name='limit_mailaliasdomain_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_mailaliasdomain" id="limit_mailaliasdomain" value="{tmpl_var name='limit_mailaliasdomain'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_mailforward" class="col-sm-3 control-label">{tmpl_var name='limit_mailforward_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_mailforward" id="limit_mailforward" value="{tmpl_var name='limit_mailforward'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_mailcatchall" class="col-sm-3 control-label">{tmpl_var name='limit_mailcatchall_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_mailcatchall" id="limit_mailcatchall" value="{tmpl_var name='limit_mailcatchall'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_mailrouting" class="col-sm-3 control-label">{tmpl_var name='limit_mailrouting_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_mailrouting" id="limit_mailrouting" value="{tmpl_var name='limit_mailrouting'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_mailfilter" class="col-sm-3 control-label">{tmpl_var name='limit_mailfilter_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_mailfilter" id="limit_mailfilter" value="{tmpl_var name='limit_mailfilter'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_fetchmail" class="col-sm-3 control-label">{tmpl_var name='limit_fetchmail_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_fetchmail" id="limit_fetchmail" value="{tmpl_var name='limit_fetchmail'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_mailquota" class="col-sm-3 control-label">{tmpl_var name='limit_mailquota_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_mailquota" id="limit_mailquota" value="{tmpl_var name='limit_mailquota'}" class="form-control" /> MB
+ </div></div>
+ <div class="form-group">
+ <label for="limit_spamfilter_wblist" class="col-sm-3 control-label">{tmpl_var name='limit_spamfilter_wblist_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_spamfilter_wblist" id="limit_spamfilter_wblist" value="{tmpl_var name='limit_spamfilter_wblist'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_spamfilter_user" class="col-sm-3 control-label">{tmpl_var name='limit_spamfilter_user_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_spamfilter_user" id="limit_spamfilter_user" value="{tmpl_var name='limit_spamfilter_user'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_spamfilter_policy" class="col-sm-3 control-label">{tmpl_var name='limit_spamfilter_policy_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_spamfilter_policy" id="limit_spamfilter_policy" value="{tmpl_var name='limit_spamfilter_policy'}" class="form-control" />
+ </div></div>
</div>
<div class="subsectiontoggle"><span></span>{tmpl_var name='database_limits_txt'}<em></em></div>
<div style="display:none;">
- <div class="ctrlHolder">
- <label for="db_servers">{tmpl_var name='db_servers_txt'}</label>
- <select data-placeholder="{tmpl_var name='db_servers_placeholder'}" multiple name="db_servers[]" id="db_servers" class="selectInput chosen-select">
+ <div class="form-group">
+ <label for="db_servers" class="col-sm-3 control-label">{tmpl_var name='db_servers_txt'}</label>
+ <div class="col-sm-9"><select data-placeholder="{tmpl_var name='db_servers_placeholder'}" multiple name="db_servers[]" id="db_servers" class="form-control">
{tmpl_var name='db_servers'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="limit_database">{tmpl_var name='limit_database_txt'}</label>
- <input name="limit_database" id="limit_database" value="{tmpl_var name='limit_database'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
+ </div></div>
+ <div class="form-group">
+ <label for="limit_database" class="col-sm-3 control-label">{tmpl_var name='limit_database_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_database" id="limit_database" value="{tmpl_var name='limit_database'}" class="form-control" />
+ </div></div>
</div>
<div class="subsectiontoggle"><span></span>{tmpl_var name='cron_job_limits_txt'}<em></em></div>
<div style="display:none;">
- <div class="ctrlHolder">
- <label for="limit_cron">{tmpl_var name='limit_cron_txt'}</label>
- <input name="limit_cron" id="limit_cron" value="{tmpl_var name='limit_cron'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_cron_type">{tmpl_var name='limit_cron_type_txt'}</label>
- <select name="limit_cron_type" id="limit_cron_type" class="selectInput formLengthHalf">
+ <div class="form-group">
+ <label for="limit_cron" class="col-sm-3 control-label">{tmpl_var name='limit_cron_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_cron" id="limit_cron" value="{tmpl_var name='limit_cron'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_cron_type" class="col-sm-3 control-label">{tmpl_var name='limit_cron_type_txt'}</label>
+ <div class="col-sm-9"><select name="limit_cron_type" id="limit_cron_type" class="form-control">
{tmpl_var name='limit_cron_type'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="limit_cron_frequency">{tmpl_var name='limit_cron_frequency_txt'}</label>
- <input name="limit_cron_frequency" id="limit_cron_frequency" value="{tmpl_var name='limit_cron_frequency'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
+ </div></div>
+ <div class="form-group">
+ <label for="limit_cron_frequency" class="col-sm-3 control-label">{tmpl_var name='limit_cron_frequency_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_cron_frequency" id="limit_cron_frequency" value="{tmpl_var name='limit_cron_frequency'}" class="form-control" />
+ </div></div>
</div>
<div class="subsectiontoggle"><span></span>{tmpl_var name='dns_limits_txt'}<em></em></div>
<div style="display:none;">
- <div class="ctrlHolder">
- <label for="dns_servers">{tmpl_var name='dns_servers_txt'}</label>
- <select data-placeholder="{tmpl_var name='dns_servers_placeholder'}" multiple name="dns_servers[]" id="dns_servers" class="selectInput chosen-select">
+ <div class="form-group">
+ <label for="dns_servers" class="col-sm-3 control-label">{tmpl_var name='dns_servers_txt'}</label>
+ <div class="col-sm-9"><select data-placeholder="{tmpl_var name='dns_servers_placeholder'}" multiple name="dns_servers[]" id="dns_servers" class="form-control">
{tmpl_var name='dns_servers'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="limit_dns_zone">{tmpl_var name='limit_dns_zone_txt'}</label>
- <input name="limit_dns_zone" id="limit_dns_zone" value="{tmpl_var name='limit_dns_zone'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="default_slave_dnsserver">{tmpl_var name='default_slave_dnsserver_txt'}</label>
- <select name="default_slave_dnsserver" id="default_slave_dnsserver" class="selectInput">
+ </div></div>
+ <div class="form-group">
+ <label for="limit_dns_zone" class="col-sm-3 control-label">{tmpl_var name='limit_dns_zone_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_dns_zone" id="limit_dns_zone" value="{tmpl_var name='limit_dns_zone'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="default_slave_dnsserver" class="col-sm-3 control-label">{tmpl_var name='default_slave_dnsserver_txt'}</label>
+ <div class="col-sm-9"><select name="default_slave_dnsserver" id="default_slave_dnsserver" class="form-control">
{tmpl_var name='default_slave_dnsserver'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="limit_dns_slave_zone">{tmpl_var name='limit_dns_slave_zone_txt'}</label>
- <input name="limit_dns_slave_zone" id="limit_dns_slave_zone" value="{tmpl_var name='limit_dns_slave_zone'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_dns_record">{tmpl_var name='limit_dns_record_txt'}</label>
- <input name="limit_dns_record" id="limit_dns_record" value="{tmpl_var name='limit_dns_record'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
+ </div></div>
+ <div class="form-group">
+ <label for="limit_dns_slave_zone" class="col-sm-3 control-label">{tmpl_var name='limit_dns_slave_zone_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_dns_slave_zone" id="limit_dns_slave_zone" value="{tmpl_var name='limit_dns_slave_zone'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_dns_record" class="col-sm-3 control-label">{tmpl_var name='limit_dns_record_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_dns_record" id="limit_dns_record" value="{tmpl_var name='limit_dns_record'}" class="form-control" />
+ </div></div>
</div>
<div class="subsectiontoggle"><span></span>{tmpl_var name='virtualization_limits_txt'}<em></em></div>
<div style="display:none;">
- <div class="ctrlHolder">
- <label for="limit_openvz_vm">{tmpl_var name='limit_openvz_vm_txt'}</label>
- <input name="limit_openvz_vm" id="limit_openvz_vm" value="{tmpl_var name='limit_openvz_vm'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_openvz_vm_template_id">{tmpl_var name='limit_openvz_vm_template_id_txt'}</label>
- <select name="limit_openvz_vm_template_id" id="limit_openvz_vm_template_id" class="selectInput">
+ <div class="form-group">
+ <label for="limit_openvz_vm" class="col-sm-3 control-label">{tmpl_var name='limit_openvz_vm_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_openvz_vm" id="limit_openvz_vm" value="{tmpl_var name='limit_openvz_vm'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_openvz_vm_template_id" class="col-sm-3 control-label">{tmpl_var name='limit_openvz_vm_template_id_txt'}</label>
+ <div class="col-sm-9"><select name="limit_openvz_vm_template_id" id="limit_openvz_vm_template_id" class="form-control">
{tmpl_var name='limit_openvz_vm_template_id'}
</select>
- </div>
+ </div></div>
</div>
<div class="subsectiontoggle"><span></span>{tmpl_var name='aps_limits_txt'}<em></em></div>
<div style="display:none;">
- <div class="ctrlHolder">
- <label for="limit_aps">{tmpl_var name='limit_aps_txt'}</label>
- <input name="limit_aps" id="limit_aps" value="{tmpl_var name='limit_aps'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
+ <div class="form-group">
+ <label for="limit_aps" class="col-sm-3 control-label">{tmpl_var name='limit_aps_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_aps" id="limit_aps" value="{tmpl_var name='limit_aps'}" class="form-control" />
+ </div></div>
</div>
<div class="subsectiontoggle"><span></span>{tmpl_var name='client_limits_txt'}<em></em></div>
<div style="display:none;">
- <div class="ctrlHolder">
- <label for="limit_client">{tmpl_var name='limit_client_txt'}</label>
- <input name="limit_client" id="limit_client" value="{tmpl_var name='limit_client'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="limit_domainmodule">{tmpl_var name='limit_domainmodule_txt'}</label>
- <input name="limit_domainmodule" id="limit_domainmodule" value="{tmpl_var name='limit_domainmodule'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
+ <div class="form-group">
+ <label for="limit_client" class="col-sm-3 control-label">{tmpl_var name='limit_client_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_client" id="limit_client" value="{tmpl_var name='limit_client'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="limit_domainmodule" class="col-sm-3 control-label">{tmpl_var name='limit_domainmodule_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="limit_domainmodule" id="limit_domainmodule" value="{tmpl_var name='limit_domainmodule'}" class="form-control" />
+ </div></div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','client/reseller_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('client/reseller_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','client/reseller_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="client/reseller_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
</div>
</div>
diff --git a/interface/web/client/templates/resellers_list.htm b/interface/web/client/templates/resellers_list.htm
index 5074497..b465a88 100644
--- a/interface/web/client/templates/resellers_list.htm
+++ b/interface/web/client/templates/resellers_list.htm
@@ -1,58 +1,58 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_clients">
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('client/reseller_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="client/reseller_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th>
- <th class="tbl_col_company_name" scope="col"><tmpl_var name="company_name_txt"></th>
- <th class="tbl_col_contact_name" scope="col"><tmpl_var name="contact_name_txt"></th>
- <th class="tbl_col_customer_no" scope="col"><tmpl_var name="customer_no_txt"></th>
- <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
- <th class="tbl_col_city" scope="col"><tmpl_var name="city_txt"></th>
- <th class="tbl_col_country" scope="col"><tmpl_var name="country_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="client_id_txt"></th>
+ <th><tmpl_var name="company_name_txt"></th>
+ <th><tmpl_var name="contact_name_txt"></th>
+ <th><tmpl_var name="customer_no_txt"></th>
+ <th><tmpl_var name="username_txt"></th>
+ <th><tmpl_var name="city_txt"></th>
+ <th><tmpl_var name="country_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_client_pid"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></td>
- <td class="tbl_col_company_name"><input type="text" name="search_company_name" value="{tmpl_var name='search_company_name'}" size="10" /></td>
- <td class="tbl_col_contact_name"><input type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" size="10" /></td>
- <td class="tbl_col_customer_no"><input type="text" name="search_customer_no" value="{tmpl_var name='search_customer_no'}" size="10" /></td>
- <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" size="10" /></td>
- <td class="tbl_col_city"><input type="text" name="search_city" value="{tmpl_var name='search_city'}" /></td>
- <td class="tbl_col_country"><select name="search_country">{tmpl_var name='search_country'}</select></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','client/reseller_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><div class="col-sm-9"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_company_name" value="{tmpl_var name='search_company_name'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_customer_no" value="{tmpl_var name='search_customer_no'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_city" value="{tmpl_var name='search_city'}" /></div></td>
+ <td><select name="search_country">{tmpl_var name='search_country'}</select></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','client/reseller_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_client_pid"><a href="#" onclick="loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td>
- <td class="tbl_col_company_name"><a href="#" onclick="loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="company_name"}</a></td>
- <td class="tbl_col_contact_name"><a href="#" onclick="loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="contact_name"}</a></td>
- <td class="tbl_col_customer_no"><a href="#" onclick="loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="customer_no"}</a></td>
- <td class="tbl_col_username"><a href="#" onclick="loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
- <td class="tbl_col_city"><a href="#" onclick="loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="city"}</a></td>
- <td class="tbl_col_country"><a href="#" onclick="loadContent('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 class="tbl_col_buttons">
- <a class="button icons16 icoLoginAs" href="javascript: loadContent('login/login_as.php?cid={tmpl_var name='id'}');"><span>{tmpl_var name='login_as_txt'}</span></a>
- <a class="button icons16 icoDelete" href="javascript: del_record('client/reseller_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="client/reseller_edit.php?id={tmpl_var name='id'}">{tmpl_var name="client_id"}</a></td>
+ <td><a href="#" data-load-content="client/reseller_edit.php?id={tmpl_var name='id'}">{tmpl_var name="company_name"}</a></td>
+ <td><a href="#" data-load-content="client/reseller_edit.php?id={tmpl_var name='id'}">{tmpl_var name="contact_name"}</a></td>
+ <td><a href="#" data-load-content="client/reseller_edit.php?id={tmpl_var name='id'}">{tmpl_var name="customer_no"}</a></td>
+ <td><a href="#" data-load-content="client/reseller_edit.php?id={tmpl_var name='id'}">{tmpl_var name="username"}</a></td>
+ <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="button icons16 icoLoginAs" data-load-content="login/login_as.php?cid={tmpl_var name='id'}"><span>{tmpl_var name='login_as_txt'}</span></a>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -64,11 +64,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="8"><tmpl_var name="paging"></td>
+ <td colspan="8"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/dashboard/dashlets/templates/limits.htm b/interface/web/dashboard/dashlets/templates/limits.htm
index 11fe0bb..396ba42 100644
--- a/interface/web/dashboard/dashlets/templates/limits.htm
+++ b/interface/web/dashboard/dashlets/templates/limits.htm
@@ -1,6 +1,7 @@
<h2>{tmpl_var name='limits_txt'}</h2>
<div style="width:350px;">
- <table class="list">
+ <div class="table-wrapper marginTop15">
+<table class="table">
<tmpl_loop name='rows'>
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
<td>{tmpl_var name='field_txt'}</td>
@@ -8,4 +9,5 @@
</tr>
</tmpl_loop>
</table>
+</div>
</div>
\ No newline at end of file
diff --git a/interface/web/dashboard/dashlets/templates/mailquota.htm b/interface/web/dashboard/dashlets/templates/mailquota.htm
index a239c48..45f97c9 100644
--- a/interface/web/dashboard/dashlets/templates/mailquota.htm
+++ b/interface/web/dashboard/dashlets/templates/mailquota.htm
@@ -1,8 +1,9 @@
<div style="float: left;">
<h2>{tmpl_var name='mailquota_txt'}</h2>
<div style="width:350px;">
- <table class="list">
- <thead>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
<tr>
<td>{tmpl_var name='email_txt'}</td>
<td>{tmpl_var name='name_txt'}</td>
@@ -25,5 +26,6 @@
</tr>
</tmpl_if>
</table>
+</div>
</div>
</div>
\ No newline at end of file
diff --git a/interface/web/dashboard/dashlets/templates/quota.htm b/interface/web/dashboard/dashlets/templates/quota.htm
index feb8e1f..68470dd 100644
--- a/interface/web/dashboard/dashlets/templates/quota.htm
+++ b/interface/web/dashboard/dashlets/templates/quota.htm
@@ -1,8 +1,9 @@
<div style="float: left;">
<h2>{tmpl_var name='quota_txt'}</h2>
<div style="width:350px;">
- <table class="list">
- <thead>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
<tr>
<td>{tmpl_var name='domain_txt'}</td>
<td>{tmpl_var name='used_txt'}</td>
@@ -25,5 +26,6 @@
</tr>
</tmpl_if>
</table>
+</div>
</div>
</div>
\ No newline at end of file
diff --git a/interface/web/dns/templates/dns_a_edit.htm b/interface/web/dns/templates/dns_a_edit.htm
index 410d010..861269d 100644
--- a/interface/web/dns/templates/dns_a_edit.htm
+++ b/interface/web/dns/templates/dns_a_edit.htm
@@ -1,42 +1,39 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_dns_a">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="name">{tmpl_var name='name_txt'}</label>
- <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
- <p class="formHint">{tmpl_var name='name_hint_txt'}</p>
+
+ <div class="form-group">
+ <label for="name" class="col-sm-3 control-label">{tmpl_var name='name_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="name" id="name" value="{tmpl_var name='name'}" class="form-control" />
+ </div><p class="formHint">{tmpl_var name='name_hint_txt'}</p>
</div>
- <div class="ctrlHolder">
- <label for="data">{tmpl_var name='data_txt'}</label>
- <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput formLengthIPv4" />
- </div>
- <div class="ctrlHolder">
- <label for="ttl">{tmpl_var name='ttl_txt'}</label>
- <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label for="data" class="col-sm-3 control-label">{tmpl_var name='data_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="data" id="data" value="{tmpl_var name='data'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="ttl" class="col-sm-3 control-label">{tmpl_var name='ttl_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="ttl" id="ttl" value="{tmpl_var name='ttl'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input type="hidden" name="zone" value="{tmpl_var name='zone'}">
<input type="hidden" name="type" value="{tmpl_var name='type'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','dns/dns_a_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='zone'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','dns/dns_a_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
<script language="JavaScript" type="text/javascript">
jQuery('#data').ispconfigSearch({
dataSrc: '/dns/ajax_get_json.php?type=get_ipv4',
diff --git a/interface/web/dns/templates/dns_a_list.htm b/interface/web/dns/templates/dns_a_list.htm
index 14a5689..84a81ae 100644
--- a/interface/web/dns/templates/dns_a_list.htm
+++ b/interface/web/dns/templates/dns_a_list.htm
@@ -15,60 +15,61 @@
</div><br />
</div>
</tmpl_if>
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
<div class="buttons topbuttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('dns/dns_a_edit.php?zone={tmpl_var name='parent_id'}');"><span>A</span></button>
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('dns/dns_aaaa_edit.php?zone={tmpl_var name='parent_id'}');"><span>AAAA</span></button>
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('dns/dns_alias_edit.php?zone={tmpl_var name='parent_id'}');"><span>ALIAS</span></button>
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('dns/dns_cname_edit.php?zone={tmpl_var name='parent_id'}');"><span>CNAME</span></button>
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('dns/dns_dkim_edit.php?zone={tmpl_var name='parent_id'}');"><span>DKIM</span></button>
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('dns/dns_hinfo_edit.php?zone={tmpl_var name='parent_id'}');"><span>HINFO</span></button>
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('dns/dns_mx_edit.php?zone={tmpl_var name='parent_id'}');"><span>MX</span></button>
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('dns/dns_ns_edit.php?zone={tmpl_var name='parent_id'}');"><span>NS</span></button>
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('dns/dns_ptr_edit.php?zone={tmpl_var name='parent_id'}');"><span>PTR</span></button>
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('dns/dns_rp_edit.php?zone={tmpl_var name='parent_id'}');"><span>RP</span></button>
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('dns/dns_srv_edit.php?zone={tmpl_var name='parent_id'}');"><span>SRV</span></button>
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('dns/dns_txt_edit.php?zone={tmpl_var name='parent_id'}');"><span>TXT</span></button>
+ <button class="button iconstxt icoAdd" type="button" data-load-content="dns/dns_a_edit.php?zone={tmpl_var name='parent_id'}"><span>A</span></button>
+ <button class="button iconstxt icoAdd" type="button" data-load-content="dns/dns_aaaa_edit.php?zone={tmpl_var name='parent_id'}"><span>AAAA</span></button>
+ <button class="button iconstxt icoAdd" type="button" data-load-content="dns/dns_alias_edit.php?zone={tmpl_var name='parent_id'}"><span>ALIAS</span></button>
+ <button class="button iconstxt icoAdd" type="button" data-load-content="dns/dns_cname_edit.php?zone={tmpl_var name='parent_id'}"><span>CNAME</span></button>
+ <button class="button iconstxt icoAdd" type="button" data-load-content="dns/dns_dkim_edit.php?zone={tmpl_var name='parent_id'}"><span>DKIM</span></button>
+ <button class="button iconstxt icoAdd" type="button" data-load-content="dns/dns_hinfo_edit.php?zone={tmpl_var name='parent_id'}"><span>HINFO</span></button>
+ <button class="button iconstxt icoAdd" type="button" data-load-content="dns/dns_mx_edit.php?zone={tmpl_var name='parent_id'}"><span>MX</span></button>
+ <button class="button iconstxt icoAdd" type="button" data-load-content="dns/dns_ns_edit.php?zone={tmpl_var name='parent_id'}"><span>NS</span></button>
+ <button class="button iconstxt icoAdd" type="button" data-load-content="dns/dns_ptr_edit.php?zone={tmpl_var name='parent_id'}"><span>PTR</span></button>
+ <button class="button iconstxt icoAdd" type="button" data-load-content="dns/dns_rp_edit.php?zone={tmpl_var name='parent_id'}"><span>RP</span></button>
+ <button class="button iconstxt icoAdd" type="button" data-load-content="dns/dns_srv_edit.php?zone={tmpl_var name='parent_id'}"><span>SRV</span></button>
+ <button class="button iconstxt icoAdd" type="button" data-load-content="dns/dns_txt_edit.php?zone={tmpl_var name='parent_id'}"><span>TXT</span></button>
</div>
- </fieldset>
+
</div>
-<div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_type" scope="col"><tmpl_var name="type_txt"></th>
- <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
- <th class="tbl_col_data" scope="col"><tmpl_var name="data_txt"></th>
- <th class="tbl_col_aux" scope="col"><tmpl_var name="aux_txt"></th>
- <th class="tbl_col_ttl" scope="col"><tmpl_var name="ttl_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="active_txt"></th>
+ <th><tmpl_var name="type_txt"></th>
+ <th><tmpl_var name="name_txt"></th>
+ <th><tmpl_var name="data_txt"></th>
+ <th><tmpl_var name="aux_txt"></th>
+ <th><tmpl_var name="ttl_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_type"><select name="search_type">{tmpl_var name='search_type'}</select></td>
- <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
- <td class="tbl_col_data"><input type="text" name="search_data" value="{tmpl_var name='search_data'}" /></td>
- <td class="tbl_col_aux"><input type="text" name="search_aux" value="{tmpl_var name='search_aux'}" /></td>
- <td class="tbl_col_ttl"><input type="text" name="search_ttl" value="{tmpl_var name='search_ttl'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="return changeTab('dns_records','dns/dns_soa_edit.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><select name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select name="search_type">{tmpl_var name='search_type'}</select></td>
+ <td><div class="col-sm-9"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_data" value="{tmpl_var name='search_data'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_aux" value="{tmpl_var name='search_aux'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_ttl" value="{tmpl_var name='search_ttl'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="return changeTab('dns_records','dns/dns_soa_edit.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_type"><a href="#" onclick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="type"}</a></td>
- <td class="tbl_col_name"><a href="#" onclick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
- <td class="tbl_col_data"><a href="#" onclick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="data"}</a></td>
- <td class="tbl_col_aux"><a href="#" onclick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="aux"}</a></td>
- <td class="tbl_col_ttl"><a href="#" onclick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ttl"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</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="type"}</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="name"}</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="data"}</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="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>
</td>
</tr>
</tmpl_loop>
@@ -80,9 +81,9 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="7"><tmpl_var name="paging"></td>
+ <td colspan="7"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
</div>
+
diff --git a/interface/web/dns/templates/dns_aaaa_edit.htm b/interface/web/dns/templates/dns_aaaa_edit.htm
index 44beefc..1122c56 100644
--- a/interface/web/dns/templates/dns_aaaa_edit.htm
+++ b/interface/web/dns/templates/dns_aaaa_edit.htm
@@ -1,42 +1,39 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_dns_aaaa">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="name">{tmpl_var name='name_txt'}</label>
- <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
- <p class="formHint">{tmpl_var name='name_hint_txt'}</p>
+
+ <div class="form-group">
+ <label for="name" class="col-sm-3 control-label">{tmpl_var name='name_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="name" id="name" value="{tmpl_var name='name'}" class="form-control" />
+ </div><p class="formHint">{tmpl_var name='name_hint_txt'}</p>
</div>
- <div class="ctrlHolder">
- <label for="data">{tmpl_var name='data_txt'}</label>
- <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="ttl">{tmpl_var name='ttl_txt'}</label>
- <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label for="data" class="col-sm-3 control-label">{tmpl_var name='data_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="data" id="data" value="{tmpl_var name='data'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="ttl" class="col-sm-3 control-label">{tmpl_var name='ttl_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="ttl" id="ttl" value="{tmpl_var name='ttl'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input type="hidden" name="zone" value="{tmpl_var name='zone'}">
<input type="hidden" name="type" value="{tmpl_var name='type'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','dns/dns_aaaa_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='zone'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','dns/dns_aaaa_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
<script language="JavaScript" type="text/javascript">
jQuery('#data').ispconfigSearch({
dataSrc: '/dns/ajax_get_json.php?type=get_ipv6',
diff --git a/interface/web/dns/templates/dns_alias_edit.htm b/interface/web/dns/templates/dns_alias_edit.htm
index 517df75..84f99c1 100644
--- a/interface/web/dns/templates/dns_alias_edit.htm
+++ b/interface/web/dns/templates/dns_alias_edit.htm
@@ -1,38 +1,35 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_dns_alias">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="name">{tmpl_var name='name_txt'}</label>
- <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="data">{tmpl_var name='data_txt'}</label>
- <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="ttl">{tmpl_var name='ttl_txt'}</label>
- <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+
+ <div class="form-group">
+ <label for="name" class="col-sm-3 control-label">{tmpl_var name='name_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="name" id="name" value="{tmpl_var name='name'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="data" class="col-sm-3 control-label">{tmpl_var name='data_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="data" id="data" value="{tmpl_var name='data'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="ttl" class="col-sm-3 control-label">{tmpl_var name='ttl_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="ttl" id="ttl" value="{tmpl_var name='ttl'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input type="hidden" name="zone" value="{tmpl_var name='zone'}">
<input type="hidden" name="type" value="{tmpl_var name='type'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','dns/dns_alias_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='zone'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','dns/dns_alias_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/dns/templates/dns_cname_edit.htm b/interface/web/dns/templates/dns_cname_edit.htm
index 5021213..7042a02 100644
--- a/interface/web/dns/templates/dns_cname_edit.htm
+++ b/interface/web/dns/templates/dns_cname_edit.htm
@@ -1,38 +1,35 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_dns_cname">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="name">{tmpl_var name='name_txt'}</label>
- <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="data">{tmpl_var name='data_txt'}</label>
- <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="ttl">{tmpl_var name='ttl_txt'}</label>
- <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+
+ <div class="form-group">
+ <label for="name" class="col-sm-3 control-label">{tmpl_var name='name_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="name" id="name" value="{tmpl_var name='name'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="data" class="col-sm-3 control-label">{tmpl_var name='data_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="data" id="data" value="{tmpl_var name='data'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="ttl" class="col-sm-3 control-label">{tmpl_var name='ttl_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="ttl" id="ttl" value="{tmpl_var name='ttl'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input type="hidden" name="zone" value="{tmpl_var name='zone'}">
<input type="hidden" name="type" value="{tmpl_var name='type'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','dns/dns_cname_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='zone'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','dns/dns_cname_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/dns/templates/dns_dkim_edit.htm b/interface/web/dns/templates/dns_dkim_edit.htm
index 052f6d5..693b353 100644
--- a/interface/web/dns/templates/dns_dkim_edit.htm
+++ b/interface/web/dns/templates/dns_dkim_edit.htm
@@ -1,29 +1,30 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_dns_txt">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="data">{tmpl_var name='public_key_txt'}</label>
+
+
+ <div class="form-group">
+ <label for="data" class="col-sm-3 control-label">{tmpl_var name='public_key_txt'}</label>
<textarea name="data" id="data" >{tmpl_var name='public_key'}</textarea>
</div>
- <div class="ctrlHolder">
- <label for="selector">{tmpl_var name='selector_txt'}</label>
- <input name="selector" id="selector" value="{tmpl_var name='selector'}" size="20" maxlength="63" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="ttl">{tmpl_var name='ttl_txt'}</label>
- <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
- </div>
+ <div class="form-group">
+ <label for="selector" class="col-sm-3 control-label">{tmpl_var name='selector_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="selector" id="selector" value="{tmpl_var name='selector'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="ttl" class="col-sm-3 control-label">{tmpl_var name='ttl_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="ttl" id="ttl" value="{tmpl_var name='ttl'}" class="form-control" />
+ </div></div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input type="hidden" name="zone" value="{tmpl_var name='zone'}" id="zone">
@@ -31,12 +32,9 @@
<input type="hidden" name="name" value="{tmpl_var name='name'}">
</div>
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','dns/dns_dkim_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='zone'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','dns/dns_dkim_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
<script language="JavaScript" type="text/javascript" src="js/dns_dkim.js"></script>
diff --git a/interface/web/dns/templates/dns_hinfo_edit.htm b/interface/web/dns/templates/dns_hinfo_edit.htm
index 0a9e028..55ee251 100644
--- a/interface/web/dns/templates/dns_hinfo_edit.htm
+++ b/interface/web/dns/templates/dns_hinfo_edit.htm
@@ -1,38 +1,35 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_dns_hinfo">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="name">{tmpl_var name='name_txt'}</label>
- <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="data">{tmpl_var name='data_txt'}</label>
- <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="ttl">{tmpl_var name='ttl_txt'}</label>
- <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+
+ <div class="form-group">
+ <label for="name" class="col-sm-3 control-label">{tmpl_var name='name_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="name" id="name" value="{tmpl_var name='name'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="data" class="col-sm-3 control-label">{tmpl_var name='data_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="data" id="data" value="{tmpl_var name='data'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="ttl" class="col-sm-3 control-label">{tmpl_var name='ttl_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="ttl" id="ttl" value="{tmpl_var name='ttl'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input type="hidden" name="zone" value="{tmpl_var name='zone'}">
<input type="hidden" name="type" value="{tmpl_var name='type'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','dns/dns_hinfo_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='zone'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','dns/dns_hinfo_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/dns/templates/dns_import.htm b/interface/web/dns/templates/dns_import.htm
index d4806e1..c25dcda 100644
--- a/interface/web/dns/templates/dns_import.htm
+++ b/interface/web/dns/templates/dns_import.htm
@@ -1,48 +1,48 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_dns_wizard">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend><tmpl_var name="zone_file_import_txt"></legend>
+ <legend><tmpl_var name="zone_file_import_txt"></legend>
<tmpl_if name="is_admin">
- <div class="ctrlHolder">
- <label for="server_id">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id" id="server_id" class="selectInput">
+ <div class="form-group">
+ <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
{tmpl_var name='server_id'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="client_group_id">{tmpl_var name='client_txt'}</label>
- <select name="client_group_id" id="client_group_id" class="selectInput">
+ </div></div>
+ <div class="form-group">
+ <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
+ <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
{tmpl_var name='client_group_id'}
</select>
- </div>
+ </div></div>
<tmpl_else>
<tmpl_if name="only_one_server">
<input type="hidden" id="server_id" name="server_id" value="{tmpl_var name='server_id_value'}" />
<tmpl_else>
- <div class="ctrlHolder">
- <label for="server_id">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id" id="server_id" class="selectInput">
+ <div class="form-group">
+ <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
{tmpl_var name='server_id'}
</select>
- </div>
+ </div></div>
</tmpl_if>
</tmpl_if>
- <div class="ctrlHolder">
- <label for="domain">{tmpl_var name='domain_txt'}</label>
+ <div class="form-group">
+ <label for="domain" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}</label>
<tmpl_if name="domain_option">
- <select name="domain" id="domain" class="selectInput">
+ <div class="col-sm-9"><select name="domain" id="domain" class="form-control">
{tmpl_var name='domain_option'}
</select>
- <tmpl_else>
- <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" onkeydown="keydown(event.which);" />
- </tmpl_if>
+ </div><tmpl_else>
+ <div class="col-sm-9"><input type="text" name="domain" id="domain" value="{tmpl_var name='domain'}" class="form-control" onkeydown="keydown(event.which);" />
+ </div></tmpl_if>
<p class="value"><tmpl_var name='domain_field_desc_txt'}</p>
</div>
- <div class="ctrlHolder">
- <label for="file">{tmpl_var name='zonefile_to_import_txt'}</label>
+ <div class="form-group">
+ <label for="file" class="col-sm-3 control-label">{tmpl_var name='zonefile_to_import_txt'}</label>
<input name="file" id="file" size="30" type="file" class="fileUpload" />
</div>
@@ -55,15 +55,10 @@
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitUploadForm('pageForm','dns/dns_import.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('dns/dns_soa_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
-
- </fieldset>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitUploadForm('pageForm','dns/dns_import.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
<script language="JavaScript" type="text/javascript">
function keydown(keynum){
if(keynum == 13){
diff --git a/interface/web/dns/templates/dns_mx_edit.htm b/interface/web/dns/templates/dns_mx_edit.htm
index 64b2c12..12b846a 100644
--- a/interface/web/dns/templates/dns_mx_edit.htm
+++ b/interface/web/dns/templates/dns_mx_edit.htm
@@ -1,42 +1,39 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_dns_mx">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="name">{tmpl_var name='name_txt'}</label>
- <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="data">{tmpl_var name='data_txt'}</label>
- <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="aux">{tmpl_var name='aux_txt'}</label>
- <input name="aux" id="aux" value="{tmpl_var name='aux'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="ttl">{tmpl_var name='ttl_txt'}</label>
- <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+
+ <div class="form-group">
+ <label for="name" class="col-sm-3 control-label">{tmpl_var name='name_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="name" id="name" value="{tmpl_var name='name'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="data" class="col-sm-3 control-label">{tmpl_var name='data_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="data" id="data" value="{tmpl_var name='data'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="aux" class="col-sm-3 control-label">{tmpl_var name='aux_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="aux" id="aux" value="{tmpl_var name='aux'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="ttl" class="col-sm-3 control-label">{tmpl_var name='ttl_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="ttl" id="ttl" value="{tmpl_var name='ttl'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input type="hidden" name="zone" value="{tmpl_var name='zone'}">
<input type="hidden" name="type" value="{tmpl_var name='type'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','dns/dns_mx_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='zone'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','dns/dns_mx_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/dns/templates/dns_ns_edit.htm b/interface/web/dns/templates/dns_ns_edit.htm
index 3c5ee59..8861fad 100644
--- a/interface/web/dns/templates/dns_ns_edit.htm
+++ b/interface/web/dns/templates/dns_ns_edit.htm
@@ -1,38 +1,35 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_dns_ns">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="name">{tmpl_var name='name_txt'}</label>
- <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="data">{tmpl_var name='data_txt'}</label>
- <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="ttl">{tmpl_var name='ttl_txt'}</label>
- <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+
+ <div class="form-group">
+ <label for="name" class="col-sm-3 control-label">{tmpl_var name='name_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="name" id="name" value="{tmpl_var name='name'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="data" class="col-sm-3 control-label">{tmpl_var name='data_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="data" id="data" value="{tmpl_var name='data'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="ttl" class="col-sm-3 control-label">{tmpl_var name='ttl_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="ttl" id="ttl" value="{tmpl_var name='ttl'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input type="hidden" name="zone" value="{tmpl_var name='zone'}">
<input type="hidden" name="type" value="{tmpl_var name='type'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','dns/dns_ns_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='zone'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','dns/dns_ns_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/dns/templates/dns_ptr_edit.htm b/interface/web/dns/templates/dns_ptr_edit.htm
index 86b96e9..949a2dc 100644
--- a/interface/web/dns/templates/dns_ptr_edit.htm
+++ b/interface/web/dns/templates/dns_ptr_edit.htm
@@ -1,38 +1,35 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_dns_ptr">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="name">{tmpl_var name='name_txt'}</label>
- <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="data">{tmpl_var name='data_txt'}</label>
- <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="ttl">{tmpl_var name='ttl_txt'}</label>
- <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+
+ <div class="form-group">
+ <label for="name" class="col-sm-3 control-label">{tmpl_var name='name_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="name" id="name" value="{tmpl_var name='name'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="data" class="col-sm-3 control-label">{tmpl_var name='data_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="data" id="data" value="{tmpl_var name='data'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="ttl" class="col-sm-3 control-label">{tmpl_var name='ttl_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="ttl" id="ttl" value="{tmpl_var name='ttl'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input type="hidden" name="zone" value="{tmpl_var name='zone'}">
<input type="hidden" name="type" value="{tmpl_var name='type'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','dns/dns_ptr_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='zone'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','dns/dns_ptr_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/dns/templates/dns_records_edit.htm b/interface/web/dns/templates/dns_records_edit.htm
index f7852ea..a2a42c3 100644
--- a/interface/web/dns/templates/dns_records_edit.htm
+++ b/interface/web/dns/templates/dns_records_edit.htm
@@ -1,4 +1,6 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
<div class="panel panel_dns_soa">
diff --git a/interface/web/dns/templates/dns_rp_edit.htm b/interface/web/dns/templates/dns_rp_edit.htm
index df9456f..3afab64 100644
--- a/interface/web/dns/templates/dns_rp_edit.htm
+++ b/interface/web/dns/templates/dns_rp_edit.htm
@@ -1,38 +1,35 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_dns_rp">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="name">{tmpl_var name='name_txt'}</label>
- <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="data">{tmpl_var name='data_txt'}</label>
- <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="ttl">{tmpl_var name='ttl_txt'}</label>
- <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+
+ <div class="form-group">
+ <label for="name" class="col-sm-3 control-label">{tmpl_var name='name_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="name" id="name" value="{tmpl_var name='name'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="data" class="col-sm-3 control-label">{tmpl_var name='data_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="data" id="data" value="{tmpl_var name='data'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="ttl" class="col-sm-3 control-label">{tmpl_var name='ttl_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="ttl" id="ttl" value="{tmpl_var name='ttl'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input type="hidden" name="zone" value="{tmpl_var name='zone'}">
<input type="hidden" name="type" value="{tmpl_var name='type'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','dns/dns_rp_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='zone'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','dns/dns_rp_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/dns/templates/dns_slave_admin_list.htm b/interface/web/dns/templates/dns_slave_admin_list.htm
index d4f13ce..4cc4449 100644
--- a/interface/web/dns/templates/dns_slave_admin_list.htm
+++ b/interface/web/dns/templates/dns_slave_admin_list.htm
@@ -1,9 +1,9 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_dns_slave">
- <div class="pnl_toolsarea">
<tmpl_if name='datalog_changes_count' op='>' value='0'>
<div>
<div class="systemmonitor-state state-info">
@@ -20,48 +20,48 @@
</div><br />
</div>
</tmpl_if>
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('dns/dns_slave_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="dns/dns_slave_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_sys_groupid" scope="col"><tmpl_var name="sys_groupid_txt"></th>
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_origin" scope="col"><tmpl_var name="origin_txt"></th>
- <th class="tbl_col_ns" scope="col"><tmpl_var name="ns_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="active_txt"></th>
+ <th><tmpl_var name="sys_groupid_txt"></th>
+ <th><tmpl_var name="server_id_txt"></th>
+ <th><tmpl_var name="origin_txt"></th>
+ <th><tmpl_var name="ns_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_sys_groupid"><select name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_origin"><input type="text" name="search_origin" value="{tmpl_var name='search_origin'}" /></td>
- <td class="tbl_col_ns"><input type="text" name="search_ns" value="{tmpl_var name='search_ns'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','dns/dns_slave_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <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><div class="col-sm-9"><input type="text" name="search_origin" value="{tmpl_var name='search_origin'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_ns" value="{tmpl_var name='search_ns'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','dns/dns_slave_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('dns/dns_slave_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_sys_groupid"><a href="#" onclick="loadContent('dns/dns_slave_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="sys_groupid"}</a></td>
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('dns/dns_slave_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_origin"><a href="#" onclick="loadContent('dns/dns_slave_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="origin"}</a></td>
- <td class="tbl_col_ns"><a href="#" onclick="loadContent('dns/dns_slave_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ns"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="dns/dns_slave_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
+ <td><a href="#" data-load-content="dns/dns_slave_edit.php?id={tmpl_var name='id'}">{tmpl_var name="sys_groupid"}</a></td>
+ <td><a href="#" data-load-content="dns/dns_slave_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -73,11 +73,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+ <td colspan="6"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
</div>
+
+
\ No newline at end of file
diff --git a/interface/web/dns/templates/dns_slave_edit.htm b/interface/web/dns/templates/dns_slave_edit.htm
index 3c212bc..0db4799 100644
--- a/interface/web/dns/templates/dns_slave_edit.htm
+++ b/interface/web/dns/templates/dns_slave_edit.htm
@@ -1,82 +1,79 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_dns_slave">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend><tmpl_var name="secondary_zone_txt"></legend>
+ <legend><tmpl_var name="secondary_zone_txt"></legend>
<tmpl_if name="is_admin">
- <div class="ctrlHolder">
+ <div class="form-group">
<tmpl_if name="edit_disabled">
- <label for="server_id_disabled">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id_disabled" id="server_id_disabled" class="selectInput" disabled="disabled">
+ <label for="server_id_disabled" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id_disabled" id="server_id_disabled" class="form-control" disabled="disabled">
{tmpl_var name='server_id'}
</select>
- <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+ </div><input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
<tmpl_else>
- <label for="server_id">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id" id="server_id" class="selectInput">
+ <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
{tmpl_var name='server_id'}
</select>
- </tmpl_if>
+ </div></tmpl_if>
</div>
<tmpl_unless name="domain_option">
- <div class="ctrlHolder">
- <label for="client_group_id">{tmpl_var name='client_txt'}</label>
- <select name="client_group_id" id="client_group_id" class="selectInput">
+ <div class="form-group">
+ <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
+ <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
{tmpl_var name='client_group_id'}
</select>
- </div>
+ </div></div>
</tmpl_unless>
</tmpl_if>
<tmpl_if name="is_reseller">
<tmpl_unless name="domain_option">
- <div class="ctrlHolder">
- <label for="client_group_id">{tmpl_var name='client_txt'}</label>
- <select name="client_group_id" id="client_group_id" class="selectInput">
+ <div class="form-group">
+ <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
+ <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
{tmpl_var name='client_group_id'}
</select>
- </div>
+ </div></div>
</tmpl_unless>
</tmpl_if>
- <div class="ctrlHolder">
- <label for="origin">{tmpl_var name='origin_txt'}</label>
+ <div class="form-group">
+ <label for="origin" class="col-sm-3 control-label">{tmpl_var name='origin_txt'}</label>
<tmpl_if name="domain_option">
- <select name="origin" id="origin" class="selectInput">
+ <div class="col-sm-9"><select name="origin" id="origin" class="form-control">
{tmpl_var name='domain_option'}
</select>
- <tmpl_else>
- <input name="origin" id="origin" value="{tmpl_var name='origin'}" size="30" maxlength="255" type="text" class="textInput" />
- </tmpl_if>
+ </div><tmpl_else>
+ <div class="col-sm-9"><input type="text" name="origin" id="origin" value="{tmpl_var name='origin'}" class="form-control" />
+ </div></tmpl_if>
<p class="formHint">{tmpl_var name='eg_domain_tld'}</p>
</div>
- <div class="ctrlHolder">
- <label for="ns">{tmpl_var name='ns_txt'}</label>
- <input name="ns" id="ns" value="{tmpl_var name='ns'}" size="30" maxlength="255" type="text" class="textInput" />
- <p class="formHint">{tmpl_var name='ipv4_form_txt'}</p>
+ <div class="form-group">
+ <label for="ns" class="col-sm-3 control-label">{tmpl_var name='ns_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="ns" id="ns" value="{tmpl_var name='ns'}" class="form-control" />
+ </div><p class="formHint">{tmpl_var name='ipv4_form_txt'}</p>
</div>
- <div class="ctrlHolder">
- <label for="xfer">{tmpl_var name='xfer_txt'}</label>
- <input name="xfer" id="xfer" value="{tmpl_var name='xfer'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label for="xfer" class="col-sm-3 control-label">{tmpl_var name='xfer_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="xfer" id="xfer" value="{tmpl_var name='xfer'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input name="serial" type="hidden" value="{tmpl_var name='serial'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','dns/dns_slave_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('dns/dns_slave_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','dns/dns_slave_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_slave_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
<script language="JavaScript" type="text/javascript">
jQuery('#ns').ispconfigSearch({
dataSrc: '/dns/ajax_get_json.php?type=get_ipv4',
diff --git a/interface/web/dns/templates/dns_slave_list.htm b/interface/web/dns/templates/dns_slave_list.htm
index 9c871ff..7aff5cf 100644
--- a/interface/web/dns/templates/dns_slave_list.htm
+++ b/interface/web/dns/templates/dns_slave_list.htm
@@ -1,9 +1,9 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_dns_slave">
- <div class="pnl_toolsarea">
<tmpl_if name='datalog_changes_count' op='>' value='0'>
<div>
<div class="systemmonitor-state state-info">
@@ -20,45 +20,45 @@
</div><br />
</div>
</tmpl_if>
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('dns/dns_slave_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="dns/dns_slave_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_origin" scope="col"><tmpl_var name="origin_txt"></th>
- <th class="tbl_col_ns" scope="col"><tmpl_var name="ns_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="active_txt"></th>
+ <th><tmpl_var name="server_id_txt"></th>
+ <th><tmpl_var name="origin_txt"></th>
+ <th><tmpl_var name="ns_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_origin"><input type="text" name="search_origin" value="{tmpl_var name='search_origin'}" /></td>
- <td class="tbl_col_ns"><input type="text" name="search_ns" value="{tmpl_var name='search_ns'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','dns/dns_slave_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><select name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><div class="col-sm-9"><input type="text" name="search_origin" value="{tmpl_var name='search_origin'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_ns" value="{tmpl_var name='search_ns'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','dns/dns_slave_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('dns/dns_slave_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('dns/dns_slave_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_origin"><a href="#" onclick="loadContent('dns/dns_slave_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="origin"}</a></td>
- <td class="tbl_col_ns"><a href="#" onclick="loadContent('dns/dns_slave_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ns"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="dns/dns_slave_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
+ <td><a href="#" data-load-content="dns/dns_slave_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -70,11 +70,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+ <td colspan="6"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
</div>
+
+
\ No newline at end of file
diff --git a/interface/web/dns/templates/dns_soa_admin_list.htm b/interface/web/dns/templates/dns_soa_admin_list.htm
index b77f884..7395ee2 100644
--- a/interface/web/dns/templates/dns_soa_admin_list.htm
+++ b/interface/web/dns/templates/dns_soa_admin_list.htm
@@ -1,9 +1,9 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_dns_soa">
- <div class="pnl_toolsarea">
<tmpl_if name='datalog_changes_count' op='>' value='0'>
<div>
<div class="systemmonitor-state state-info">
@@ -20,51 +20,51 @@
</div><br />
</div>
</tmpl_if>
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('dns/dns_wizard.php');"><span>{tmpl_var name="add_new_record_wizard_txt"}</span></button>
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('dns/dns_soa_edit.php');"><span>{tmpl_var name="add_new_record_txt"}</span></button>
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('dns/dns_import.php');"><span>Import Zone File</span></button>
- </div>
- </fieldset>
- </div>
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="dns/dns_wizard.php"><span>{tmpl_var name="add_new_record_wizard_txt"}</span></button>
+ <button class="button iconstxt icoAdd" type="button" data-load-content="dns/dns_soa_edit.php"><span>{tmpl_var name="add_new_record_txt"}</span></button>
+ <button class="button iconstxt icoAdd" type="button" data-load-content="dns/dns_import.php"><span>Import Zone File</span></button>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_sys_groupid" scope="col"><tmpl_var name="sys_groupid_txt"></th>
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_origin" scope="col"><tmpl_var name="origin_txt"></th>
- <th class="tbl_col_ns" scope="col"><tmpl_var name="ns_txt"></th>
- <th class="tbl_col_mbox" scope="col"><tmpl_var name="mbox_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="active_txt"></th>
+ <th><tmpl_var name="sys_groupid_txt"></th>
+ <th><tmpl_var name="server_id_txt"></th>
+ <th><tmpl_var name="origin_txt"></th>
+ <th><tmpl_var name="ns_txt"></th>
+ <th><tmpl_var name="mbox_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_sys_groupid"><select name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_origin"><input type="text" name="search_origin" value="{tmpl_var name='search_origin'}" /></td>
- <td class="tbl_col_ns"><input type="text" name="search_ns" value="{tmpl_var name='search_ns'}" /></td>
- <td class="tbl_col_mbox"><input type="text" name="search_mbox" value="{tmpl_var name='search_mbox'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','dns/dns_soa_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <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><div class="col-sm-9"><input type="text" name="search_origin" value="{tmpl_var name='search_origin'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_ns" value="{tmpl_var name='search_ns'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_mbox" value="{tmpl_var name='search_mbox'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','dns/dns_soa_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</td>
- <td class="tbl_col_sys_groupid"><a href="#" onclick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="sys_groupid"}</a></td>
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_origin"><a href="#" onclick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="origin"}</a></td>
- <td class="tbl_col_ns"><a href="#" onclick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ns"}</a></td>
- <td class="tbl_col_mbox"><a href="#" onclick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="mbox"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</td>
+ <td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}">{tmpl_var name="sys_groupid"}</a></td>
+ <td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
+ <td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}">{tmpl_var name="origin"}</a></td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -76,11 +76,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="7"><tmpl_var name="paging"></td>
+ <td colspan="7"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/dns/templates/dns_soa_edit.htm b/interface/web/dns/templates/dns_soa_edit.htm
index d222dff..86f5c46 100644
--- a/interface/web/dns/templates/dns_soa_edit.htm
+++ b/interface/web/dns/templates/dns_soa_edit.htm
@@ -1,135 +1,132 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_dns_soa">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>DNS Zone</legend>
+ <legend>DNS Zone</legend>
<tmpl_if name="is_admin">
- <div class="ctrlHolder">
+ <div class="form-group">
<tmpl_if name="edit_disabled">
- <label for="server_id_disabled">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id_disabled" id="server_id_disabled" class="selectInput" disabled="disabled">
+ <label for="server_id_disabled" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id_disabled" id="server_id_disabled" class="form-control" disabled="disabled">
{tmpl_var name='server_id'}
</select>
- <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+ </div><input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
<tmpl_else>
- <label for="server_id">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id" id="server_id" class="selectInput">
+ <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
{tmpl_var name='server_id'}
</select>
- </tmpl_if>
+ </div></tmpl_if>
</div>
<tmpl_unless name="domain_option">
- <div class="ctrlHolder">
- <label for="client_group_id">{tmpl_var name='client_txt'}</label>
- <select name="client_group_id" id="client_group_id" class="selectInput">
+ <div class="form-group">
+ <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
+ <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
{tmpl_var name='client_group_id'}
</select>
- </div>
+ </div></div>
</tmpl_unless>
<tmpl_else>
<tmpl_if name="only_one_server">
<input type="hidden" id="server_id" name="server_id" value="{tmpl_var name='server_id_value'}" />
<tmpl_else>
- <div class="ctrlHolder">
+ <div class="form-group">
<tmpl_if name="edit_disabled">
- <label for="server_id_disabled">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id_disabled" id="server_id_disabled" class="selectInput" disabled="disabled">
+ <label for="server_id_disabled" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id_disabled" id="server_id_disabled" class="form-control" disabled="disabled">
{tmpl_var name='client_server_id'}
</select>
- <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+ </div><input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
<tmpl_else>
- <label for="server_id">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id" id="server_id" class="selectInput">
+ <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
{tmpl_var name='client_server_id'}
</select>
- </tmpl_if>
+ </div></tmpl_if>
</div>
</tmpl_if>
</tmpl_if>
<tmpl_if name="is_reseller">
<tmpl_unless name="domain_option">
- <div class="ctrlHolder">
- <label for="client_group_id">{tmpl_var name='client_txt'}</label>
- <select name="client_group_id" id="client_group_id" class="selectInput">
+ <div class="form-group">
+ <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
+ <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
{tmpl_var name='client_group_id'}
</select>
- </div>
+ </div></div>
</tmpl_unless>
</tmpl_if>
- <div class="ctrlHolder">
- <label for="origin">{tmpl_var name='origin_txt'}</label>
+ <div class="form-group">
+ <label for="origin" class="col-sm-3 control-label">{tmpl_var name='origin_txt'}</label>
<tmpl_if name="domain_option">
- <select name="origin" id="origin" class="selectInput">
+ <div class="col-sm-9"><select name="origin" id="origin" class="form-control">
{tmpl_var name='domain_option'}
</select>
- <tmpl_else>
- <input name="origin" id="origin" value="{tmpl_var name='origin'}" size="30" maxlength="255" type="text" class="textInput" />
- </tmpl_if>
+ </div><tmpl_else>
+ <div class="col-sm-9"><input type="text" name="origin" id="origin" value="{tmpl_var name='origin'}" class="form-control" />
+ </div></tmpl_if>
<p class="formHint">{tmpl_var name='eg_domain_tld'}</p>
</div>
- <div class="ctrlHolder">
- <label for="ns">{tmpl_var name='ns_txt'}</label>
- <input name="ns" id="ns" value="{tmpl_var name='ns'}" size="30" maxlength="255" type="text" class="textInput" />
- <p class="formHint">{tmpl_var name='eg_ns1_domain_tld'}</p>
+ <div class="form-group">
+ <label for="ns" class="col-sm-3 control-label">{tmpl_var name='ns_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="ns" id="ns" value="{tmpl_var name='ns'}" class="form-control" />
+ </div><p class="formHint">{tmpl_var name='eg_ns1_domain_tld'}</p>
</div>
- <div class="ctrlHolder">
- <label for="mbox">{tmpl_var name='mbox_txt'}</label>
- <input name="mbox" id="mbox" value="{tmpl_var name='mbox'}" size="30" maxlength="255" type="text" class="textInput" />
- <p class="formHint">{tmpl_var name='eg_webmaster_domain_tld'}</p>
+ <div class="form-group">
+ <label for="mbox" class="col-sm-3 control-label">{tmpl_var name='mbox_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="mbox" id="mbox" value="{tmpl_var name='mbox'}" class="form-control" />
+ </div><p class="formHint">{tmpl_var name='eg_webmaster_domain_tld'}</p>
</div>
- <div class="ctrlHolder">
- <label for="refresh">{tmpl_var name='refresh_txt'}</label>
- <input name="refresh" id="refresh" value="{tmpl_var name='refresh'}" size="10" maxlength="10" type="text" class="textInput" /> {tmpl_var name='seconds_txt'}
- </div>
- <div class="ctrlHolder">
- <label for="retry">{tmpl_var name='retry_txt'}</label>
- <input name="retry" id="retry" value="{tmpl_var name='retry'}" size="10" maxlength="10" type="text" class="textInput" /> {tmpl_var name='seconds_txt'}
- </div>
- <div class="ctrlHolder">
- <label for="expire">{tmpl_var name='expire_txt'}</label>
- <input name="expire" id="expire" value="{tmpl_var name='expire'}" size="10" maxlength="10" type="text" class="textInput" /> {tmpl_var name='seconds_txt'}
- </div>
- <div class="ctrlHolder">
- <label for="minimum">{tmpl_var name='minimum_txt'}</label>
- <input name="minimum" id="minimum" value="{tmpl_var name='minimum'}" size="10" maxlength="10" type="text" class="textInput" /> {tmpl_var name='seconds_txt'}
- </div>
- <div class="ctrlHolder">
- <label for="ttl">{tmpl_var name='ttl_txt'}</label>
- <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" /> {tmpl_var name='seconds_txt'}
- </div>
- <div class="ctrlHolder">
- <label for="xfer">{tmpl_var name='xfer_txt'}</label>
- <input name="xfer" id="xfer" value="{tmpl_var name='xfer'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="also_notify">{tmpl_var name='also_notify_txt'}</label>
- <input name="also_notify" id="also_notify" value="{tmpl_var name='also_notify'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="update_acl">{tmpl_var name='update_acl_txt'}</label>
- <input name="update_acl" id="update_acl" value="{tmpl_var name='update_acl'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
+ <div class="form-group">
+ <label for="refresh" class="col-sm-3 control-label">{tmpl_var name='refresh_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="refresh" id="refresh" value="{tmpl_var name='refresh'}" class="form-control" /> {tmpl_var name='seconds_txt'}
+ </div></div>
+ <div class="form-group">
+ <label for="retry" class="col-sm-3 control-label">{tmpl_var name='retry_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="retry" id="retry" value="{tmpl_var name='retry'}" class="form-control" /> {tmpl_var name='seconds_txt'}
+ </div></div>
+ <div class="form-group">
+ <label for="expire" class="col-sm-3 control-label">{tmpl_var name='expire_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="expire" id="expire" value="{tmpl_var name='expire'}" class="form-control" /> {tmpl_var name='seconds_txt'}
+ </div></div>
+ <div class="form-group">
+ <label for="minimum" class="col-sm-3 control-label">{tmpl_var name='minimum_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="minimum" id="minimum" value="{tmpl_var name='minimum'}" class="form-control" /> {tmpl_var name='seconds_txt'}
+ </div></div>
+ <div class="form-group">
+ <label for="ttl" class="col-sm-3 control-label">{tmpl_var name='ttl_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="ttl" id="ttl" value="{tmpl_var name='ttl'}" class="form-control" /> {tmpl_var name='seconds_txt'}
+ </div></div>
+ <div class="form-group">
+ <label for="xfer" class="col-sm-3 control-label">{tmpl_var name='xfer_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="xfer" id="xfer" value="{tmpl_var name='xfer'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="also_notify" class="col-sm-3 control-label">{tmpl_var name='also_notify_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="also_notify" id="also_notify" value="{tmpl_var name='also_notify'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="update_acl" class="col-sm-3 control-label">{tmpl_var name='update_acl_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="update_acl" id="update_acl" value="{tmpl_var name='update_acl'}" class="form-control" />
+ </div></div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input name="serial" type="hidden" value="{tmpl_var name='serial'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','dns/dns_soa_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('dns/dns_soa_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','dns/dns_soa_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
<script language="JavaScript" type="text/javascript">
jQuery('#xfer').ispconfigSearch({
dataSrc: '/dns/ajax_get_json.php?type=get_ipv4',
diff --git a/interface/web/dns/templates/dns_soa_list.htm b/interface/web/dns/templates/dns_soa_list.htm
index 0429407..b5bdb1a 100644
--- a/interface/web/dns/templates/dns_soa_list.htm
+++ b/interface/web/dns/templates/dns_soa_list.htm
@@ -1,9 +1,9 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_dns_soa">
- <div class="pnl_toolsarea">
<tmpl_if name='datalog_changes_count' op='>' value='0'>
<div>
<div class="systemmonitor-state state-info">
@@ -20,48 +20,48 @@
</div><br />
</div>
</tmpl_if>
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('dns/dns_wizard.php');"><span>{tmpl_var name="add_new_record_wizard_txt"}</span></button>
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('dns/dns_soa_edit.php');"><span>{tmpl_var name="add_new_record_txt"}</span></button>
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('dns/dns_import.php');"><span>{tmpl_var name="import_zone_file_txt"}</span></button>
- </div>
- </fieldset>
- </div>
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="dns/dns_wizard.php"><span>{tmpl_var name="add_new_record_wizard_txt"}</span></button>
+ <button class="button iconstxt icoAdd" type="button" data-load-content="dns/dns_soa_edit.php"><span>{tmpl_var name="add_new_record_txt"}</span></button>
+ <button class="button iconstxt icoAdd" type="button" data-load-content="dns/dns_import.php"><span>{tmpl_var name="import_zone_file_txt"}</span></button>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_origin" scope="col"><tmpl_var name="origin_txt"></th>
- <th class="tbl_col_ns" scope="col"><tmpl_var name="ns_txt"></th>
- <th class="tbl_col_mbox" scope="col"><tmpl_var name="mbox_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="active_txt"></th>
+ <th><tmpl_var name="server_id_txt"></th>
+ <th><tmpl_var name="origin_txt"></th>
+ <th><tmpl_var name="ns_txt"></th>
+ <th><tmpl_var name="mbox_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_origin"><input type="text" name="search_origin" value="{tmpl_var name='search_origin'}" /></td>
- <td class="tbl_col_ns"><input type="text" name="search_ns" value="{tmpl_var name='search_ns'}" /></td>
- <td class="tbl_col_mbox"><input type="text" name="search_mbox" value="{tmpl_var name='search_mbox'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','dns/dns_soa_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><select name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><div class="col-sm-9"><input type="text" name="search_origin" value="{tmpl_var name='search_origin'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_ns" value="{tmpl_var name='search_ns'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_mbox" value="{tmpl_var name='search_mbox'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','dns/dns_soa_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</td>
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_origin"><a href="#" onclick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="origin"}</a></td>
- <td class="tbl_col_ns"><a href="#" onclick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ns"}</a></td>
- <td class="tbl_col_mbox"><a href="#" onclick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="mbox"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</td>
+ <td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
+ <td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}">{tmpl_var name="origin"}</a></td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -73,11 +73,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+ <td colspan="6"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
</div>
+
+
\ No newline at end of file
diff --git a/interface/web/dns/templates/dns_srv_edit.htm b/interface/web/dns/templates/dns_srv_edit.htm
index b50abe6..f1027b6 100644
--- a/interface/web/dns/templates/dns_srv_edit.htm
+++ b/interface/web/dns/templates/dns_srv_edit.htm
@@ -1,50 +1,47 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_dns_srv">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="name">{tmpl_var name='name_txt'}</label>
- <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="target">{tmpl_var name='target_txt'}</label>
- <input name="target" id="target" value="{tmpl_var name='target'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="weight">{tmpl_var name='weight_txt'}</label>
- <input name="weight" id="weight" value="{tmpl_var name='weight'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="port">{tmpl_var name='port_txt'}</label>
- <input name="port" id="port" value="{tmpl_var name='port'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="aux">{tmpl_var name='aux_txt'}</label>
- <input name="aux" id="aux" value="{tmpl_var name='aux'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="ttl">{tmpl_var name='ttl_txt'}</label>
- <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+
+ <div class="form-group">
+ <label for="name" class="col-sm-3 control-label">{tmpl_var name='name_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="name" id="name" value="{tmpl_var name='name'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="target" class="col-sm-3 control-label">{tmpl_var name='target_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="target" id="target" value="{tmpl_var name='target'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="weight" class="col-sm-3 control-label">{tmpl_var name='weight_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="weight" id="weight" value="{tmpl_var name='weight'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="port" class="col-sm-3 control-label">{tmpl_var name='port_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="port" id="port" value="{tmpl_var name='port'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="aux" class="col-sm-3 control-label">{tmpl_var name='aux_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="aux" id="aux" value="{tmpl_var name='aux'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="ttl" class="col-sm-3 control-label">{tmpl_var name='ttl_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="ttl" id="ttl" value="{tmpl_var name='ttl'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input type="hidden" name="zone" value="{tmpl_var name='zone'}">
<input type="hidden" name="type" value="{tmpl_var name='type'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','dns/dns_srv_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='zone'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','dns/dns_srv_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/dns/templates/dns_template_edit.htm b/interface/web/dns/templates/dns_template_edit.htm
index 36ab9e0..b1d246f 100644
--- a/interface/web/dns/templates/dns_template_edit.htm
+++ b/interface/web/dns/templates/dns_template_edit.htm
@@ -1,38 +1,35 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_dns_template">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="name">{tmpl_var name='name_txt'}</label>
- <input name="name" id="name" value="{tmpl_var name='name'}" size="40" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='fields_txt'}</p>
- <div class="multiField">
+
+ <div class="form-group">
+ <label for="name" class="col-sm-3 control-label">{tmpl_var name='name_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="name" id="name" value="{tmpl_var name='name'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='fields_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='fields'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="template">{tmpl_var name='template_txt'}</label>
+ <div class="form-group">
+ <label for="template" class="col-sm-3 control-label">{tmpl_var name='template_txt'}</label>
<textarea name="template" id="template" rows='15' cols='40'>{tmpl_var name='template'}</textarea>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='visible_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='visible_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='visible'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','dns/dns_template_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('dns/dns_template_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','dns/dns_template_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_template_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/dns/templates/dns_template_list.htm b/interface/web/dns/templates/dns_template_list.htm
index 7b6ec0a..2d6b4a7 100644
--- a/interface/web/dns/templates/dns_template_list.htm
+++ b/interface/web/dns/templates/dns_template_list.htm
@@ -1,42 +1,42 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_dns_template">
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('dns/dns_template_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="dns/dns_template_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_visible" scope="col"><tmpl_var name="visible_txt"></th>
- <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="visible_txt"></th>
+ <th><tmpl_var name="name_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_visible"><select name="search_visible">{tmpl_var name='search_visible'}</select></td>
- <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','dns/dns_template_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><select name="search_visible">{tmpl_var name='search_visible'}</select></td>
+ <td><div class="col-sm-9"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','dns/dns_template_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_visible"><a href="#" onclick="loadContent('dns/dns_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="visible"}</a></td>
- <td class="tbl_col_name"><a href="#" onclick="loadContent('dns/dns_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -48,11 +48,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+ <td colspan="3"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/dns/templates/dns_txt_edit.htm b/interface/web/dns/templates/dns_txt_edit.htm
index 7884a86..8281728 100644
--- a/interface/web/dns/templates/dns_txt_edit.htm
+++ b/interface/web/dns/templates/dns_txt_edit.htm
@@ -1,38 +1,35 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_dns_txt">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="name">{tmpl_var name='name_txt'}</label>
- <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="data">{tmpl_var name='data_txt'}</label>
- <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="ttl">{tmpl_var name='ttl_txt'}</label>
- <input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+
+ <div class="form-group">
+ <label for="name" class="col-sm-3 control-label">{tmpl_var name='name_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="name" id="name" value="{tmpl_var name='name'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="data" class="col-sm-3 control-label">{tmpl_var name='data_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="data" id="data" value="{tmpl_var name='data'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="ttl" class="col-sm-3 control-label">{tmpl_var name='ttl_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="ttl" id="ttl" value="{tmpl_var name='ttl'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input type="hidden" name="zone" value="{tmpl_var name='zone'}">
<input type="hidden" name="type" value="{tmpl_var name='type'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','dns/dns_txt_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='zone'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','dns/dns_txt_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/dns/templates/dns_wizard.htm b/interface/web/dns/templates/dns_wizard.htm
index d518b4a..51e53f1 100644
--- a/interface/web/dns/templates/dns_wizard.htm
+++ b/interface/web/dns/templates/dns_wizard.htm
@@ -1,115 +1,112 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
<tmpl_if name="error">
<div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
</tmpl_if>
-<div class="panel panel_dns_wizard">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend><tmpl_var name="dns_zone_txt"></legend>
- <div class="ctrlHolder">
- <label for="template_id">{tmpl_var name='template_id_txt'}</label>
- <select name="template_id" id="template_id" class="selectInput" onChange="submitForm('pageForm','dns/dns_wizard.php')">
+ <legend><tmpl_var name="dns_zone_txt"></legend>
+ <div class="form-group">
+ <label for="template_id" class="col-sm-3 control-label">{tmpl_var name='template_id_txt'}</label>
+ <div class="col-sm-9"><select name="template_id" id="template_id" class="form-control" onChange="submitForm('pageForm','dns/dns_wizard.php')">
{tmpl_var name='template_id_option'}
</select>
- </div>
+ </div></div>
<tmpl_if name="is_admin">
- <div class="ctrlHolder">
- <label for="server_id">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id" id="server_id" class="selectInput">
+ <div class="form-group">
+ <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
{tmpl_var name='server_id'}
</select>
- </div>
+ </div></div>
<tmpl_unless name="domain_option">
- <div class="ctrlHolder">
- <label for="client_group_id">{tmpl_var name='client_txt'}</label>
- <select name="client_group_id" id="client_group_id" class="selectInput">
+ <div class="form-group">
+ <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
+ <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
{tmpl_var name='client_group_id'}
</select>
- </div>
+ </div></div>
</tmpl_unless>
<tmpl_else>
<tmpl_if name="only_one_server">
<input type="hidden" id="server_id" name="server_id" value="{tmpl_var name='server_id_value'}" />
<tmpl_else>
- <div class="ctrlHolder">
- <label for="server_id">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id" id="server_id" class="selectInput">
+ <div class="form-group">
+ <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
{tmpl_var name='server_id'}
</select>
- </div>
+ </div></div>
</tmpl_if>
</tmpl_if>
<tmpl_if name="is_reseller">
<tmpl_unless name="domain_option">
- <div class="ctrlHolder">
- <label for="client_group_id">{tmpl_var name='client_txt'}</label>
- <select name="client_group_id" id="client_group_id" class="selectInput">
+ <div class="form-group">
+ <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
+ <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
{tmpl_var name='client_group_id'}
</select>
- </div>
+ </div></div>
</tmpl_unless>
</tmpl_if>
<tmpl_if name="DOMAIN_VISIBLE">
- <div class="ctrlHolder">
- <label for="domain">{tmpl_var name='domain_txt'}</label>
+ <div class="form-group">
+ <label for="domain" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}</label>
<tmpl_if name="domain_option">
- <select name="domain" id="domain" class="selectInput">
+ <div class="col-sm-9"><select name="domain" id="domain" class="form-control">
{tmpl_var name='domain_option'}
</select>
- <tmpl_else>
- <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
- </tmpl_if>
+ </div><tmpl_else>
+ <div class="col-sm-9"><input type="text" name="domain" id="domain" value="{tmpl_var name='domain'}" class="form-control" />
+ </div></tmpl_if>
</div>
</tmpl_if>
<tmpl_if name="IP_VISIBLE">
- <div class="ctrlHolder">
- <label for="ip">{tmpl_var name='ip_txt'}</label>
- <input name="ip" id="ip" value="{tmpl_var name='ip'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
+ <div class="form-group">
+ <label for="ip" class="col-sm-3 control-label">{tmpl_var name='ip_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="ip" id="ip" value="{tmpl_var name='ip'}" class="form-control" />
+ </div></div>
</tmpl_if>
<tmpl_if name="IPV6_VISIBLE">
- <div class="ctrlHolder">
- <label for="ipv6">{tmpl_var name='ipv6_txt'}</label>
- <input name="ipv6" id="ipv6" value="{tmpl_var name='ipv6'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
+ <div class="form-group">
+ <label for="ipv6" class="col-sm-3 control-label">{tmpl_var name='ipv6_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="ipv6" id="ipv6" value="{tmpl_var name='ipv6'}" class="form-control" />
+ </div></div>
</tmpl_if>
<tmpl_if name="NS1_VISIBLE">
- <div class="ctrlHolder">
- <label for="ns1">{tmpl_var name='ns1_txt'}</label>
- <input name="ns1" id="ns1" value="{tmpl_var name='ns1'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
+ <div class="form-group">
+ <label for="ns1" class="col-sm-3 control-label">{tmpl_var name='ns1_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="ns1" id="ns1" value="{tmpl_var name='ns1'}" class="form-control" />
+ </div></div>
</tmpl_if>
<tmpl_if name="NS2_VISIBLE">
- <div class="ctrlHolder">
- <label for="ns2">{tmpl_var name='ns2_txt'}</label>
- <input name="ns2" id="ns2" value="{tmpl_var name='ns2'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
+ <div class="form-group">
+ <label for="ns2" class="col-sm-3 control-label">{tmpl_var name='ns2_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="ns2" id="ns2" value="{tmpl_var name='ns2'}" class="form-control" />
+ </div></div>
</tmpl_if>
<tmpl_if name="EMAIL_VISIBLE">
- <div class="ctrlHolder">
- <label for="email">{tmpl_var name='email_txt'}</label>
- <input name="email" id="email" value="{tmpl_var name='email'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
+ <div class="form-group">
+ <label for="email" class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="email" id="email" value="{tmpl_var name='email'}" class="form-control" />
+ </div></div>
</tmpl_if>
<tmpl_if name="DKIM_VISIBLE">
- <label for="dkim">{tmpl_var name='dkim_txt'}</label>
+ <label for="dkim" class="col-sm-3 control-label">{tmpl_var name='dkim_txt'}</label>
<input name="dkim" type="hidden" maxlength="255" type="text"/>
</tmpl_if>
- </fieldset>
+
<input type="hidden" name="create" value="0" />
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" name="btn_create" onclick="document.pageForm.create.value=1; submitForm('pageForm','dns/dns_wizard.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('dns/dns_soa_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" name="btn_create" onclick="document.pageForm.create.value=1; submitForm('pageForm','dns/dns_wizard.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
<script language="JavaScript" type="text/javascript">
jQuery('#ip').ispconfigSearch({
dataSrc: '/dns/ajax_get_json.php?type=get_ipv4',
diff --git a/interface/web/help/templates/faq_edit.htm b/interface/web/help/templates/faq_edit.htm
index dc35358..4fa1c18 100644
--- a/interface/web/help/templates/faq_edit.htm
+++ b/interface/web/help/templates/faq_edit.htm
@@ -1,29 +1,24 @@
-<div class="panel panel_support_message">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>{tmpl_var name='faq_faq_txt'}</legend>
- <div class="ctrlHolder">
- <label for="hf_section">{tmpl_var name='faq_section_txt'}</label>
- <select name="hf_section" id="hf_section" class="selectInput">
+ <legend>{tmpl_var name='faq_faq_txt'}</legend>
+ <div class="form-group">
+ <label for="hf_section" class="col-sm-3 control-label">{tmpl_var name='faq_section_txt'}</label>
+ <div class="col-sm-9"><select name="hf_section" id="hf_section" class="form-control">
{tmpl_var name='hf_section'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="hf_question">{tmpl_var name='faq_question_txt'}</label>
- <input name="hf_question" id="hf_question" value="{tmpl_var name='hf_question'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="hf_answer">{tmpl_var name='faq_answer_txt'}</label>
+ </div></div>
+ <div class="form-group">
+ <label for="hf_question" class="col-sm-3 control-label">{tmpl_var name='faq_question_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="hf_question" id="hf_question" value="{tmpl_var name='hf_question'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="hf_answer" class="col-sm-3 control-label">{tmpl_var name='faq_answer_txt'}</label>
<textarea name="hf_answer" id="hf_answer" rows='10' cols='30'>{tmpl_var name='hf_answer'}</textarea>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','help/faq_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('help/faq_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','help/faq_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="help/faq_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/help/templates/faq_manage_questions_list.htm b/interface/web/help/templates/faq_manage_questions_list.htm
index e7b5eaf..1bc7822 100644
--- a/interface/web/help/templates/faq_manage_questions_list.htm
+++ b/interface/web/help/templates/faq_manage_questions_list.htm
@@ -1,25 +1,23 @@
<h2>{tmpl_var name="faq_faq_questions_txt"}</h2>
-<div class="panel panel_support_message">
-
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('help/faq_edit.php');">
+
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="help/faq_edit.php">
<span>{tmpl_var name="faq_new_question_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="faq_sections_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col">{tmpl_var name="faq_question_txt"}</th>
- <th class="tbl_col_section_name" scope="col">{tmpl_var name="faq_section_name_txt"}</th>
- <th class="tbl_col_buttons" scope="col">{tmpl_var name="faq_delete_txt"}</th>
- <th class="tbl_col_buttons" scope="col">{tmpl_var name="faq_edit_txt"}</th>
+
+ <p><tmpl_var name="faq_sections_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th>{tmpl_var name="faq_question_txt"}</th>
+ <th>{tmpl_var name="faq_section_name_txt"}</th>
+ <th>{tmpl_var name="faq_delete_txt"}</th>
+ <th>{tmpl_var name="faq_edit_txt"}</th>
</tr>
</thead>
<tbody>
@@ -27,11 +25,11 @@
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
<td width="60%">{tmpl_var name='hf_question'}</td>
<td width="30%">{tmpl_var name='hf_section'}</td>
- <td class="tbl_col_buttons" width="5%">
- <a class="button icons16 icoDelete" href="javascript: del_record('help/faq_delete.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name="faq_delete_txt"}</span></a>
+ <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>
</td>
- <td class="tbl_col_buttons" width="5%">
- <a class="button icons16 icoEdit" href="javascript: loadContent('help/faq_edit.php?id={tmpl_var name='id'}');"><span>{tmpl_var name="faq_edit_txt"}</span></a>
+ <td width="5%">
+ <a class="button icons16 icoEdit" data-load-content="help/faq_edit.php?id={tmpl_var name='id'}"><span>{tmpl_var name="faq_edit_txt"}</span></a>
</td>
</tr>
</tmpl_loop>
@@ -43,11 +41,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+ <td colspan="4"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/help/templates/faq_sections_edit.htm b/interface/web/help/templates/faq_sections_edit.htm
index b4c2754..42bb53a 100644
--- a/interface/web/help/templates/faq_sections_edit.htm
+++ b/interface/web/help/templates/faq_sections_edit.htm
@@ -1,20 +1,15 @@
-<div class="panel panel_support_message">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>{tmpl_var name='faq_section_name_txt'}</legend>
- <div class="ctrlHolder">
- <label for="hfs_name">{tmpl_var name='faq_section_name_txt'}</label>
- <input name="hfs_name" id="hfs_name" value="{tmpl_var name='hfs_name'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- </fieldset>
+ <legend>{tmpl_var name='faq_section_name_txt'}</legend>
+ <div class="form-group">
+ <label for="hfs_name" class="col-sm-3 control-label">{tmpl_var name='faq_section_name_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="hfs_name" id="hfs_name" value="{tmpl_var name='hfs_name'}" class="form-control" />
+ </div></div>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','help/faq_sections_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('help/faq_sections_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','help/faq_sections_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="help/faq_sections_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
diff --git a/interface/web/help/templates/help_faq_list.htm b/interface/web/help/templates/help_faq_list.htm
index ae5ae11..64d8f57 100644
--- a/interface/web/help/templates/help_faq_list.htm
+++ b/interface/web/help/templates/help_faq_list.htm
@@ -5,8 +5,8 @@
{tmpl_var name='hf_answer'}
</p>
<tmpl_if name='is_admin'>
- <a class="button icons16 icoDelete" href="javascript: del_record('help/faq_delete.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name="delete_txt"}</span></a>
- <a href="#" onclick="loadContent('help/faq_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="edit_txt"}</a>
+ <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 href="#" data-load-content="help/faq_edit.php?id={tmpl_var name='id'}">{tmpl_var name="edit_txt"}</a>
<br/>
<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 298b907..080db26 100644
--- a/interface/web/help/templates/help_faq_sections_list.htm
+++ b/interface/web/help/templates/help_faq_sections_list.htm
@@ -1,37 +1,37 @@
-<h2><tmpl_var name="faq_faq_sections_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="faq_faq_sections_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_support_faq_section">
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('help/faq_sections_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="help/faq_sections_edit.php">
<span>{tmpl_var name="faq_new_section_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="faq_sections_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_section_name" scope="col">{tmpl_var name="faq_section_name_txt"}</th>
- <th class="tbl_col_buttons" scope="col">{tmpl_var name="faq_delete_txt"}</th>
- <th class="tbl_col_buttons" scope="col">{tmpl_var name="faq_edit_txt"}</th>
+
+ <p><tmpl_var name="faq_sections_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th>{tmpl_var name="faq_section_name_txt"}</th>
+ <th>{tmpl_var name="faq_delete_txt"}</th>
+ <th>{tmpl_var name="faq_edit_txt"}</th>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_section_name"><b>{tmpl_var name='hfs_name'}</b></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name="faq_delete_txt"}</span></a>
+ <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>
</td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoEdit" href="javascript: loadContent('help/faq_sections_edit.php?id={tmpl_var name='id'}');"><span>{tmpl_var name="faq_edit_txt"}</span></a>
+ <td>
+ <a class="button icons16 icoEdit" data-load-content="help/faq_sections_edit.php?id={tmpl_var name='id'}"><span>{tmpl_var name="faq_edit_txt"}</span></a>
</td>
</tr>
</tmpl_loop>
@@ -43,11 +43,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+ <td colspan="3"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/help/templates/support_message_edit.htm b/interface/web/help/templates/support_message_edit.htm
index c3f23a3..f0eba3e 100644
--- a/interface/web/help/templates/support_message_edit.htm
+++ b/interface/web/help/templates/support_message_edit.htm
@@ -1,33 +1,30 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_support_message">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>{tmpl_var name='message_txt'}</legend>
- <div class="ctrlHolder">
- <label for="recipient_id">{tmpl_var name='recipient_id_txt'}</label>
- <select name="recipient_id" id="recipient_id" class="selectInput">
+ <legend>{tmpl_var name='message_txt'}</legend>
+ <div class="form-group">
+ <label for="recipient_id" class="col-sm-3 control-label">{tmpl_var name='recipient_id_txt'}</label>
+ <div class="col-sm-9"><select name="recipient_id" id="recipient_id" class="form-control">
{tmpl_var name='recipient_id'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="subject">{tmpl_var name='subject_txt'}</label>
- <input name="subject" id="subject" value="{tmpl_var name='subject'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="message">{tmpl_var name='message_txt'}</label>
+ </div></div>
+ <div class="form-group">
+ <label for="subject" class="col-sm-3 control-label">{tmpl_var name='subject_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="subject" id="subject" value="{tmpl_var name='subject'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="message" class="col-sm-3 control-label">{tmpl_var name='message_txt'}</label>
<textarea name="message" id="message" rows='10' cols='30'>{tmpl_var name='message'}</textarea>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input type="hidden" name="tstamp" value="{tmpl_var name='tstamp'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','help/support_message_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('help/support_message_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','help/support_message_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="help/support_message_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/help/templates/support_message_list.htm b/interface/web/help/templates/support_message_list.htm
index d3fa429..a4ab0a6 100644
--- a/interface/web/help/templates/support_message_list.htm
+++ b/interface/web/help/templates/support_message_list.htm
@@ -1,45 +1,45 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_support_message">
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('help/support_message_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="help/support_message_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_sender_id" scope="col"><tmpl_var name="sender_id_txt"></th>
- <th class="tbl_col_subject" scope="col"><tmpl_var name="subject_txt"></th>
- <th class="tbl_col_tstamp" scope="col"><tmpl_var name="date_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="sender_id_txt"></th>
+ <th><tmpl_var name="subject_txt"></th>
+ <th><tmpl_var name="date_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_sender_id"><select name="search_sender_id">{tmpl_var name='search_sender_id'}</select></td>
- <td class="tbl_col_subject"><input type="text" name="search_subject" value="{tmpl_var name='search_subject'}" /></td>
- <td class="tbl_col_tstamp"> </td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','help/support_message_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><select name="search_sender_id">{tmpl_var name='search_sender_id'}</select></td>
+ <td><div class="col-sm-9"><input type="text" name="search_subject" value="{tmpl_var name='search_subject'}" /></div></td>
+ <td> </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>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_sender_id"><a href="#" onclick="loadContent('help/support_message_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="sender_id"}</a></td>
- <td class="tbl_col_subject"><a href="#" onclick="loadContent('help/support_message_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="subject"}</a></td>
- <td class="tbl_col_tstamp"><a href="#" onclick="loadContent('help/support_message_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="tstamp"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="help/support_message_edit.php?id={tmpl_var name='id'}">{tmpl_var name="sender_id"}</a></td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -51,11 +51,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+ <td colspan="4"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/help/templates/support_message_view.htm b/interface/web/help/templates/support_message_view.htm
index f7145e0..b4662fd 100644
--- a/interface/web/help/templates/support_message_view.htm
+++ b/interface/web/help/templates/support_message_view.htm
@@ -1,26 +1,23 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_support_message">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>{tmpl_var name='message_txt'}</legend>
- <div class="ctrlHolder">
- <label for="subject">{tmpl_var name='subject_txt'}</label>
+ <legend>{tmpl_var name='message_txt'}</legend>
+ <div class="form-group">
+ <label for="subject" class="col-sm-3 control-label">{tmpl_var name='subject_txt'}</label>
<p>{tmpl_var name='subject'}</p>
</div>
- <div class="ctrlHolder">
- <label for="message">{tmpl_var name='message_txt'}</label>
+ <div class="form-group">
+ <label for="message" class="col-sm-3 control-label">{tmpl_var name='message_txt'}</label>
<p>{tmpl_var name='message'}</p>
</div>
- <div class="ctrlHolder">
- <label for="message">{tmpl_var name='date_txt'}</label>
+ <div class="form-group">
+ <label for="message" class="col-sm-3 control-label">{tmpl_var name='date_txt'}</label>
<p>{tmpl_var name='date'}</p>
</div>
- </fieldset>
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='reply_txt'}" onclick="loadContent('help/support_message_edit.php?reply={tmpl_var name='id'}');"><span>{tmpl_var name='reply_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+
+ <div class="clear"><div class="right">
+ <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='reply_txt'}" data-load-content="help/support_message_edit.php?reply={tmpl_var name='id'}"><span>{tmpl_var name='reply_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/login/templates/index.htm b/interface/web/login/templates/index.htm
index bcdd8bd..ffff52d 100644
--- a/interface/web/login/templates/index.htm
+++ b/interface/web/login/templates/index.htm
@@ -1,4 +1,6 @@
-<h2><tmpl_var name="login_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="login_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
<div class="panel panel_login">
@@ -7,36 +9,36 @@
<div id="OKMsg"><p><tmpl_var name="msg"></p></div>
</tmpl_if>
<tmpl_if name="error">
- <div id="errorMsg"><h3>ERROR</h3><ol><li><tmpl_var name="error"></li></ol><br /><a href="#" onclick="loadContent('login/password_reset.php');">{tmpl_var name='pw_lost_txt'}</a></div>
+ <div id="errorMsg"><h3>ERROR</h3><ol><li><tmpl_var name="error"></li></ol><br /><a href="#" data-load-content="login/password_reset.php">{tmpl_var name='pw_lost_txt'}</a></div>
</tmpl_if>
<div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>{tmpl_var name='login_txt'}Login</legend>
- <div class="ctrlHolder">
- <label for="username">{tmpl_var name='username_txt'}</label>
- <input name="username" id="username" value="" size="30" maxlength="255" type="text" class="formLengthEmailUser" onkeypress="if (event.keyCode && event.keyCode == 13) {submitLoginForm('pageForm'); return false;};" />
- </div>
- <div class="ctrlHolder">
- <label for="passwort">{tmpl_var name='password_txt'}</label>
+ <legend>{tmpl_var name='login_txt'}Login</legend>
+ <div class="form-group">
+ <label for="username" class="col-sm-3 control-label">{tmpl_var name='username_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="username" id="username" value="" class="form-control" onkeypress="if (event.keyCode && event.keyCode == 13) {submitLoginForm('pageForm'); return false;};" />
+ </div></div>
+ <div class="form-group">
+ <label for="passwort" class="col-sm-3 control-label">{tmpl_var name='password_txt'}</label>
<input name="passwort" id="passwort" value="" size="30" maxlength="255" type="password" class="formLengthEmailUser" onkeypress="if (event.keyCode && event.keyCode == 13) {submitLoginForm('pageForm'); return false;};" />
</div>
<tmpl_if name="session_timeout" op=">" value="0">
<tmpl_if name="session_allow_endless" value="y">
- <div class="ctrlHolder">
- <label for="passwort">{tmpl_var name='stay_logged_in_txt'}</label>
- <input name="stay" id="stay" value="1" type="checkbox" onkeypress="if (event.keyCode && event.keyCode == 13) {submitLoginForm('pageForm'); return false;};" />
- </div>
+ <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></div>
</tmpl_if>
</tmpl_if>
- </fieldset>
+
<input type="hidden" name="s_mod" value="login" />
<input type="hidden" name="s_pg" value="index" />
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoKey" type="button" value="{tmpl_var name='add_new_record_txt'}" onclick="submitLoginForm('pageForm');"><span>{tmpl_var name='login_button_txt'}</span></button>
- <tmpl_if name="pw_lost_show"><button class="negative iconstxt icoKey" type="button" value="{tmpl_var name='pw_lost_txt'}" onclick="loadContent('login/password_reset.php');"><span>{tmpl_var name='pw_lost_txt'}</span></button></tmpl_if>
- </div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='add_new_record_txt'}" onclick="submitLoginForm('pageForm');">{tmpl_var name='login_button_txt'}</button>
+ <tmpl_if name="pw_lost_show"><button class="negative iconstxt icoKey" type="button" value="{tmpl_var name='pw_lost_txt'}" data-load-content="login/password_reset.php"><span>{tmpl_var name='pw_lost_txt'}</span></button></tmpl_if>
+ </div></div>
</div>
</div>
diff --git a/interface/web/login/templates/password_reset.htm b/interface/web/login/templates/password_reset.htm
index 7055834..46207a7 100644
--- a/interface/web/login/templates/password_reset.htm
+++ b/interface/web/login/templates/password_reset.htm
@@ -1,4 +1,6 @@
-<h2><tmpl_var name="pw_reset_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="pw_reset_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
<div class="panel panel_password_reset">
@@ -11,25 +13,25 @@
</tmpl_if>
<div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>{tmpl_var name='pw_reset_txt'}</legend>
- <div class="ctrlHolder">
- <label for="email"><em>*</em> {tmpl_var name='email_txt'}</label>
- <input name="email" id="email" value="" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="username"><em>*</em> {tmpl_var name='username_txt'}</label>
- <input name="username" id="username" value="" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- </fieldset>
+ <legend>{tmpl_var name='pw_reset_txt'}</legend>
+ <div class="form-group">
+ <label for="email" class="col-sm-3 control-label"><em>*</em> {tmpl_var name='email_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="email" id="email" value="" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="username" class="col-sm-3 control-label"><em>*</em> {tmpl_var name='username_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="username" id="username" value="" class="form-control" />
+ </div></div>
+
<input type="hidden" name="s_mod" value="login" />
<input type="hidden" name="s_pg" value="index" />
- <div class="buttonHolder buttons">
- <button class="positive" type="button" value="{tmpl_var name='pw_button_txt'}" onclick="submitForm('pageForm','login/password_reset.php');"><span>{tmpl_var name='pw_button_txt'}</span></button>
- <button class="negative" type="button" value="{tmpl_var name='back_txt'}" onclick="loadInitContent();"><span>{tmpl_var name='back_txt'}</span></button>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='pw_button_txt'}" onclick="submitForm('pageForm','login/password_reset.php');">{tmpl_var name='pw_button_txt'}</button>
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='back_txt'}" onclick="loadInitContent();">{tmpl_var name='back_txt'}</button>
- </div>
+ </div></div>
</div>
</div>
\ No newline at end of file
diff --git a/interface/web/mail/templates/mail_alias_edit.htm b/interface/web/mail/templates/mail_alias_edit.htm
index c2a6e95..8bf2a4c 100644
--- a/interface/web/mail/templates/mail_alias_edit.htm
+++ b/interface/web/mail/templates/mail_alias_edit.htm
@@ -1,39 +1,36 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_mail_alias">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <p class="label"><em>*</em> {tmpl_var name='email_txt'}</p>
- <div class="multiField">
- <label for="email_local_part" class="blockLabel">Alias<input type="text" id="email_local_part" name="email_local_part" size="20" value="{tmpl_var name='email_local_part'}" class="textInput" /></label>
- <label for="email_at" class="blockLabel email_at"> <span id="email_at" name="email_at" />@</label>
- <label for="email_domain" class="blockLabel">{tmpl_var name='domain_txt'}<select name="email_domain" id="email_domain" class="selectInput">{tmpl_var name='email_domain'}</select></label>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label"><em>*</em> {tmpl_var name='email_txt'}</label>
+ <div class="col-sm-9">
+ <label for="email_local_part" class="col-sm-3 control-label">Alias<div class="col-sm-9"><input type="text" id="email_local_part" name="email_local_part" value="{tmpl_var name='email_local_part'}" class="form-control" /></div></label>
+ <label for="email_at" class="col-sm-3 control-label"> <span id="email_at" name="email_at" />@</label>
+ <label for="email_domain" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}<div class="col-sm-9"><select name="email_domain" id="email_domain" class="form-control">{tmpl_var name='email_domain'}</select></div></label>
</div>
</div>
- <div class="ctrlHolder">
- <label for="destination">{tmpl_var name='destination_txt'}</label>
- <select name="destination" id="destination" class="selectInput">
+ <div class="form-group">
+ <label for="destination" class="col-sm-3 control-label">{tmpl_var name='destination_txt'}</label>
+ <div class="col-sm-9"><select name="destination" id="destination" class="form-control">
{tmpl_var name='destination'}
</select>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input type="hidden" name="type" value="alias">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_alias_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('mail/mail_alias_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_alias_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_alias_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/mail/templates/mail_alias_list.htm b/interface/web/mail/templates/mail_alias_list.htm
index 73107d9..a289a52 100644
--- a/interface/web/mail/templates/mail_alias_list.htm
+++ b/interface/web/mail/templates/mail_alias_list.htm
@@ -1,9 +1,9 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_mail_alias">
- <div class="pnl_toolsarea">
<tmpl_if name='datalog_changes_count' op='>' value='0'>
<div>
<div class="systemmonitor-state state-info">
@@ -20,42 +20,42 @@
</div><br />
</div>
</tmpl_if>
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('mail/mail_alias_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="mail/mail_alias_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
- <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="active_txt"></th>
+ <th><tmpl_var name="source_txt"></th>
+ <th><tmpl_var name="destination_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
- <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_alias_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><select name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><div class="col-sm-9"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_alias_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('mail/mail_alias_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_source"><a href="#" onclick="loadContent('mail/mail_alias_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
- <td class="tbl_col_destination"><a href="#" onclick="loadContent('mail/mail_alias_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="mail/mail_alias_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -67,11 +67,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+ <td colspan="4"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/mail/templates/mail_aliasdomain_edit.htm b/interface/web/mail/templates/mail_aliasdomain_edit.htm
index 21ca7c7..e687a23 100644
--- a/interface/web/mail/templates/mail_aliasdomain_edit.htm
+++ b/interface/web/mail/templates/mail_aliasdomain_edit.htm
@@ -1,37 +1,34 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_mail_aliasdomain">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="destination">{tmpl_var name='source_txt'}</label>
- <select name="source" id="source" class="selectInput">
+
+ <div class="form-group">
+ <label for="destination" class="col-sm-3 control-label">{tmpl_var name='source_txt'}</label>
+ <div class="col-sm-9"><select name="source" id="source" class="form-control">
{tmpl_var name='source_domain'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="destination">{tmpl_var name='destination_txt'}</label>
- <select name="destination" id="destination" class="selectInput">
+ </div></div>
+ <div class="form-group">
+ <label for="destination" class="col-sm-3 control-label">{tmpl_var name='destination_txt'}</label>
+ <div class="col-sm-9"><select name="destination" id="destination" class="form-control">
{tmpl_var name='destination_domain'}
</select>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input type="hidden" name="type" value="aliasdomain">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_aliasdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('mail/mail_aliasdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_aliasdomain_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_aliasdomain_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/mail/templates/mail_aliasdomain_list.htm b/interface/web/mail/templates/mail_aliasdomain_list.htm
index 30b88a6..7aa5d64 100644
--- a/interface/web/mail/templates/mail_aliasdomain_list.htm
+++ b/interface/web/mail/templates/mail_aliasdomain_list.htm
@@ -1,9 +1,9 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_mail_aliasdomain">
- <div class="pnl_toolsarea">
<tmpl_if name='datalog_changes_count' op='>' value='0'>
<div>
<div class="systemmonitor-state state-info">
@@ -20,42 +20,42 @@
</div><br />
</div>
</tmpl_if>
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('mail/mail_aliasdomain_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="mail/mail_aliasdomain_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
- <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="active_txt"></th>
+ <th><tmpl_var name="source_txt"></th>
+ <th><tmpl_var name="destination_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
- <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_aliasdomain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><select name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><div class="col-sm-9"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_aliasdomain_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('mail/mail_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_source"><a href="#" onclick="loadContent('mail/mail_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
- <td class="tbl_col_destination"><a href="#" onclick="loadContent('mail/mail_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="mail/mail_aliasdomain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -67,11 +67,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+ <td colspan="4"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/mail/templates/mail_blacklist_edit.htm b/interface/web/mail/templates/mail_blacklist_edit.htm
index fcd5bf6..14a50b6 100644
--- a/interface/web/mail/templates/mail_blacklist_edit.htm
+++ b/interface/web/mail/templates/mail_blacklist_edit.htm
@@ -1,41 +1,38 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_mail_blacklist">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="server_id">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id" id="server_id" class="selectInput">
+
+ <div class="form-group">
+ <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
{tmpl_var name='server_id'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="source">{tmpl_var name='source_txt'}</label>
- <input name="source" id="source" value="{tmpl_var name='source'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="type">{tmpl_var name='type_txt'}</label>
- <select name="type" id="type" class="selectInput">
+ </div></div>
+ <div class="form-group">
+ <label for="source" class="col-sm-3 control-label">{tmpl_var name='source_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="source" id="source" value="{tmpl_var name='source'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="type" class="col-sm-3 control-label">{tmpl_var name='type_txt'}</label>
+ <div class="col-sm-9"><select name="type" id="type" class="form-control">
{tmpl_var name='type'}
</select>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input name="access" type="hidden" value="{tmpl_var name='access'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_blacklist_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('mail/mail_blacklist_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_blacklist_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_blacklist_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/mail/templates/mail_blacklist_list.htm b/interface/web/mail/templates/mail_blacklist_list.htm
index 7e4e492..06ef7cc 100644
--- a/interface/web/mail/templates/mail_blacklist_list.htm
+++ b/interface/web/mail/templates/mail_blacklist_list.htm
@@ -1,9 +1,9 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_mail_blacklist">
- <div class="pnl_toolsarea">
<tmpl_if name='datalog_changes_count' op='>' value='0'>
<div>
<div class="systemmonitor-state state-info">
@@ -20,45 +20,45 @@
</div><br />
</div>
</tmpl_if>
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('mail/mail_blacklist_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="mail/mail_blacklist_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
- <th class="tbl_col_type" scope="col"><tmpl_var name="type_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="active_txt"></th>
+ <th><tmpl_var name="server_id_txt"></th>
+ <th><tmpl_var name="source_txt"></th>
+ <th><tmpl_var name="type_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
- <td class="tbl_col_type"><select name="search_type">{tmpl_var name='search_type'}</select></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_blacklist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><select name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><div class="col-sm-9"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></div></td>
+ <td><select name="search_type">{tmpl_var name='search_type'}</select></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_blacklist_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_source"><a href="#" onclick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
- <td class="tbl_col_type"><a href="#" onclick="loadContent('mail/mail_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="type"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="mail/mail_blacklist_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
+ <td><a href="#" data-load-content="mail/mail_blacklist_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -70,11 +70,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+ <td colspan="5"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/mail/templates/mail_content_filter_edit.htm b/interface/web/mail/templates/mail_content_filter_edit.htm
index 0caf697..03c2fb8 100644
--- a/interface/web/mail/templates/mail_content_filter_edit.htm
+++ b/interface/web/mail/templates/mail_content_filter_edit.htm
@@ -1,50 +1,47 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_mail_content_filter">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="server_id">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id" id="server_id" class="selectInput">
+
+ <div class="form-group">
+ <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
{tmpl_var name='server_id'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="type">{tmpl_var name='type_txt'}</label>
- <select name="type" id="type" class="selectInput">
+ </div></div>
+ <div class="form-group">
+ <label for="type" class="col-sm-3 control-label">{tmpl_var name='type_txt'}</label>
+ <div class="col-sm-9"><select name="type" id="type" class="form-control">
{tmpl_var name='type'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="pattern">{tmpl_var name='pattern_txt'}</label>
- <input name="pattern" id="pattern" value="{tmpl_var name='pattern'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="data">{tmpl_var name='data_txt'}</label>
- <input name="data" id="data" value="{tmpl_var name='data'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="action">{tmpl_var name='action_txt'}</label>
- <select name="action" id="action" class="selectInput">
+ </div></div>
+ <div class="form-group">
+ <label for="pattern" class="col-sm-3 control-label">{tmpl_var name='pattern_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="pattern" id="pattern" value="{tmpl_var name='pattern'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="data" class="col-sm-3 control-label">{tmpl_var name='data_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="data" id="data" value="{tmpl_var name='data'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="action" class="col-sm-3 control-label">{tmpl_var name='action_txt'}</label>
+ <div class="col-sm-9"><select name="action" id="action" class="form-control">
{tmpl_var name='action'}
</select>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_content_filter_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('mail/mail_content_filter_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_content_filter_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_content_filter_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/mail/templates/mail_content_filter_list.htm b/interface/web/mail/templates/mail_content_filter_list.htm
index 735bf6a..d2a4b44 100644
--- a/interface/web/mail/templates/mail_content_filter_list.htm
+++ b/interface/web/mail/templates/mail_content_filter_list.htm
@@ -1,9 +1,9 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_mail_content_filter">
- <div class="pnl_toolsarea">
<tmpl_if name='datalog_changes_count' op='>' value='0'>
<div>
<div class="systemmonitor-state state-info">
@@ -20,45 +20,45 @@
</div><br />
</div>
</tmpl_if>
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('mail/mail_content_filter_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="mail/mail_content_filter_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_pattern" scope="col"><tmpl_var name="pattern_txt"></th>
- <th class="tbl_col_action" scope="col"><tmpl_var name="action_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="active_txt"></th>
+ <th><tmpl_var name="server_id_txt"></th>
+ <th><tmpl_var name="pattern_txt"></th>
+ <th><tmpl_var name="action_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_pattern"><input type="text" name="search_pattern" value="{tmpl_var name='search_pattern'}" /></td>
- <td class="tbl_col_action"><select name="search_action">{tmpl_var name='search_action'}</select></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_content_filter_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><select name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><div class="col-sm-9"><input type="text" name="search_pattern" value="{tmpl_var name='search_pattern'}" /></div></td>
+ <td><select name="search_action">{tmpl_var name='search_action'}</select></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_content_filter_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_pattern"><a href="#" onclick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="pattern"}</a></td>
- <td class="tbl_col_action"><a href="#" onclick="loadContent('mail/mail_content_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="action"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="mail/mail_content_filter_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
+ <td><a href="#" data-load-content="mail/mail_content_filter_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -70,11 +70,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+ <td colspan="5"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/mail/templates/mail_domain_admin_list.htm b/interface/web/mail/templates/mail_domain_admin_list.htm
index 0c03c28..c320435 100644
--- a/interface/web/mail/templates/mail_domain_admin_list.htm
+++ b/interface/web/mail/templates/mail_domain_admin_list.htm
@@ -1,47 +1,47 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
-<div class="panel panel_list_mail_domain_admin">
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('mail/mail_domain_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="mail/mail_domain_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_sys_groupid" scope="col"><tmpl_var name="sys_groupid_txt"></th>
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="active_txt"></th>
+ <th><tmpl_var name="sys_groupid_txt"></th>
+ <th><tmpl_var name="server_id_txt"></th>
+ <th><tmpl_var name="domain_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_sys_groupid"><select name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <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><div class="col-sm-9"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_domain_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_sys_groupid"><a href="#" onclick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="sys_groupid"}</a></td>
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_domain"><a href="#" onclick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="mail/mail_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
+ <td><a href="#" data-load-content="mail/mail_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="sys_groupid"}</a></td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -53,11 +53,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+ <td colspan="5"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/mail/templates/mail_domain_catchall_edit.htm b/interface/web/mail/templates/mail_domain_catchall_edit.htm
index 952d458..3c421c0 100644
--- a/interface/web/mail/templates/mail_domain_catchall_edit.htm
+++ b/interface/web/mail/templates/mail_domain_catchall_edit.htm
@@ -1,36 +1,33 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_mail_domain_catchall">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='source_txt'}</p>
- <div class="multiField">
- <label for="email_at" class="blockLabel email_at"> <span id="email_at" name="email_at" />@</label>
- <label for="email_domain" class="blockLabel">{tmpl_var name='domain_txt'}<select name="email_domain" id="email_domain" class="selectInput">{tmpl_var name='email_domain'}</select></label>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='source_txt'}</label>
+ <div class="col-sm-9">
+ <label for="email_at" class="col-sm-3 control-label"> <span id="email_at" name="email_at" />@</label>
+ <label for="email_domain" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}<div class="col-sm-9"><select name="email_domain" id="email_domain" class="form-control">{tmpl_var name='email_domain'}</select></div></label>
</div>
</div>
- <div class="ctrlHolder">
- <label for="destination">{tmpl_var name='destination_txt'}</label>
- <input name="destination" id="destination" value="{tmpl_var name='destination'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label for="destination" class="col-sm-3 control-label">{tmpl_var name='destination_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="destination" id="destination" value="{tmpl_var name='destination'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input type="hidden" name="type" value="catchall">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_domain_catchall_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('mail/mail_domain_catchall_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_domain_catchall_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_domain_catchall_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/mail/templates/mail_domain_catchall_list.htm b/interface/web/mail/templates/mail_domain_catchall_list.htm
index 9b25605..bdcda7d 100644
--- a/interface/web/mail/templates/mail_domain_catchall_list.htm
+++ b/interface/web/mail/templates/mail_domain_catchall_list.htm
@@ -1,9 +1,9 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_mail_domain_catchall">
- <div class="pnl_toolsarea">
<tmpl_if name='datalog_changes_count' op='>' value='0'>
<div>
<div class="systemmonitor-state state-info">
@@ -20,42 +20,42 @@
</div><br />
</div>
</tmpl_if>
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('mail/mail_domain_catchall_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="mail/mail_domain_catchall_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
- <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="active_txt"></th>
+ <th><tmpl_var name="source_txt"></th>
+ <th><tmpl_var name="destination_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
- <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_domain_catchall_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><select name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><div class="col-sm-9"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_domain_catchall_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('mail/mail_domain_catchall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_source"><a href="#" onclick="loadContent('mail/mail_domain_catchall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
- <td class="tbl_col_destination"><a href="#" onclick="loadContent('mail/mail_domain_catchall_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="mail/mail_domain_catchall_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -67,11 +67,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+ <td colspan="4"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/mail/templates/mail_domain_edit.htm b/interface/web/mail/templates/mail_domain_edit.htm
old mode 100755
new mode 100644
index dbd5c6e..5aa4873
--- a/interface/web/mail/templates/mail_domain_edit.htm
+++ b/interface/web/mail/templates/mail_domain_edit.htm
@@ -1,84 +1,84 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_mail_domain">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
+
<tmpl_if name="is_admin">
- <div class="ctrlHolder">
+ <div class="form-group">
<tmpl_if name="edit_disabled">
- <label for="server_id_disabled">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id_disabled" id="server_id_disabled" class="selectInput" disabled="disabled">
+ <label for="server_id_disabled" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id_disabled" id="server_id_disabled" class="form-control" disabled="disabled">
{tmpl_var name='server_id'}
</select>
- <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+ </div><input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
<tmpl_else>
- <label for="server_id">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id" id="server_id" class="selectInput">
+ <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
{tmpl_var name='server_id'}
</select>
- </tmpl_if>
+ </div></tmpl_if>
</div>
<tmpl_unless name="domain_option">
- <div class="ctrlHolder">
- <label for="client_group_id">{tmpl_var name='client_txt'}</label>
- <select name="client_group_id" id="client_group_id" class="selectInput">
+ <div class="form-group">
+ <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
+ <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
{tmpl_var name='client_group_id'}
</select>
- </div>
+ </div></div>
</tmpl_unless>
<tmpl_else>
<tmpl_if name="only_one_server">
<input type="hidden" id="server_id" name="server_id" value="{tmpl_var name='server_id_value'}" />
<tmpl_else>
- <div class="ctrlHolder">
+ <div class="form-group">
<tmpl_if name="edit_disabled">
- <label for="server_id_disabled">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id_disabled" id="server_id_disabled" class="selectInput" disabled="disabled">
+ <label for="server_id_disabled" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id_disabled" id="server_id_disabled" class="form-control" disabled="disabled">
{tmpl_var name='client_server_id'}
</select>
- <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+ </div><input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
<tmpl_else>
- <label for="server_id">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id" id="server_id" class="selectInput">
+ <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
{tmpl_var name='client_server_id'}
</select>
- </tmpl_if>
+ </div></tmpl_if>
</div>
</tmpl_if>
</tmpl_if>
<tmpl_if name="is_reseller">
<tmpl_unless name="domain_option">
- <div class="ctrlHolder">
- <label for="client_group_id">{tmpl_var name='client_txt'}</label>
- <select name="client_group_id" id="client_group_id" class="selectInput">
+ <div class="form-group">
+ <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
+ <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
{tmpl_var name='client_group_id'}
</select>
- </div>
+ </div></div>
</tmpl_unless>
</tmpl_if>
- <div class="ctrlHolder">
- <label for="domain">{tmpl_var name='domain_txt'}</label>
+ <div class="form-group">
+ <label for="domain" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}</label>
<tmpl_if name="domain_option">
- <select name="domain" id="domain" class="selectInput">
+ <div class="col-sm-9"><select name="domain" id="domain" class="form-control">
{tmpl_var name='domain_option'}
</select>
- <tmpl_else>
- <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
- </tmpl_if>
+ </div><tmpl_else>
+ <div class="col-sm-9"><input type="text" name="domain" id="domain" value="{tmpl_var name='domain'}" class="form-control" />
+ </div></tmpl_if>
</div>
- <div class="ctrlHolder">
- <label for="policy">{tmpl_var name='policy_txt'}</label>
- <select name="policy" id="policy" class="selectInput">
+ <div class="form-group">
+ <label for="policy" class="col-sm-3 control-label">{tmpl_var name='policy_txt'}</label>
+ <div class="col-sm-9"><select name="policy" id="policy" class="form-control">
{tmpl_var name='policy'}
</select>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
@@ -89,40 +89,38 @@
</tmpl_if>
<div class="subsectiontoggle"><span></span>{tmpl_var name='dkim_settings_txt'}<em></em></div>
<div style="display:none;">
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='dkim_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='dkim_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='dkim'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="dkim_selector">{tmpl_var name='dkim_selector_txt'}</label>
- <input name="dkim_selector" id="dkim_selector" value="{tmpl_var name='dkim_selector'}" size="20" maxlength="63" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="dkim_private">{tmpl_var name='dkim_private_txt'}</label>
+ <div class="form-group">
+ <label for="dkim_selector" class="col-sm-3 control-label">{tmpl_var name='dkim_selector_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="dkim_selector" id="dkim_selector" value="{tmpl_var name='dkim_selector'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="dkim_private" class="col-sm-3 control-label">{tmpl_var name='dkim_private_txt'}</label>
<textarea name="dkim_private" id="dkim_private" rows='10' cols='30'>{tmpl_var name='dkim_private'}</textarea>
<a href="javascript:setRequest('create')">{tmpl_var name='dkim_generate_txt'}</a>
</div>
- <div class="ctrlHolder">
+ <div class="form-group">
<textarea name="dkim_public" style="display:none;" id="dkim_public" rows='5' cols='30' readonly>{tmpl_var name='dkim_public'}</textarea>
</div>
- <div class="ctrlHolder">
- <label for="dns_record">{tmpl_var name='dkim_dns_txt'}</label>
+ <div class="form-group">
+ <label for="dns_record" class="col-sm-3 control-label">{tmpl_var name='dkim_dns_txt'}</label>
<textarea name="dns_record" id="dns_record" rows='10' cols='30' readonly>{tmpl_var name='dns_record'}</textarea>
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input type="hidden" name="type" value="local">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('mail/mail_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_domain_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_domain_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
<script language="JavaScript" type="text/javascript" src="js/mail_domain_dkim.js"></script>
diff --git a/interface/web/mail/templates/mail_domain_list.htm b/interface/web/mail/templates/mail_domain_list.htm
index 4025150..24fad5c 100644
--- a/interface/web/mail/templates/mail_domain_list.htm
+++ b/interface/web/mail/templates/mail_domain_list.htm
@@ -1,9 +1,9 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_mail_domain">
- <div class="pnl_toolsarea">
<tmpl_if name='datalog_changes_count' op='>' value='0'>
<div>
<div class="systemmonitor-state state-info">
@@ -20,42 +20,42 @@
</div><br />
</div>
</tmpl_if>
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('mail/mail_domain_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="mail/mail_domain_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="active_txt"></th>
+ <th><tmpl_var name="server_id_txt"></th>
+ <th><tmpl_var name="domain_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><select name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><div class="col-sm-9"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_domain_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_domain"><a href="#" onclick="loadContent('mail/mail_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="mail/mail_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -67,11 +67,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+ <td colspan="4"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/mail/templates/mail_forward_edit.htm b/interface/web/mail/templates/mail_forward_edit.htm
index 5e076dc..909600f 100644
--- a/interface/web/mail/templates/mail_forward_edit.htm
+++ b/interface/web/mail/templates/mail_forward_edit.htm
@@ -1,37 +1,34 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_mail_forward">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <p class="label"><em>*</em> {tmpl_var name='email_txt'}</p>
- <div class="multiField">
- <label for="email_local_part" class="blockLabel">Alias<input type="text" id="email_local_part" name="email_local_part" size="20" value="{tmpl_var name='email_local_part'}" class="textInput" /></label>
- <label for="email_at" class="blockLabel email_at"> <span id="email_at" name="email_at" />@</label>
- <label for="email_domain" class="blockLabel">{tmpl_var name='domain_txt'}<select name="email_domain" id="email_domain" class="selectInput">{tmpl_var name='email_domain'}</select></label>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label"><em>*</em> {tmpl_var name='email_txt'}</label>
+ <div class="col-sm-9">
+ <label for="email_local_part" class="col-sm-3 control-label">Alias<div class="col-sm-9"><input type="text" id="email_local_part" name="email_local_part" value="{tmpl_var name='email_local_part'}" class="form-control" /></div></label>
+ <label for="email_at" class="col-sm-3 control-label"> <span id="email_at" name="email_at" />@</label>
+ <label for="email_domain" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}<div class="col-sm-9"><select name="email_domain" id="email_domain" class="form-control">{tmpl_var name='email_domain'}</select></div></label>
</div>
</div>
- <div class="ctrlHolder">
- <label for="destination">{tmpl_var name='destination_txt'}</label>
+ <div class="form-group">
+ <label for="destination" class="col-sm-3 control-label">{tmpl_var name='destination_txt'}</label>
<textarea rows="10" cols="40" name="destination" id="destination" type="text" class="textInput">{tmpl_var name='destination'}</textarea>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input type="hidden" name="type" value="forward">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_forward_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('mail/mail_forward_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_forward_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_forward_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/mail/templates/mail_forward_list.htm b/interface/web/mail/templates/mail_forward_list.htm
index 48e85f1..c68fa36 100644
--- a/interface/web/mail/templates/mail_forward_list.htm
+++ b/interface/web/mail/templates/mail_forward_list.htm
@@ -1,9 +1,9 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_mail_forward">
- <div class="pnl_toolsarea">
<tmpl_if name='datalog_changes_count' op='>' value='0'>
<div>
<div class="systemmonitor-state state-info">
@@ -20,42 +20,42 @@
</div><br />
</div>
</tmpl_if>
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('mail/mail_forward_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="mail/mail_forward_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
- <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="active_txt"></th>
+ <th><tmpl_var name="source_txt"></th>
+ <th><tmpl_var name="destination_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
- <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_forward_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><select name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><div class="col-sm-9"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_forward_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('mail/mail_forward_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_source"><a href="#" onclick="loadContent('mail/mail_forward_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
- <td class="tbl_col_destination"><a href="#" onclick="loadContent('mail/mail_forward_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="mail/mail_forward_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -67,11 +67,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+ <td colspan="4"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/mail/templates/mail_get_edit.htm b/interface/web/mail/templates/mail_get_edit.htm
index 1f5e6a9..61e6123 100644
--- a/interface/web/mail/templates/mail_get_edit.htm
+++ b/interface/web/mail/templates/mail_get_edit.htm
@@ -1,60 +1,57 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_mail_get">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="type">{tmpl_var name='type_txt'}</label>
- <select name="type" id="type" class="selectInput">
+
+ <div class="form-group">
+ <label for="type" class="col-sm-3 control-label">{tmpl_var name='type_txt'}</label>
+ <div class="col-sm-9"><select name="type" id="type" class="form-control">
{tmpl_var name='type'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="source_server">{tmpl_var name='source_server_txt'}</label>
- <input name="source_server" id="source_server" value="{tmpl_var name='source_server'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="source_username">{tmpl_var name='source_username_txt'}</label>
- <input name="source_username" id="source_username" value="{tmpl_var name='source_username'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="source_password">{tmpl_var name='source_password_txt'}</label>
+ </div></div>
+ <div class="form-group">
+ <label for="source_server" class="col-sm-3 control-label">{tmpl_var name='source_server_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="source_server" id="source_server" value="{tmpl_var name='source_server'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="source_username" class="col-sm-3 control-label">{tmpl_var name='source_username_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="source_username" id="source_username" value="{tmpl_var name='source_username'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="source_password" class="col-sm-3 control-label">{tmpl_var name='source_password_txt'}</label>
<input name="source_password" id="source_password" value="{tmpl_var name='source_password'}" size="30" maxlength="255" type="password" class="textInput" />
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='source_delete_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='source_delete_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='source_delete'} {tmpl_var name="source_delete_note_txt"}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='source_read_all_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='source_read_all_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='source_read_all'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="destination">{tmpl_var name='destination_txt'}</label>
- <select name="destination" id="destination" class="selectInput">
+ <div class="form-group">
+ <label for="destination" class="col-sm-3 control-label">{tmpl_var name='destination_txt'}</label>
+ <div class="col-sm-9"><select name="destination" id="destination" class="form-control">
{tmpl_var name='destination'}
</select>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_get_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('mail/mail_get_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_get_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_get_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/mail/templates/mail_get_list.htm b/interface/web/mail/templates/mail_get_list.htm
index a4784f9..417da8a 100644
--- a/interface/web/mail/templates/mail_get_list.htm
+++ b/interface/web/mail/templates/mail_get_list.htm
@@ -1,9 +1,9 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_mail_get">
- <div class="pnl_toolsarea">
<tmpl_if name='datalog_changes_count' op='>' value='0'>
<div>
<div class="systemmonitor-state state-info">
@@ -20,48 +20,48 @@
</div><br />
</div>
</tmpl_if>
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('mail/mail_get_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="mail/mail_get_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_source_server" scope="col"><tmpl_var name="source_server_txt"></th>
- <th class="tbl_col_source_username" scope="col"><tmpl_var name="source_username_txt"></th>
- <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="active_txt"></th>
+ <th><tmpl_var name="server_id_txt"></th>
+ <th><tmpl_var name="source_server_txt"></th>
+ <th><tmpl_var name="source_username_txt"></th>
+ <th><tmpl_var name="destination_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_source_server"><input type="text" name="search_source_server" value="{tmpl_var name='search_source_server'}" /></td>
- <td class="tbl_col_source_username"><input type="text" name="search_source_username" value="{tmpl_var name='search_source_username'}" /></td>
- <td class="tbl_col_destination"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_get_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><select name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><div class="col-sm-9"><input type="text" name="search_source_server" value="{tmpl_var name='search_source_server'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_source_username" value="{tmpl_var name='search_source_username'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_destination" value="{tmpl_var name='search_destination'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_get_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_source_server"><a href="#" onclick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source_server"}</a></td>
- <td class="tbl_col_source_username"><a href="#" onclick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source_username"}</a></td>
- <td class="tbl_col_destination"><a href="#" onclick="loadContent('mail/mail_get_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="destination"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="mail/mail_get_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
+ <td><a href="#" data-load-content="mail/mail_get_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
+ <td><a href="#" data-load-content="mail/mail_get_edit.php?id={tmpl_var name='id'}">{tmpl_var name="source_server"}</a></td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -73,11 +73,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+ <td colspan="6"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/mail/templates/mail_mailinglist_edit.htm b/interface/web/mail/templates/mail_mailinglist_edit.htm
index d9ec0ca..e7256b7 100644
--- a/interface/web/mail/templates/mail_mailinglist_edit.htm
+++ b/interface/web/mail/templates/mail_mailinglist_edit.htm
@@ -1,86 +1,83 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_mail_mailinglist">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>Mailing List</legend>
+ <legend>Mailing List</legend>
<tmpl_if name="is_admin">
- <div class="ctrlHolder">
- <label for="client_group_id">{tmpl_var name='client_txt'}</label>
- <select name="client_group_id" id="client_group_id" class="selectInput">
+ <div class="form-group">
+ <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
+ <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
{tmpl_var name='client_group_id'}
</select>
- </div>
+ </div></div>
</tmpl_if>
<tmpl_if name="is_reseller">
- <div class="ctrlHolder">
- <label for="client_group_id">{tmpl_var name='client_txt'}</label>
- <select name="client_group_id" id="client_group_id" class="selectInput">
+ <div class="form-group">
+ <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
+ <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
{tmpl_var name='client_group_id'}
</select>
- </div>
+ </div></div>
</tmpl_if>
<tmpl_if name="edit_disabled">
- <div class="ctrlHolder">
- <label for="domain_disabled">{tmpl_var name='domain_txt'}</label>
- <select name="domain_disabled" id="domain_disabled" class="selectInput" disabled="disabled">
+ <div class="form-group">
+ <label for="domain_disabled" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}</label>
+ <div class="col-sm-9"><select name="domain_disabled" id="domain_disabled" class="form-control" disabled="disabled">
{tmpl_var name='domain_option'}
</select>
- <input type="hidden" name="domain" value="{tmpl_var name='domain_value'}" />
+ </div><input type="hidden" name="domain" value="{tmpl_var name='domain_value'}" />
</div>
- <div class="ctrlHolder">
- <label for="listname_disabled">{tmpl_var name='listname_txt'}</label>
- <input name="listname_disabled" id="listname_disabled" value="{tmpl_var name='listname'}" size="30" maxlength="255" type="text" class="textInput" disabled="disabled" />
- <input type="hidden" name="listname" value="{tmpl_var name='listname_value'}" />
+ <div class="form-group">
+ <label for="listname_disabled" class="col-sm-3 control-label">{tmpl_var name='listname_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="listname_disabled" id="listname_disabled" value="{tmpl_var name='listname'}" class="form-control" disabled="disabled" />
+ </div><input type="hidden" name="listname" value="{tmpl_var name='listname_value'}" />
</div>
- <div class="ctrlHolder">
- <label for="email_disabled">{tmpl_var name='email_txt'}</label>
- <input name="email_disabled" id="email_disabled" value="{tmpl_var name='email'}" size="30" maxlength="255" type="text" class="textInput" disabled="disabled" />
- <input type="hidden" name="email" value="{tmpl_var name='email_value'}" />
+ <div class="form-group">
+ <label for="email_disabled" class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="email_disabled" id="email_disabled" value="{tmpl_var name='email'}" class="form-control" disabled="disabled" />
+ </div><input type="hidden" name="email" value="{tmpl_var name='email_value'}" />
</div>
<tmpl_else>
- <div class="ctrlHolder">
- <label for="domain">{tmpl_var name='domain_txt'}</label>
- <select name="domain" id="domain" class="selectInput">
+ <div class="form-group">
+ <label for="domain" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}</label>
+ <div class="col-sm-9"><select name="domain" id="domain" class="form-control">
{tmpl_var name='domain_option'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="listname">{tmpl_var name='listname_txt'}</label>
- <input name="listname" id="listname" value="{tmpl_var name='listname'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="email">{tmpl_var name='email_txt'}</label>
- <input name="email" id="email" value="{tmpl_var name='email'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
+ </div></div>
+ <div class="form-group">
+ <label for="listname" class="col-sm-3 control-label">{tmpl_var name='listname_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="listname" id="listname" value="{tmpl_var name='listname'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="email" class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="email" id="email" value="{tmpl_var name='email'}" class="form-control" />
+ </div></div>
</tmpl_if>
- <div class="ctrlHolder">
- <label for="password">{tmpl_var name='password_txt'}</label>
+ <div class="form-group">
+ <label for="password" class="col-sm-3 control-label">{tmpl_var name='password_txt'}</label>
<input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" /> <a href="javascript:void(0);" onclick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='password_strength_txt'}</p>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='password_strength_txt'}</label>
<div id="passBar"></div>
<p class="formHint"><span id="passText"> </span></p>
</div>
- <div class="ctrlHolder">
- <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+ <div class="form-group">
+ <label for="repeat_password" class="col-sm-3 control-label">{tmpl_var name='repeat_password_txt'}</label>
<input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;" autocomplete="off" onkeyup="checkPassMatch('password','repeat_password');" />
</div>
<div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
<div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_mailinglist_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('mail/mail_mailinglist_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_mailinglist_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_mailinglist_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
diff --git a/interface/web/mail/templates/mail_mailinglist_list.htm b/interface/web/mail/templates/mail_mailinglist_list.htm
index 12ddd95..ff1c0c4 100644
--- a/interface/web/mail/templates/mail_mailinglist_list.htm
+++ b/interface/web/mail/templates/mail_mailinglist_list.htm
@@ -1,8 +1,8 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
-<div class="panel panel_list_mail_mailinglist">
- <div class="pnl_toolsarea">
<tmpl_if name='datalog_changes_count' op='>' value='0'>
<div>
<div class="systemmonitor-state state-info">
@@ -19,42 +19,42 @@
</div><br />
</div>
</tmpl_if>
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('mail/mail_mailinglist_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="mail/mail_mailinglist_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_listname" scope="col"><tmpl_var name="listname_txt"></th>
- <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="listname_txt"></th>
+ <th><tmpl_var name="domain_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_listname"><input type="text" name="search_listname" value="{tmpl_var name='search_listname'}" /></td>
- <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_mailinglist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><div class="col-sm-9"><input type="text" name="search_listname" value="{tmpl_var name='search_listname'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_mailinglist_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_listname"><a href="#" onclick="loadContent('mail/mail_mailinglist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="listname"}</a></td>
- <td class="tbl_col_domain"><a href="#" onclick="loadContent('mail/mail_mailinglist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
- <td class="tbl_col_buttons">
+ <td><a href="#" data-load-content="mail/mail_mailinglist_edit.php?id={tmpl_var name='id'}">{tmpl_var name="listname"}</a></td>
+ <td><a href="#" data-load-content="mail/mail_mailinglist_edit.php?id={tmpl_var name='id'}">{tmpl_var name="domain"}</a></td>
+ <td>
<tmpl_if name="mailmailinglist_link">
- <a class="button icons16 icoWebmailer" href="mail/mailinglist.php?id={tmpl_var name='id'}" target="mailmailinglist"><span>{tmpl_var name='mailinglist_txt'}</span></a>
+ <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="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -66,11 +66,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+ <td colspan="3"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/mail/templates/mail_relay_recipient_edit.htm b/interface/web/mail/templates/mail_relay_recipient_edit.htm
index 0e5999c..5634921 100644
--- a/interface/web/mail/templates/mail_relay_recipient_edit.htm
+++ b/interface/web/mail/templates/mail_relay_recipient_edit.htm
@@ -1,35 +1,32 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_mail_relay_recipient">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>Relay recipient</legend>
- <div class="ctrlHolder">
- <label for="server_id">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id" id="server_id" class="selectInput">
+ <legend>Relay recipient</legend>
+ <div class="form-group">
+ <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
{tmpl_var name='server_id'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="source">{tmpl_var name='source_txt'}</label>
- <input name="source" id="source" value="{tmpl_var name='source'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ </div></div>
+ <div class="form-group">
+ <label for="source" class="col-sm-3 control-label">{tmpl_var name='source_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="source" id="source" value="{tmpl_var name='source'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input type="hidden" name="access" value="OK">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_relay_recipient_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('mail/mail_relay_recipient_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_relay_recipient_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_relay_recipient_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/mail/templates/mail_relay_recipient_list.htm b/interface/web/mail/templates/mail_relay_recipient_list.htm
index 33f5281..aca3b6f 100644
--- a/interface/web/mail/templates/mail_relay_recipient_list.htm
+++ b/interface/web/mail/templates/mail_relay_recipient_list.htm
@@ -1,8 +1,8 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
-<div class="panel panel_list_mail_relay_recipient">
- <div class="pnl_toolsarea">
<tmpl_if name='datalog_changes_count' op='>' value='0'>
<div>
<div class="systemmonitor-state state-info">
@@ -19,42 +19,42 @@
</div><br />
</div>
</tmpl_if>
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('mail/mail_relay_recipient_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="mail/mail_relay_recipient_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="active_txt"></th>
+ <th><tmpl_var name="server_id_txt"></th>
+ <th><tmpl_var name="source_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_relay_recipient_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><select name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><div class="col-sm-9"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_relay_recipient_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('mail/mail_relay_recipient_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('mail/mail_relay_recipient_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_source"><a href="#" onclick="loadContent('mail/mail_relay_recipient_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="mail/mail_relay_recipient_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -66,11 +66,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+ <td colspan="4"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/mail/templates/mail_transport_edit.htm b/interface/web/mail/templates/mail_transport_edit.htm
index cd1e8c9..07e774c 100644
--- a/interface/web/mail/templates/mail_transport_edit.htm
+++ b/interface/web/mail/templates/mail_transport_edit.htm
@@ -1,56 +1,53 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_mail_transport">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="server_id">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id" id="server_id" class="selectInput">
+
+ <div class="form-group">
+ <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
{tmpl_var name='server_id'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="domain">{tmpl_var name='domain_txt'}</label>
- <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="type">{tmpl_var name='type_txt'}</label>
- <select name="type" id="type" class="selectInput formLengthHalf">
+ </div></div>
+ <div class="form-group">
+ <label for="domain" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="domain" id="domain" value="{tmpl_var name='domain'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="type" class="col-sm-3 control-label">{tmpl_var name='type_txt'}</label>
+ <div class="col-sm-9"><select name="type" id="type" class="form-control">
{tmpl_var name='type'}
</select>
+ </div></div>
+ <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></div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='mx_txt'}</p>
- <div class="multiField">
- <input type="checkbox" value="y" id="mx" name="mx" {tmpl_var name='mx'} />
- </div>
- </div>
- <div class="ctrlHolder">
- <label for="destination">{tmpl_var name='destination_txt'}</label>
- <input name="destination" id="transport" value="{tmpl_var name='destination'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="sort_order">{tmpl_var name='sort_order_txt'}</label>
- <select name="sort_order" id="sort_order" class="selectInput formLengthHalf">
+ <div class="form-group">
+ <label for="destination" class="col-sm-3 control-label">{tmpl_var name='destination_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="destination" id="transport" value="{tmpl_var name='destination'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="sort_order" class="col-sm-3 control-label">{tmpl_var name='sort_order_txt'}</label>
+ <div class="col-sm-9"><select name="sort_order" id="sort_order" class="form-control">
{tmpl_var name='sort_order'}
</select>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_transport_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('mail/mail_transport_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_transport_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_transport_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/mail/templates/mail_transport_list.htm b/interface/web/mail/templates/mail_transport_list.htm
index cac01bd..3dfed0a 100644
--- a/interface/web/mail/templates/mail_transport_list.htm
+++ b/interface/web/mail/templates/mail_transport_list.htm
@@ -1,9 +1,9 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_mail_transport">
- <div class="pnl_toolsarea">
<tmpl_if name='datalog_changes_count' op='>' value='0'>
<div>
<div class="systemmonitor-state state-info">
@@ -20,48 +20,48 @@
</div><br />
</div>
</tmpl_if>
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('mail/mail_transport_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="mail/mail_transport_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
- <th class="tbl_col_transport" scope="col"><tmpl_var name="transport_txt"></th>
- <th class="tbl_col_sort_order" scope="col"><tmpl_var name="sort_order_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="active_txt"></th>
+ <th><tmpl_var name="server_id_txt"></th>
+ <th><tmpl_var name="domain_txt"></th>
+ <th><tmpl_var name="transport_txt"></th>
+ <th><tmpl_var name="sort_order_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
- <td class="tbl_col_transport"><input type="text" name="search_transport" value="{tmpl_var name='search_transport'}" /></td>
- <td class="tbl_col_sort_order"><input type="text" name="search_sort_order" value="{tmpl_var name='search_sort_order'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_transport_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><select name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><div class="col-sm-9"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_transport" value="{tmpl_var name='search_transport'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_sort_order" value="{tmpl_var name='search_sort_order'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_transport_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_domain"><a href="#" onclick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
- <td class="tbl_col_transport"><a href="#" onclick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="transport"}</a></td>
- <td class="tbl_col_sort_order"><a href="#" onclick="loadContent('mail/mail_transport_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="sort_order"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="mail/mail_transport_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
+ <td><a href="#" data-load-content="mail/mail_transport_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
+ <td><a href="#" data-load-content="mail/mail_transport_edit.php?id={tmpl_var name='id'}">{tmpl_var name="domain"}</a></td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -73,11 +73,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+ <td colspan="6"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/mail/templates/mail_user_autoresponder_edit.htm b/interface/web/mail/templates/mail_user_autoresponder_edit.htm
index 4ff8c81..88e8616 100644
--- a/interface/web/mail/templates/mail_user_autoresponder_edit.htm
+++ b/interface/web/mail/templates/mail_user_autoresponder_edit.htm
@@ -1,44 +1,38 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_mail_user">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="autoresponder_subject">{tmpl_var name='autoresponder_subject_txt'}</label>
- <input type="text" name="autoresponder_subject" id="autoresponder_subject" maxlength='250' value="{tmpl_var name='autoresponder_subject'}" />
- </div>
- <div class="ctrlHolder">
- <label for="autoresponder_text">{tmpl_var name='autoresponder_text_txt'}</label>
+
+
+ <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></div>
+ <div class="form-group">
+ <label for="autoresponder_text" class="col-sm-3 control-label">{tmpl_var name='autoresponder_text_txt'}</label>
<textarea name="autoresponder_text" id="autoresponder_text" rows='15' cols='30'>{tmpl_var name='autoresponder_text'}</textarea>
</div>
- <div class="ctrlHolder">
- <label for="autoresponder">{tmpl_var name='autoresponder_active'}</label>
- <input type="checkbox" value="y" id="autoresponder" name="autoresponder"
+ <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>
- <div class="ctrlHolder">
- <label for="autoresponder_start_date">{tmpl_var name='autoresponder_start_date_txt'}</label>
+ </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>
{tmpl_var name='autoresponder_start_date'}
<a href="javascript:AR_SetNow();">{tmpl_var name='now_txt'}</a>
</div>
- <div class="ctrlHolder">
- <label for="autoresponder_end_date">{tmpl_var name='autoresponder_end_date_txt'}</label>
+ <div class="form-group">
+ <label for="autoresponder_end_date" class="col-sm-3 control-label">{tmpl_var name='autoresponder_end_date_txt'}</label>
{tmpl_var name='autoresponder_end_date'}
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button"
- value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_user_edit.php');">
- <span>{tmpl_var name='btn_save_txt'}</span>
- </button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}"
- onclick="loadContent('mail/mail_user_list.php');">
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button"
+ value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_user_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_user_list.php">
<span>{tmpl_var name='btn_cancel_txt'}</span>
</button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/mail/templates/mail_user_backup.htm b/interface/web/mail/templates/mail_user_backup.htm
index e3aa096..a6e2650 100644
--- a/interface/web/mail/templates/mail_user_backup.htm
+++ b/interface/web/mail/templates/mail_user_backup.htm
@@ -1,4 +1,6 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
<tmpl_if name="config_error_msg">
@@ -10,30 +12,25 @@
</div>
</tmpl_if>
-<div class="panel panel_mail_user">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>Backup</legend>
- <div class="ctrlHolder">
- <label for="backup_interval">{tmpl_var name='backup_interval_txt'}</label>
- <select name="backup_interval" id="backup_interval" class="selectInput">
+ <legend>Backup</legend>
+ <div class="form-group">
+ <label for="backup_interval" class="col-sm-3 control-label">{tmpl_var name='backup_interval_txt'}</label>
+ <div class="col-sm-9"><select name="backup_interval" id="backup_interval" class="form-control">
{tmpl_var name='backup_interval'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="backup_copies">{tmpl_var name='backup_copies_txt'}</label>
- <select name="backup_copies" id="backup_copies" class="selectInput">
+ </div></div>
+ <div class="form-group">
+ <label for="backup_copies" class="col-sm-3 control-label">{tmpl_var name='backup_copies_txt'}</label>
+ <div class="col-sm-9"><select name="backup_copies" id="backup_copies" class="form-control">
{tmpl_var name='backup_copies'}
</select>
- </div>
- </fieldset>
+ </div></div>
+
{tmpl_var name='backup_records'}
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('mail/mail_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_user_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_user_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
diff --git a/interface/web/mail/templates/mail_user_backup_list.htm b/interface/web/mail/templates/mail_user_backup_list.htm
index 7fc61fd..6b00afd 100644
--- a/interface/web/mail/templates/mail_user_backup_list.htm
+++ b/interface/web/mail/templates/mail_user_backup_list.htm
@@ -6,29 +6,28 @@
</tmpl_if>
<h3><tmpl_var name="list_head_txt"></h3>
-<div class="panel panel_list_mail_backup">
-
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_date" scope="col"><tmpl_var name="date_txt"></th>
- <th class="tbl_col_filename" scope="col"><tmpl_var name="filename_txt"></th>
- <th class="tbl_col_filename" scope="col"><tmpl_var name="filesize_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="date_txt"></th>
+ <th><tmpl_var name="filename_txt"></th>
+ <th><tmpl_var name="filesize_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_date">{tmpl_var name="date"}</td>
- <td class="tbl_col_filename">{tmpl_var name="filename"}</td>
- <td class="tbl_col_filesize">{tmpl_var name="filesize"}</td>
- <td class="tbl_col_buttons">
+ <td>{tmpl_var name="date"}</td>
+ <td>{tmpl_var name="filename"}</td>
+ <td>{tmpl_var name="filesize"}</td>
+ <td>
<div class="buttons">
- <button class="button iconstxt icoRestore" type="button" onclick="confirm_action('mail/mail_user_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&backup_action=restore&backup_id={tmpl_var name='backup_id'}','{tmpl_var name='restore_confirm_txt'}');"><span>{tmpl_var name="restore_backup_txt"}</span></button>
-<!-- <button class="button iconstxt icoDownload" type="button" onclick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&backup_action=download&backup_id={tmpl_var name='backup_id'}');"><span>{tmpl_var name="download_backup_txt"}</span></button>
+ <button class="btn btn-default formbutton-default" type="button" onclick="confirm_action('mail/mail_user_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&backup_action=restore&backup_id={tmpl_var name='backup_id'}','{tmpl_var name='restore_confirm_txt'}');">{tmpl_var name="restore_backup_txt"}</button>
+<!-- <button class="button iconstxt icoDownload" type="button" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&backup_action=download&backup_id={tmpl_var name='backup_id'}"><span>{tmpl_var name="download_backup_txt"}</span></button>
-->
</div>
</td>
@@ -41,7 +40,6 @@
</tmpl_unless>
</tbody>
</table>
- </fieldset>
- </div>
-
</div>
+
+ </div>
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 31549df..3ce8bb0 100644
--- a/interface/web/mail/templates/mail_user_custom_rules_edit.htm
+++ b/interface/web/mail/templates/mail_user_custom_rules_edit.htm
@@ -1,22 +1,19 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_mail_user">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="custom_mailfilter">{tmpl_var name='custom_mailfilter_txt'}</label>
+
+ <div class="form-group">
+ <label for="custom_mailfilter" class="col-sm-3 control-label">{tmpl_var name='custom_mailfilter_txt'}</label>
<textarea name="custom_mailfilter" id="custom_mailfilter" rows='15' cols='30'>{tmpl_var name='custom_mailfilter'}</textarea>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('mail/mail_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_user_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_user_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/mail/templates/mail_user_filter_edit.htm b/interface/web/mail/templates/mail_user_filter_edit.htm
index f7fb4c7..5ded556 100644
--- a/interface/web/mail/templates/mail_user_filter_edit.htm
+++ b/interface/web/mail/templates/mail_user_filter_edit.htm
@@ -1,38 +1,35 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_mail_user_filter">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="rulename" class="wf_preField">{tmpl_var name='rulename_txt'}</label>
- <input type="text" id="rulename" name="rulename" value="{tmpl_var name='rulename'}" size="30" maxlength="255" class="textInput">
- </div>
- <div class="ctrlHolder">
- <label for="source" class="wf_preField">{tmpl_var name='source_txt'}</label>
+
+ <div class="form-group">
+ <label for="rulename" class="col-sm-3 control-label">{tmpl_var name='rulename_txt'}</label>
+ <div class="col-sm-9"><input type="text" id="rulename" name="rulename" value="{tmpl_var name='rulename'}" class="form-control">
+ </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><label></label><input type="text" id="searchterm" name="searchterm" value="{tmpl_var name='searchterm'}" size="30" maxlength="255" class="textInput"></div>
+ <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="ctrlHolder">
- <label for="action" class="wf_preField">{tmpl_var name='action_txt'}</label>
+ <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><label></label><input type="text" id="target" name="target" value="{tmpl_var name='target'}" size="30" maxlength="255" class="textInput formLengthHalf"></div>
+ <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="ctrlHolder">
- <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>
+ <div class="form-group">
+ <label for="active" class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
<span class="">{tmpl_var name='active'}</span>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input name="mailuser_id" type="hidden" value="{tmpl_var name='mailuser_id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_user_filter_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='mailuser_id'}');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_user_filter_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='mailuser_id'}"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/mail/templates/mail_user_filter_list.htm b/interface/web/mail/templates/mail_user_filter_list.htm
index 2d7a6de..6b79ac0 100644
--- a/interface/web/mail/templates/mail_user_filter_list.htm
+++ b/interface/web/mail/templates/mail_user_filter_list.htm
@@ -16,35 +16,35 @@
</div>
</tmpl_if>
<fieldset style="margin-top:20px;margin-bottom:20px;"><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('mail/mail_user_filter_edit.php?mailuser_id={tmpl_var name='parent_id'}');">
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="mail/mail_user_filter_edit.php?mailuser_id={tmpl_var name='parent_id'}">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
+
</fieldset>
-</div>
-<div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_rulename" scope="col"><tmpl_var name="rulename_txt"></th>
- <th class="tbl_col_buttons" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="rulename_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_rulename"><input type="text" name="search_rulename" value="{tmpl_var name='search_rulename'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="return changeTab('filter_records','mail/mail_user_edit.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><div class="col-sm-9"><input type="text" name="search_rulename" value="{tmpl_var name='search_rulename'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="return changeTab('filter_records','mail/mail_user_edit.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_rulename"><a href="#" onclick="loadContent('mail/mail_user_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="rulename"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -56,9 +56,9 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+ <td colspan="3"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
-</div>
\ No newline at end of file
+</div>
+
diff --git a/interface/web/mail/templates/mail_user_list.htm b/interface/web/mail/templates/mail_user_list.htm
index 3d9f09f..d0c9746 100644
--- a/interface/web/mail/templates/mail_user_list.htm
+++ b/interface/web/mail/templates/mail_user_list.htm
@@ -1,9 +1,9 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_mail_user">
- <div class="pnl_toolsarea">
<tmpl_if name='datalog_changes_count' op='>' value='0'>
<div>
<div class="systemmonitor-state state-info">
@@ -20,64 +20,64 @@
</div><br />
</div>
</tmpl_if>
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('mail/mail_user_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="mail/mail_user_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
- <tmpl_if name="enable_custom_login"><th class="tbl_col_login" scope="col"><tmpl_var name="login_txt"></th></tmpl_if>
- <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
- <th class="tbl_col_autoresponder" scope="col"><tmpl_var name="autoresponder_txt"></th>
- <th class="tbl_col_postfix" scope="col"><tmpl_var name="postfix_txt"></th>
- <th class="tbl_col_disablesmtp" scope="col"><tmpl_var name="disablesmtp_txt"></th>
- <th class="tbl_col_disableimap" scope="col"><tmpl_var name="disableimap_txt"></th>
- <th class="tbl_col_disablepop3" scope="col"><tmpl_var name="disablepop3_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="email_txt"></th>
+ <tmpl_if name="enable_custom_login"><th><tmpl_var name="login_txt"></th></tmpl_if>
+ <th><tmpl_var name="name_txt"></th>
+ <th><tmpl_var name="autoresponder_txt"></th>
+ <th><tmpl_var name="postfix_txt"></th>
+ <th><tmpl_var name="disablesmtp_txt"></th>
+ <th><tmpl_var name="disableimap_txt"></th>
+ <th><tmpl_var name="disablepop3_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
- <tmpl_if name="enable_custom_login"><td class="tbl_col_login"><input type="text" name="search_login" value="{tmpl_var name='search_login'}" /></td></tmpl_if>
- <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
- <td class="tbl_col_autoresponder"><select name="search_autoresponder">{tmpl_var name='search_autoresponder'}</select></td>
- <td class="tbl_col_postfix"><select name="search_postfix">{tmpl_var name='search_postfix'}</select></th>
- <td class="tbl_col_disablesmtp"><select name="search_disablesmtp">{tmpl_var name='search_disablesmtp'}</select></th>
- <td class="tbl_col_disableimap"><select name="search_disableimap">{tmpl_var name='search_disableimap'}</select></th>
- <td class="tbl_col_disablepop3"><select name="search_disablepop3">{tmpl_var name='search_disablepop3'}</select></th>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><div class="col-sm-9"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></div></td>
+ <tmpl_if name="enable_custom_login"><td><div class="col-sm-9"><input type="text" name="search_login" value="{tmpl_var name='search_login'}" /></div></td></tmpl_if>
+ <td><div class="col-sm-9"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></div></td>
+ <td><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>
+ <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>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_email"><a href="#" onclick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="email"}</a></td>
+ <td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="email"}</a></td>
<tmpl_if name="enable_custom_login">
- <td class="tbl_col_login">
- <a href="#" onclick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="login"}</a>
+ <td>
+ <a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="login"}</a>
</td>
</tmpl_if>
- <td class="tbl_col_name"><a href="#" onclick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
- <td class="tbl_col_autoresponder"><a href="#" onclick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="autoresponder"}</a></td>
- <td class="tbl_col_postfix"><a href="#" onclick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="postfix"}</a></td>
- <td class="tbl_col_disablesmtp"><a href="#" onclick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="disablesmtp"}</a></td>
- <td class="tbl_col_disableimap"><a href="#" onclick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="disableimap"}</a></td>
- <td class="tbl_col_disablepop3"><a href="#" onclick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="disablepop3"}</a></td>
- <td class="tbl_col_buttons">
+ <td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="name"}</a></td>
+ <td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="autoresponder"}</a></td>
+ <td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="postfix"}</a></td>
+ <td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="disablesmtp"}</a></td>
+ <td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="disableimap"}</a></td>
+ <td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="disablepop3"}</a></td>
+ <td>
<tmpl_if name="mailboxlist_webmail_link">
- <a class="button icons16 icoWebmailer" href="mail/webmailer.php?id={tmpl_var name='id'}" target="webmail"><span>{tmpl_var name="webmail_txt"}</span></a>
+ <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="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -89,11 +89,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="<tmpl_if name="enable_custom_login">9<tmpl_else>8</tmpl_if>"><tmpl_var name="paging"></td>
+ <td colspan="<tmpl_if name="enable_custom_login">9<tmpl_else>8</tmpl_if>"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/mail/templates/mail_user_mailbox_edit.htm b/interface/web/mail/templates/mail_user_mailbox_edit.htm
index 186b03d..650835a 100644
--- a/interface/web/mail/templates/mail_user_mailbox_edit.htm
+++ b/interface/web/mail/templates/mail_user_mailbox_edit.htm
@@ -1,91 +1,88 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_mail_user">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="name">{tmpl_var name='name_txt'}</label>
- <input name="name" id="name" value="{tmpl_var name='name'}" size="30" maxlength="255" type="text" class="textInput" /> {tmpl_var name='name_optional_txt'}
- </div>
- <div class="ctrlHolder">
- <p class="label"><em>*</em> {tmpl_var name='email_txt'}</p>
- <div class="multiField">
- <label for="email_local_part" class="blockLabel formLengthEmailDomain">Alias<input type="text" id="email_local_part" name="email_local_part" size="20" value="{tmpl_var name='email_local_part'}" class="textInput" /></label>
- <label for="email_at" class="blockLabel email_at"> <span id="email_at" name="email_at" />@</label>
- <label for="email_domain" class="blockLabel formLengthEmailDomain">{tmpl_var name='domain_txt'}<select name="email_domain" id="email_domain" class="selectInput">{tmpl_var name='email_domain'}</select></label>
+
+ <div class="form-group">
+ <label for="name" class="col-sm-3 control-label">{tmpl_var name='name_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="name" id="name" value="{tmpl_var name='name'}" class="form-control" /> {tmpl_var name='name_optional_txt'}
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label"><em>*</em> {tmpl_var name='email_txt'}</label>
+ <div class="col-sm-9">
+ <label for="email_local_part" class="col-sm-3 control-label">Alias<div class="col-sm-9"><input type="text" id="email_local_part" name="email_local_part" value="{tmpl_var name='email_local_part'}" class="form-control" /></div></label>
+ <label for="email_at" class="col-sm-3 control-label"> <span id="email_at" name="email_at" />@</label>
+ <label for="email_domain" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}<div class="col-sm-9"><select name="email_domain" id="email_domain" class="form-control">{tmpl_var name='email_domain'}</select></div></label>
</div>
</div>
- <tmpl_if name="enable_custom_login"><div class="ctrlHolder">
- <label for="login">{tmpl_var name='login_txt'}</label>
- <input type="text" id="login" name="login" size="20" value="{tmpl_var name='login'}" class="textInput" /></label>
+ <tmpl_if name="enable_custom_login"><div class="form-group">
+ <label for="login" class="col-sm-3 control-label">{tmpl_var name='login_txt'}</label>
+ <div class="col-sm-9"><input type="text" id="login" name="login" value="{tmpl_var name='login'}" class="form-control" /></div></label>
</div></tmpl_if>
- <div class="ctrlHolder">
- <label for="password">{tmpl_var name='password_txt'}</label>
+ <div class="form-group">
+ <label for="password" class="col-sm-3 control-label">{tmpl_var name='password_txt'}</label>
<input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" /> <a href="javascript:void(0);" onclick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='password_strength_txt'}</p>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='password_strength_txt'}</label>
<div id="passBar"></div>
<p class="formHint"><span id="passText"> </span></p>
</div>
- <div class="ctrlHolder">
- <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+ <div class="form-group">
+ <label for="repeat_password" class="col-sm-3 control-label">{tmpl_var name='repeat_password_txt'}</label>
<input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;" autocomplete="off" onkeyup="checkPassMatch('password','repeat_password');" />
</div>
<div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
<div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
- <div class="ctrlHolder">
- <label for="quota">{tmpl_var name='quota_txt'}</label>
- <input name="quota" id="quota" value="{tmpl_var name='quota'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" /><p class="label">MB</p>
+ <div class="form-group">
+ <label for="quota" class="col-sm-3 control-label">{tmpl_var name='quota_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="quota" id="quota" value="{tmpl_var name='quota'}" class="form-control" /></div><label class="col-sm-3 control-label">MB</label>
</div>
- <div class="ctrlHolder">
- <label for="name">{tmpl_var name='cc_txt'}</label>
- <input name="cc" id="cc" value="{tmpl_var name='cc'}" size="30" maxlength="255" type="text" class="textInput" /> {tmpl_var name='name_optional_txt'} {tmpl_var name='cc_note_txt'}
- </div>
- <div class="ctrlHolder">
- <label for="sender_name">{tmpl_var name='sender_cc_txt'}</label>
- <input name="sender_cc" id="sender_cc" value="{tmpl_var name='sender_cc'}" size="30" maxlength="255" type="text" class="textInput" /> {tmpl_var name='name_optional_txt'} {tmpl_var name='sender_cc_note_txt'}
- </div>
- <div class="ctrlHolder">
- <label for="policy">{tmpl_var name='policy_txt'}</label>
- <select name="policy" id="policy" class="selectInput">
+ <div class="form-group">
+ <label for="name" class="col-sm-3 control-label">{tmpl_var name='cc_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="cc" id="cc" value="{tmpl_var name='cc'}" class="form-control" /> {tmpl_var name='name_optional_txt'} {tmpl_var name='cc_note_txt'}
+ </div></div>
+ <div class="form-group">
+ <label for="sender_name" class="col-sm-3 control-label">{tmpl_var name='sender_cc_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="sender_cc" id="sender_cc" value="{tmpl_var name='sender_cc'}" class="form-control" /> {tmpl_var name='name_optional_txt'} {tmpl_var name='sender_cc_note_txt'}
+ </div></div>
+ <div class="form-group">
+ <label for="policy" class="col-sm-3 control-label">{tmpl_var name='policy_txt'}</label>
+ <div class="col-sm-9"><select name="policy" id="policy" class="form-control">
{tmpl_var name='policy'}
</select>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='postfix_txt'}</p>
- <div class="multiField">
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='postfix_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='postfix'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='disablesmtp_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='disablesmtp_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='disablesmtp'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='disableimap_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='disableimap_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='disableimap'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='disablepop3_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='disablepop3_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='disablepop3'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('mail/mail_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_user_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_user_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/mail/templates/mail_user_mailfilter_edit.htm b/interface/web/mail/templates/mail_user_mailfilter_edit.htm
index 3274685..b1de5c9 100644
--- a/interface/web/mail/templates/mail_user_mailfilter_edit.htm
+++ b/interface/web/mail/templates/mail_user_mailfilter_edit.htm
@@ -1,26 +1,23 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_mail_user">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='move_junk_txt'}</p>
- <div class="multiField">
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='move_junk_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='move_junk'}
</div>
</div>
- </fieldset>
+
{tmpl_var name='filter_records'}
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('mail/mail_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_user_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_user_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/mail/templates/mail_user_stats_list.htm b/interface/web/mail/templates/mail_user_stats_list.htm
index 35e2235..23b3163 100644
--- a/interface/web/mail/templates/mail_user_stats_list.htm
+++ b/interface/web/mail/templates/mail_user_stats_list.htm
@@ -1,40 +1,41 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_mail_user_stats">
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
- <th class="tbl_col_mail_traffic_this_month" scope="col"><tmpl_var name="this_month_txt"></th>
- <th class="tbl_col_mail_traffic_last_month" scope="col"><tmpl_var name="last_month_txt"></th>
- <th class="tbl_col_mail_traffic_this_year" scope="col"><tmpl_var name="this_year_txt"></th>
- <th class="tbl_col_mail_traffic_last_year" scope="col"><tmpl_var name="last_year_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="email_txt"></th>
+ <th><tmpl_var name="this_month_txt"></th>
+ <th><tmpl_var name="last_month_txt"></th>
+ <th><tmpl_var name="this_year_txt"></th>
+ <th><tmpl_var name="last_year_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
- <td class="tbl_col_this_month"></td>
- <td class="tbl_col_last_month"></td>
- <td class="tbl_col_this_year"></td>
- <td class="tbl_col_last_year"></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_user_stats.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><div class="col-sm-9"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></div></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>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_email"><a href="#" onclick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="email"}</a></td>
- <td class="tbl_col_this_month"><a href="#" onclick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="this_month"}</a></td>
- <td class="tbl_col_last_month"><a href="#" onclick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="last_month"}</a></td>
- <td class="tbl_col_this_year"><a href="#" onclick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="this_year"}</a></td>
- <td class="tbl_col_last_year"><a href="#" onclick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="last_year"}</a></td>
- <td class="tbl_col_buttons"></td>
+ <td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="email"}</a></td>
+ <td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="this_month"}</a></td>
+ <td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="last_month"}</a></td>
+ <td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="this_year"}</a></td>
+ <td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="last_year"}</a></td>
+ <td></td>
</tr>
</tmpl_loop>
<tmpl_unless name="records">
@@ -46,11 +47,10 @@
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+ <td colspan="6"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
</div>
+
+ </div>
diff --git a/interface/web/mail/templates/mail_whitelist_edit.htm b/interface/web/mail/templates/mail_whitelist_edit.htm
index d364349..da1d936 100644
--- a/interface/web/mail/templates/mail_whitelist_edit.htm
+++ b/interface/web/mail/templates/mail_whitelist_edit.htm
@@ -1,41 +1,38 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_mail_whitelist">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="server_id">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id" id="server_id" class="selectInput">
+
+ <div class="form-group">
+ <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
{tmpl_var name='server_id'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="source">{tmpl_var name='source_txt'}</label>
- <input name="source" id="source" value="{tmpl_var name='source'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="type">{tmpl_var name='type_txt'}</label>
- <select name="type" id="type" class="selectInput">
+ </div></div>
+ <div class="form-group">
+ <label for="source" class="col-sm-3 control-label">{tmpl_var name='source_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="source" id="source" value="{tmpl_var name='source'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="type" class="col-sm-3 control-label">{tmpl_var name='type_txt'}</label>
+ <div class="col-sm-9"><select name="type" id="type" class="form-control">
{tmpl_var name='type'}
</select>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input name="access" type="hidden" value="{tmpl_var name='access'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_whitelist_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('mail/mail_whitelist_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_whitelist_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_whitelist_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/mail/templates/mail_whitelist_list.htm b/interface/web/mail/templates/mail_whitelist_list.htm
index 882aa58..d7ab68e 100644
--- a/interface/web/mail/templates/mail_whitelist_list.htm
+++ b/interface/web/mail/templates/mail_whitelist_list.htm
@@ -1,48 +1,48 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_mail_whitelist">
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('mail/mail_whitelist_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="mail/mail_whitelist_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
- <th class="tbl_col_type" scope="col"><tmpl_var name="type_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="active_txt"></th>
+ <th><tmpl_var name="server_id_txt"></th>
+ <th><tmpl_var name="source_txt"></th>
+ <th><tmpl_var name="type_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_source"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></td>
- <td class="tbl_col_type"><select name="search_type">{tmpl_var name='search_type'}</select></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_whitelist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><select name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><div class="col-sm-9"><input type="text" name="search_source" value="{tmpl_var name='search_source'}" /></div></td>
+ <td><select name="search_type">{tmpl_var name='search_type'}</select></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_whitelist_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_source"><a href="#" onclick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="source"}</a></td>
- <td class="tbl_col_type"><a href="#" onclick="loadContent('mail/mail_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="type"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="mail/mail_whitelist_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
+ <td><a href="#" data-load-content="mail/mail_whitelist_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -54,11 +54,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+ <td colspan="5"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/mail/templates/spamfilter_blacklist_edit.htm b/interface/web/mail/templates/spamfilter_blacklist_edit.htm
index ae5b3ee..aff0b2e 100644
--- a/interface/web/mail/templates/spamfilter_blacklist_edit.htm
+++ b/interface/web/mail/templates/spamfilter_blacklist_edit.htm
@@ -1,49 +1,46 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_spamfilter_blacklist">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
+
<!--
- <div class="ctrlHolder">
- <label for="server_id">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id" id="server_id" class="selectInput">
+ <div class="form-group">
+ <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
{tmpl_var name='server_id'}
</select>
- </div>
+ </div></div>
-->
- <div class="ctrlHolder">
- <label for="rid">{tmpl_var name='rid_txt'}</label>
- <select name="rid" id="rid" class="selectInput">
+ <div class="form-group">
+ <label for="rid" class="col-sm-3 control-label">{tmpl_var name='rid_txt'}</label>
+ <div class="col-sm-9"><select name="rid" id="rid" class="form-control">
{tmpl_var name='rid'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="email">{tmpl_var name='email_txt'}</label>
- <input name="email" id="email" value="{tmpl_var name='email'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="priority">{tmpl_var name='priority_txt'}</label>
- <select name="priority" id="priority" class="selectInput formLengthHalf">
+ </div></div>
+ <div class="form-group">
+ <label for="email" class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="email" id="email" value="{tmpl_var name='email'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="priority" class="col-sm-3 control-label">{tmpl_var name='priority_txt'}</label>
+ <div class="col-sm-9"><select name="priority" id="priority" class="form-control">
{tmpl_var name='priority'}
</select>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input type="hidden" name="wb" value="{tmpl_var name='wb'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/spamfilter_blacklist_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('mail/spamfilter_blacklist_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/spamfilter_blacklist_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/spamfilter_blacklist_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/mail/templates/spamfilter_blacklist_list.htm b/interface/web/mail/templates/spamfilter_blacklist_list.htm
index 3407d4a..87cb73a 100644
--- a/interface/web/mail/templates/spamfilter_blacklist_list.htm
+++ b/interface/web/mail/templates/spamfilter_blacklist_list.htm
@@ -1,51 +1,51 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_spamfilter_blacklist">
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('mail/spamfilter_blacklist_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="mail/spamfilter_blacklist_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_priority" scope="col"><tmpl_var name="priority_txt"></th>
- <th class="tbl_col_rid" scope="col"><tmpl_var name="rid_txt"></th>
- <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="active_txt"></th>
+ <th><tmpl_var name="server_id_txt"></th>
+ <th><tmpl_var name="priority_txt"></th>
+ <th><tmpl_var name="rid_txt"></th>
+ <th><tmpl_var name="email_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_priority"><select name="search_priority">{tmpl_var name='search_priority'}</select></td>
- <td class="tbl_col_rid"><select name="search_rid">{tmpl_var name='search_rid'}</select></td>
- <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/spamfilter_blacklist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <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><div class="col-sm-9"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/spamfilter_blacklist_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_priority"><a href="#" onclick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="priority"}</a></td>
- <td class="tbl_col_rid"><a href="#" onclick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="rid"}</a></td>
- <td class="tbl_col_email"><a href="#" onclick="loadContent('mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="email"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
+ <td><a href="#" data-load-content="mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
+ <td><a href="#" data-load-content="mail/spamfilter_blacklist_edit.php?id={tmpl_var name='id'}">{tmpl_var name="priority"}</a></td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -57,11 +57,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+ <td colspan="6"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/mail/templates/spamfilter_config_getmail_edit.htm b/interface/web/mail/templates/spamfilter_config_getmail_edit.htm
index 4dd0710..a59f29b 100644
--- a/interface/web/mail/templates/spamfilter_config_getmail_edit.htm
+++ b/interface/web/mail/templates/spamfilter_config_getmail_edit.htm
@@ -1,22 +1,19 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_spamfilter_config">
- <div class="pnl_formsarea">
<fieldset id="wf_area_spamfilter_config">
<span class="wf_oneField">
- <label for="getmail_config_dir" class="wf_preField">{tmpl_var name='getmail_config_dir_txt'}</label>
- <input type="text" id="getmail_config_dir" name="getmail_config_dir" value="{tmpl_var name='getmail_config_dir'}" size="40" maxlength="255">
- </span>
+ <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></span>
</fieldset>
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<div class="wf_actions buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/spamfilter_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('mail/spamfilter_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/spamfilter_config_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/spamfilter_config_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div>
\ No newline at end of file
diff --git a/interface/web/mail/templates/spamfilter_config_list.htm b/interface/web/mail/templates/spamfilter_config_list.htm
index cd43b4d..64eef6c 100644
--- a/interface/web/mail/templates/spamfilter_config_list.htm
+++ b/interface/web/mail/templates/spamfilter_config_list.htm
@@ -1,39 +1,39 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_spamfilter_config">
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('mail/spamfilter_config_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="mail/spamfilter_config_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_server_name" scope="col"><tmpl_var name="server_name_txt"></th>
- <th class="tbl_col_buttons" scope="col"> </th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="server_name_txt"></th>
+ <th> </th>
</tr>
- <tr class="filter">
- <td class="tbl_col_server_name"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/spamfilter_config_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><div class="col-sm-9"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/spamfilter_config_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_server_name"><a href="#" onclick="loadContent('mail/spamfilter_config_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_name"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -45,11 +45,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="2"><tmpl_var name="paging"></td>
+ <td colspan="2"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/mail/templates/spamfilter_config_mail_edit.htm b/interface/web/mail/templates/spamfilter_config_mail_edit.htm
index 22f5b9f..e9d2756 100644
--- a/interface/web/mail/templates/spamfilter_config_mail_edit.htm
+++ b/interface/web/mail/templates/spamfilter_config_mail_edit.htm
@@ -1,66 +1,63 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_spamfilter_config">
- <div class="pnl_formsarea">
<fieldset id="wf_area_spamfilter_config">
<span class="wf_oneField">
- <label for="module" class="wf_preField">{tmpl_var name='module_txt'}</label>
+ <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>
</span>
<span class="wf_oneField">
- <label for="maildir_path" class="wf_preField">{tmpl_var name='maildir_path_txt'}</label>
- <input type="text" id="maildir_path" name="maildir_path" value="{tmpl_var name='maildir_path'}" size="40" maxlength="255">
- </span>
+ <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></span>
<span class="wf_oneField">
- <label for="homedir_path" class="wf_preField">{tmpl_var name='homedir_path_txt'}</label>
- <input type="text" id="homedir_path" name="homedir_path" value="{tmpl_var name='homedir_path'}" size="40" maxlength="255">
- </span>
+ <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></span>
<span class="wf_oneField">
- <label for="mailuser_uid" class="wf_preField">{tmpl_var name='mailuser_uid_txt'}</label>
- <input type="text" id="mailuser_uid" name="mailuser_uid" value="{tmpl_var name='mailuser_uid'}" size="10" maxlength="255">
- </span>
+ <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></span>
<span class="wf_oneField">
- <label for="mailuser_gid" class="wf_preField">{tmpl_var name='mailuser_gid_txt'}</label>
- <input type="text" id="mailuser_gid" name="mailuser_gid" value="{tmpl_var name='mailuser_gid'}" size="10" maxlength="255">
- </span>
+ <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></span>
<span class="wf_oneField">
- <label for="mailuser_name" class="wf_preField">{tmpl_var name='mailuser_name_txt'}</label>
- <input type="text" id="mailuser_name" name="mailuser_name" value="{tmpl_var name='mailuser_name'}" size="10" maxlength="255">
- </span>
+ <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></span>
<span class="wf_oneField">
- <label for="mailuser_group" class="wf_preField">{tmpl_var name='mailuser_group_txt'}</label>
- <input type="text" id="mailuser_group" name="mailuser_group" value="{tmpl_var name='mailuser_group'}" size="10" maxlength="255">
- </span>
+ <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></span>
<span class="wf_oneField">
- <label for="relayhost" class="wf_preField">{tmpl_var name='relayhost_txt'}</label>
- <input type="text" id="relayhost" name="relayhost" value="{tmpl_var name='relayhost'}" size="40" maxlength="255">
- </span>
+ <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></span>
<span class="wf_oneField">
- <label for="relayhost_user" class="wf_preField">{tmpl_var name='relayhost_user_txt'}</label>
- <input type="text" id="relayhost_user" name="relayhost_user" value="{tmpl_var name='relayhost_user'}" size="40" maxlength="255">
- </span>
+ <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></span>
<span class="wf_oneField">
- <label for="relayhost_password" class="wf_preField">{tmpl_var name='relayhost_password_txt'}</label>
- <input type="text" id="relayhost_password" name="relayhost_password" value="{tmpl_var name='relayhost_password'}" size="40" maxlength="255">
- </span>
+ <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></span>
<span class="wf_oneField">
- <label for="mailbox_size_limit" class="wf_preField">{tmpl_var name='mailbox_size_limit_txt'}</label>
- <input type="text" id="mailbox_size_limit" name="mailbox_size_limit" value="{tmpl_var name='mailbox_size_limit'}" size="10" maxlength="15">
- </span>
+ <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></span>
<span class="wf_oneField">
- <label for="message_size_limit" class="wf_preField">{tmpl_var name='message_size_limit_txt'}</label>
- <input type="text" id="message_size_limit" name="message_size_limit" value="{tmpl_var name='message_size_limit'}" size="10" maxlength="15">
- </span>
+ <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></span>
</fieldset>
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<div class="wf_actions buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/spamfilter_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('mail/spamfilter_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/spamfilter_config_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/spamfilter_config_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div>
\ No newline at end of file
diff --git a/interface/web/mail/templates/spamfilter_config_server_edit.htm b/interface/web/mail/templates/spamfilter_config_server_edit.htm
index e91d4a0..7420edd 100644
--- a/interface/web/mail/templates/spamfilter_config_server_edit.htm
+++ b/interface/web/mail/templates/spamfilter_config_server_edit.htm
@@ -1,38 +1,35 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_spamfilter_config">
- <div class="pnl_formsarea">
<fieldset id="wf_area_spamfilter_config">
<span class="wf_oneField">
- <label for="ip_address" class="wf_preField">{tmpl_var name='ip_address_txt'}</label>
- <input type="text" id="ip_address" name="ip_address" value="{tmpl_var name='ip_address'}" size="15" maxlength="255">
- </span>
+ <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></span>
<span class="wf_oneField">
- <label for="netmask" class="wf_preField">{tmpl_var name='netmask_txt'}</label>
- <input type="text" id="netmask" name="netmask" value="{tmpl_var name='netmask'}" size="15" maxlength="255">
- </span>
+ <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></span>
<span class="wf_oneField">
- <label for="gateway" class="wf_preField">{tmpl_var name='gateway_txt'}</label>
- <input type="text" id="gateway" name="gateway" value="{tmpl_var name='gateway'}" size="15" maxlength="255">
- </span>
+ <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></span>
<span class="wf_oneField">
- <label for="hostname" class="wf_preField">{tmpl_var name='hostname_txt'}</label>
- <input type="text" id="hostname" name="hostname" value="{tmpl_var name='hostname'}" size="40" maxlength="255">
- </span>
+ <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></span>
<span class="wf_oneField">
- <label for="nameservers" class="wf_preField">{tmpl_var name='nameservers_txt'}</label>
- <input type="text" id="nameservers" name="nameservers" value="{tmpl_var name='nameservers'}" size="40" maxlength="255">
- </span>
+ <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></span>
</fieldset>
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<div class="wf_actions buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/spamfilter_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('mail/spamfilter_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/spamfilter_config_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/spamfilter_config_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
</div>
- </div>
-
-</div>
diff --git a/interface/web/mail/templates/spamfilter_other_edit.htm b/interface/web/mail/templates/spamfilter_other_edit.htm
index a25a2e7..911e34d 100644
--- a/interface/web/mail/templates/spamfilter_other_edit.htm
+++ b/interface/web/mail/templates/spamfilter_other_edit.htm
@@ -1,80 +1,77 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_spamfilter_policy">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="addr_extension_virus">{tmpl_var name='addr_extension_virus_txt'}</label>
- <input name="addr_extension_virus" id="addr_extension_virus" value="{tmpl_var name='addr_extension_virus'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="addr_extension_spam">{tmpl_var name='addr_extension_spam_txt'}</label>
- <input name="addr_extension_spam" id="addr_extension_spam" value="{tmpl_var name='addr_extension_spam'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="addr_extension_banned">{tmpl_var name='addr_extension_banned_txt'}</label>
- <input name="addr_extension_banned" id="addr_extension_banned" value="{tmpl_var name='addr_extension_banned'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="addr_extension_bad_header">{tmpl_var name='addr_extension_bad_header_txt'}</label>
- <input name="addr_extension_bad_header" id="addr_extension_bad_header" value="{tmpl_var name='addr_extension_bad_header'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="warnvirusrecip">{tmpl_var name='warnvirusrecip_txt'}</label>
- <select name="warnvirusrecip" id="warnvirusrecip" class="selectInput formLengthBool">
+
+ <div class="form-group">
+ <label for="addr_extension_virus" class="col-sm-3 control-label">{tmpl_var name='addr_extension_virus_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="addr_extension_virus" id="addr_extension_virus" value="{tmpl_var name='addr_extension_virus'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="addr_extension_spam" class="col-sm-3 control-label">{tmpl_var name='addr_extension_spam_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="addr_extension_spam" id="addr_extension_spam" value="{tmpl_var name='addr_extension_spam'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="addr_extension_banned" class="col-sm-3 control-label">{tmpl_var name='addr_extension_banned_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="addr_extension_banned" id="addr_extension_banned" value="{tmpl_var name='addr_extension_banned'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="addr_extension_bad_header" class="col-sm-3 control-label">{tmpl_var name='addr_extension_bad_header_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="addr_extension_bad_header" id="addr_extension_bad_header" value="{tmpl_var name='addr_extension_bad_header'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="warnvirusrecip" class="col-sm-3 control-label">{tmpl_var name='warnvirusrecip_txt'}</label>
+ <div class="col-sm-9"><select name="warnvirusrecip" id="warnvirusrecip" class="form-control">
{tmpl_var name='warnvirusrecip'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="warnbannedrecip">{tmpl_var name='warnbannedrecip_txt'}</label>
- <select name="warnbannedrecip" id="warnbannedrecip" class="selectInput formLengthBool">
+ </div></div>
+ <div class="form-group">
+ <label for="warnbannedrecip" class="col-sm-3 control-label">{tmpl_var name='warnbannedrecip_txt'}</label>
+ <div class="col-sm-9"><select name="warnbannedrecip" id="warnbannedrecip" class="form-control">
{tmpl_var name='warnbannedrecip'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="warnbadhrecip">{tmpl_var name='warnbadhrecip_txt'}</label>
- <select name="warnbadhrecip" id="warnbadhrecip" class="selectInput formLengthBool">
+ </div></div>
+ <div class="form-group">
+ <label for="warnbadhrecip" class="col-sm-3 control-label">{tmpl_var name='warnbadhrecip_txt'}</label>
+ <div class="col-sm-9"><select name="warnbadhrecip" id="warnbadhrecip" class="form-control">
{tmpl_var name='warnbadhrecip'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="newvirus_admin">{tmpl_var name='newvirus_admin_txt'}</label>
- <input name="newvirus_admin" id="newvirus_admin" value="{tmpl_var name='newvirus_admin'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="virus_admin">{tmpl_var name='virus_admin_txt'}</label>
- <input name="virus_admin" id="virus_admin" value="{tmpl_var name='virus_admin'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="banned_admin">{tmpl_var name='banned_admin_txt'}</label>
- <input name="banned_admin" id="banned_admin" value="{tmpl_var name='banned_admin'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="bad_header_admin">{tmpl_var name='bad_header_admin_txt'}</label>
- <input name="bad_header_admin" id="bad_header_admin" value="{tmpl_var name='bad_header_admin'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="spam_admin">{tmpl_var name='spam_admin_txt'}</label>
- <input name="spam_admin" id="spam_admin" value="{tmpl_var name='spam_admin'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="message_size_limit">{tmpl_var name='message_size_limit_txt'}</label>
- <input name="message_size_limit" id="message_size_limit" value="{tmpl_var name='message_size_limit'}" size="10" maxlength="255" type="text" class="textInput formLengthLimit" /> Bytes
- </div>
- <div class="ctrlHolder">
- <label for="banned_rulenames">{tmpl_var name='banned_rulenames_txt'}</label>
- <input name="banned_rulenames" id="banned_rulenames" value="{tmpl_var name='banned_rulenames'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- </fieldset>
+ </div></div>
+ <div class="form-group">
+ <label for="newvirus_admin" class="col-sm-3 control-label">{tmpl_var name='newvirus_admin_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="newvirus_admin" id="newvirus_admin" value="{tmpl_var name='newvirus_admin'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="virus_admin" class="col-sm-3 control-label">{tmpl_var name='virus_admin_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="virus_admin" id="virus_admin" value="{tmpl_var name='virus_admin'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="banned_admin" class="col-sm-3 control-label">{tmpl_var name='banned_admin_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="banned_admin" id="banned_admin" value="{tmpl_var name='banned_admin'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="bad_header_admin" class="col-sm-3 control-label">{tmpl_var name='bad_header_admin_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="bad_header_admin" id="bad_header_admin" value="{tmpl_var name='bad_header_admin'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="spam_admin" class="col-sm-3 control-label">{tmpl_var name='spam_admin_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="spam_admin" id="spam_admin" value="{tmpl_var name='spam_admin'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <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" name="message_size_limit" id="message_size_limit" value="{tmpl_var name='message_size_limit'}" class="form-control" /> Bytes
+ </div></div>
+ <div class="form-group">
+ <label for="banned_rulenames" class="col-sm-3 control-label">{tmpl_var name='banned_rulenames_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="banned_rulenames" id="banned_rulenames" value="{tmpl_var name='banned_rulenames'}" class="form-control" />
+ </div></div>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/spamfilter_policy_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('mail/spamfilter_policy_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/spamfilter_policy_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/spamfilter_policy_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
diff --git a/interface/web/mail/templates/spamfilter_policy_edit.htm b/interface/web/mail/templates/spamfilter_policy_edit.htm
index 3ed6b83..e1698a0 100644
--- a/interface/web/mail/templates/spamfilter_policy_edit.htm
+++ b/interface/web/mail/templates/spamfilter_policy_edit.htm
@@ -1,64 +1,61 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_spamfilter_policy">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="policy_name">{tmpl_var name='policy_name_txt'}</label>
- <input name="policy_name" id="policy_name" value="{tmpl_var name='policy_name'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="virus_lover">{tmpl_var name='virus_lover_txt'}</label>
- <select name="virus_lover" id="virus_lover" class="selectInput formLengthBool">
+
+ <div class="form-group">
+ <label for="policy_name" class="col-sm-3 control-label">{tmpl_var name='policy_name_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="policy_name" id="policy_name" value="{tmpl_var name='policy_name'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="virus_lover" class="col-sm-3 control-label">{tmpl_var name='virus_lover_txt'}</label>
+ <div class="col-sm-9"><select name="virus_lover" id="virus_lover" class="form-control">
{tmpl_var name='virus_lover'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="spam_lover">{tmpl_var name='spam_lover_txt'}</label>
- <select name="spam_lover" id="spam_lover" class="selectInput formLengthBool">
+ </div></div>
+ <div class="form-group">
+ <label for="spam_lover" class="col-sm-3 control-label">{tmpl_var name='spam_lover_txt'}</label>
+ <div class="col-sm-9"><select name="spam_lover" id="spam_lover" class="form-control">
{tmpl_var name='spam_lover'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="banned_files_lover">{tmpl_var name='banned_files_lover_txt'}</label>
- <select name="banned_files_lover" id="banned_files_lover" class="selectInput formLengthBool">
+ </div></div>
+ <div class="form-group">
+ <label for="banned_files_lover" class="col-sm-3 control-label">{tmpl_var name='banned_files_lover_txt'}</label>
+ <div class="col-sm-9"><select name="banned_files_lover" id="banned_files_lover" class="form-control">
{tmpl_var name='banned_files_lover'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="bad_header_lover">{tmpl_var name='bad_header_lover_txt'}</label>
- <select name="bad_header_lover" id="bad_header_lover" class="selectInput formLengthBool">
+ </div></div>
+ <div class="form-group">
+ <label for="bad_header_lover" class="col-sm-3 control-label">{tmpl_var name='bad_header_lover_txt'}</label>
+ <div class="col-sm-9"><select name="bad_header_lover" id="bad_header_lover" class="form-control">
{tmpl_var name='bad_header_lover'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="bypass_virus_checks">{tmpl_var name='bypass_virus_checks_txt'}</label>
- <select name="bypass_virus_checks" id="bypass_virus_checks" class="selectInput formLengthBool">
+ </div></div>
+ <div class="form-group">
+ <label for="bypass_virus_checks" class="col-sm-3 control-label">{tmpl_var name='bypass_virus_checks_txt'}</label>
+ <div class="col-sm-9"><select name="bypass_virus_checks" id="bypass_virus_checks" class="form-control">
{tmpl_var name='bypass_virus_checks'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="bypass_banned_checks">{tmpl_var name='bypass_banned_checks_txt'}</label>
- <select name="bypass_banned_checks" id="bypass_banned_checks" class="selectInput formLengthBool">
+ </div></div>
+ <div class="form-group">
+ <label for="bypass_banned_checks" class="col-sm-3 control-label">{tmpl_var name='bypass_banned_checks_txt'}</label>
+ <div class="col-sm-9"><select name="bypass_banned_checks" id="bypass_banned_checks" class="form-control">
{tmpl_var name='bypass_banned_checks'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="bypass_header_checks">{tmpl_var name='bypass_header_checks_txt'}</label>
- <select name="bypass_header_checks" id="bypass_header_checks" class="selectInput formLengthBool">
+ </div></div>
+ <div class="form-group">
+ <label for="bypass_header_checks" class="col-sm-3 control-label">{tmpl_var name='bypass_header_checks_txt'}</label>
+ <div class="col-sm-9"><select name="bypass_header_checks" id="bypass_header_checks" class="form-control">
{tmpl_var name='bypass_header_checks'}
</select>
- </div>
- </fieldset>
+ </div></div>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/spamfilter_policy_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('mail/spamfilter_policy_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/spamfilter_policy_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/spamfilter_policy_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/mail/templates/spamfilter_policy_list.htm b/interface/web/mail/templates/spamfilter_policy_list.htm
index 269c514..c7443b3 100644
--- a/interface/web/mail/templates/spamfilter_policy_list.htm
+++ b/interface/web/mail/templates/spamfilter_policy_list.htm
@@ -1,51 +1,51 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_spamfilter_policy">
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('mail/spamfilter_policy_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="mail/spamfilter_policy_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_policy_name" scope="col"><tmpl_var name="policy_name_txt"></th>
- <th class="tbl_col_virus_lover" scope="col"><tmpl_var name="virus_lover_txt"></th>
- <th class="tbl_col_spam_lover" scope="col"><tmpl_var name="spam_lover_txt"></th>
- <th class="tbl_col_banned_files_lover" scope="col"><tmpl_var name="banned_files_lover_txt"></th>
- <th class="tbl_col_bad_header_lover" scope="col"><tmpl_var name="bad_header_lover_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="policy_name_txt"></th>
+ <th><tmpl_var name="virus_lover_txt"></th>
+ <th><tmpl_var name="spam_lover_txt"></th>
+ <th><tmpl_var name="banned_files_lover_txt"></th>
+ <th><tmpl_var name="bad_header_lover_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_policy_name"><input type="text" name="search_policy_name" value="{tmpl_var name='search_policy_name'}" /></td>
- <td class="tbl_col_virus_lover"><select name="search_virus_lover">{tmpl_var name='search_virus_lover'}</select></td>
- <td class="tbl_col_spam_lover"><select name="search_spam_lover">{tmpl_var name='search_spam_lover'}</select></td>
- <td class="tbl_col_banned_files_lover"><select name="search_banned_files_lover">{tmpl_var name='search_banned_files_lover'}</select></td>
- <td class="tbl_col_bad_header_lover"><select name="search_bad_header_lover">{tmpl_var name='search_bad_header_lover'}</select></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/spamfilter_policy_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><div class="col-sm-9"><input type="text" name="search_policy_name" value="{tmpl_var name='search_policy_name'}" /></div></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>
+ <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>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_policy_name"><a href="#" onclick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="policy_name"}</a></td>
- <td class="tbl_col_virus_lover"><a href="#" onclick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="virus_lover"}</a></td>
- <td class="tbl_col_spam_lover"><a href="#" onclick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="spam_lover"}</a></td>
- <td class="tbl_col_banned_files_lover"><a href="#" onclick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="banned_files_lover"}</a></td>
- <td class="tbl_col_bad_header_lover"><a href="#" onclick="loadContent('mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="bad_header_lover"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}">{tmpl_var name="policy_name"}</a></td>
+ <td><a href="#" data-load-content="mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}">{tmpl_var name="virus_lover"}</a></td>
+ <td><a href="#" data-load-content="mail/spamfilter_policy_edit.php?id={tmpl_var name='id'}">{tmpl_var name="spam_lover"}</a></td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -58,11 +58,10 @@
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+ <td colspan="6"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/mail/templates/spamfilter_quarantine_edit.htm b/interface/web/mail/templates/spamfilter_quarantine_edit.htm
index 4a38d7f..053e94b 100644
--- a/interface/web/mail/templates/spamfilter_quarantine_edit.htm
+++ b/interface/web/mail/templates/spamfilter_quarantine_edit.htm
@@ -1,44 +1,41 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_spamfilter_policy">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="virus_quarantine_to">{tmpl_var name='virus_quarantine_to_txt'}</label>
- <input name="virus_quarantine_to" id="virus_quarantine_to" value="{tmpl_var name='virus_quarantine_to'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="spam_quarantine_to">{tmpl_var name='spam_quarantine_to_txt'}</label>
- <input name="spam_quarantine_to" id="spam_quarantine_to" value="{tmpl_var name='spam_quarantine_to'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="banned_quarantine_to">{tmpl_var name='banned_quarantine_to_txt'}</label>
- <input name="banned_quarantine_to" id="banned_quarantine_to" value="{tmpl_var name='banned_quarantine_to'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="bad_header_quarantine_to">{tmpl_var name='bad_header_quarantine_to_txt'}</label>
- <input name="bad_header_quarantine_to" id="bad_header_quarantine_to" value="{tmpl_var name='bad_header_quarantine_to'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
+
+ <div class="form-group">
+ <label for="virus_quarantine_to" class="col-sm-3 control-label">{tmpl_var name='virus_quarantine_to_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="virus_quarantine_to" id="virus_quarantine_to" value="{tmpl_var name='virus_quarantine_to'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="spam_quarantine_to" class="col-sm-3 control-label">{tmpl_var name='spam_quarantine_to_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="spam_quarantine_to" id="spam_quarantine_to" value="{tmpl_var name='spam_quarantine_to'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="banned_quarantine_to" class="col-sm-3 control-label">{tmpl_var name='banned_quarantine_to_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="banned_quarantine_to" id="banned_quarantine_to" value="{tmpl_var name='banned_quarantine_to'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="bad_header_quarantine_to" class="col-sm-3 control-label">{tmpl_var name='bad_header_quarantine_to_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="bad_header_quarantine_to" id="bad_header_quarantine_to" value="{tmpl_var name='bad_header_quarantine_to'}" class="form-control" />
+ </div></div>
<!--
- <div class="ctrlHolder">
- <label for="clean_quarantine_to">{tmpl_var name='clean_quarantine_to_txt'}</label>
- <input name="clean_quarantine_to" id="clean_quarantine_to" value="{tmpl_var name='clean_quarantine_to'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="other_quarantine_to">{tmpl_var name='other_quarantine_to_txt'}</label>
- <input name="other_quarantine_to" id="other_quarantine_to" value="{tmpl_var name='other_quarantine_to'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
+ <div class="form-group">
+ <label for="clean_quarantine_to" class="col-sm-3 control-label">{tmpl_var name='clean_quarantine_to_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="clean_quarantine_to" id="clean_quarantine_to" value="{tmpl_var name='clean_quarantine_to'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="other_quarantine_to" class="col-sm-3 control-label">{tmpl_var name='other_quarantine_to_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="other_quarantine_to" id="other_quarantine_to" value="{tmpl_var name='other_quarantine_to'}" class="form-control" />
+ </div></div>
-->
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/spamfilter_policy_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('mail/spamfilter_policy_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/spamfilter_policy_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/spamfilter_policy_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/mail/templates/spamfilter_taglevel_edit.htm b/interface/web/mail/templates/spamfilter_taglevel_edit.htm
index 059ab15..c9d27aa 100644
--- a/interface/web/mail/templates/spamfilter_taglevel_edit.htm
+++ b/interface/web/mail/templates/spamfilter_taglevel_edit.htm
@@ -1,52 +1,49 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_spamfilter_policy">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="spam_tag_level">{tmpl_var name='spam_tag_level_txt'}</label>
- <input name="spam_tag_level" id="spam_tag_level" value="{tmpl_var name='spam_tag_level'}" size="10" maxlength="255" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="spam_tag2_level">{tmpl_var name='spam_tag2_level_txt'}</label>
- <input name="spam_tag2_level" id="spam_tag2_level" value="{tmpl_var name='spam_tag2_level'}" size="10" maxlength="255" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="spam_kill_level">{tmpl_var name='spam_kill_level_txt'}</label>
- <input name="spam_kill_level" id="spam_kill_level" value="{tmpl_var name='spam_kill_level'}" size="10" maxlength="255" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="spam_dsn_cutoff_level">{tmpl_var name='spam_dsn_cutoff_level_txt'}</label>
- <input name="spam_dsn_cutoff_level" id="spam_dsn_cutoff_level" value="{tmpl_var name='spam_dsn_cutoff_level'}" size="10" maxlength="255" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="spam_quarantine_cutoff_level">{tmpl_var name='spam_quarantine_cutoff_level_txt'}</label>
- <input name="spam_quarantine_cutoff_level" id="spam_quarantine_cutoff_level" value="{tmpl_var name='spam_quarantine_cutoff_level'}" size="10" maxlength="255" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <label for="spam_modifies_subj">{tmpl_var name='spam_modifies_subj_txt'}</label>
- <select name="spam_modifies_subj" id="spam_modifies_subj" class="selectInput formLengthBool">
+
+ <div class="form-group">
+ <label for="spam_tag_level" class="col-sm-3 control-label">{tmpl_var name='spam_tag_level_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="spam_tag_level" id="spam_tag_level" value="{tmpl_var name='spam_tag_level'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="spam_tag2_level" class="col-sm-3 control-label">{tmpl_var name='spam_tag2_level_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="spam_tag2_level" id="spam_tag2_level" value="{tmpl_var name='spam_tag2_level'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="spam_kill_level" class="col-sm-3 control-label">{tmpl_var name='spam_kill_level_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="spam_kill_level" id="spam_kill_level" value="{tmpl_var name='spam_kill_level'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="spam_dsn_cutoff_level" class="col-sm-3 control-label">{tmpl_var name='spam_dsn_cutoff_level_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="spam_dsn_cutoff_level" id="spam_dsn_cutoff_level" value="{tmpl_var name='spam_dsn_cutoff_level'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="spam_quarantine_cutoff_level" class="col-sm-3 control-label">{tmpl_var name='spam_quarantine_cutoff_level_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="spam_quarantine_cutoff_level" id="spam_quarantine_cutoff_level" value="{tmpl_var name='spam_quarantine_cutoff_level'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="spam_modifies_subj" class="col-sm-3 control-label">{tmpl_var name='spam_modifies_subj_txt'}</label>
+ <div class="col-sm-9"><select name="spam_modifies_subj" id="spam_modifies_subj" class="form-control">
{tmpl_var name='spam_modifies_subj'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="spam_subject_tag">{tmpl_var name='spam_subject_tag_txt'}</label>
- <input name="spam_subject_tag" id="spam_subject_tag" value="{tmpl_var name='spam_subject_tag'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="spam_subject_tag2">{tmpl_var name='spam_subject_tag2_txt'}</label>
- <input name="spam_subject_tag2" id="spam_subject_tag2" value="{tmpl_var name='spam_subject_tag2'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- </fieldset>
+ </div></div>
+ <div class="form-group">
+ <label for="spam_subject_tag" class="col-sm-3 control-label">{tmpl_var name='spam_subject_tag_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="spam_subject_tag" id="spam_subject_tag" value="{tmpl_var name='spam_subject_tag'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="spam_subject_tag2" class="col-sm-3 control-label">{tmpl_var name='spam_subject_tag2_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="spam_subject_tag2" id="spam_subject_tag2" value="{tmpl_var name='spam_subject_tag2'}" class="form-control" />
+ </div></div>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/spamfilter_policy_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('mail/spamfilter_policy_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/spamfilter_policy_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/spamfilter_policy_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/mail/templates/spamfilter_users_edit.htm b/interface/web/mail/templates/spamfilter_users_edit.htm
index 52e5945..15847ae 100644
--- a/interface/web/mail/templates/spamfilter_users_edit.htm
+++ b/interface/web/mail/templates/spamfilter_users_edit.htm
@@ -1,50 +1,47 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_spamfilter_users">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="server_id">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id" id="server_id" class="selectInput">
+
+ <div class="form-group">
+ <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
{tmpl_var name='server_id'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="priority">{tmpl_var name='priority_txt'}</label>
- <select name="priority" id="priority" class="selectInput formLengthLimit">
+ </div></div>
+ <div class="form-group">
+ <label for="priority" class="col-sm-3 control-label">{tmpl_var name='priority_txt'}</label>
+ <div class="col-sm-9"><select name="priority" id="priority" class="form-control">
{tmpl_var name='priority'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="policy_id">{tmpl_var name='policy_id_txt'}</label>
- <select name="policy_id" id="policy_id" class="selectInput">
+ </div></div>
+ <div class="form-group">
+ <label for="policy_id" class="col-sm-3 control-label">{tmpl_var name='policy_id_txt'}</label>
+ <div class="col-sm-9"><select name="policy_id" id="policy_id" class="form-control">
{tmpl_var name='policy_id'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="email">{tmpl_var name='email_txt'}</label>
- <input name="email" id="email" value="{tmpl_var name='email'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="fullname">{tmpl_var name='fullname_txt'}</label>
- <input name="fullname" id="fullname" value="{tmpl_var name='fullname'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="local">{tmpl_var name='local_txt'}</label>
- <select name="local" id="local" class="selectInput formLengthBool">
+ </div></div>
+ <div class="form-group">
+ <label for="email" class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="email" id="email" value="{tmpl_var name='email'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="fullname" class="col-sm-3 control-label">{tmpl_var name='fullname_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="fullname" id="fullname" value="{tmpl_var name='fullname'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="local" class="col-sm-3 control-label">{tmpl_var name='local_txt'}</label>
+ <div class="col-sm-9"><select name="local" id="local" class="form-control">
{tmpl_var name='local'}
</select>
- </div>
- </fieldset>
+ </div></div>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/spamfilter_users_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('mail/spamfilter_users_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/spamfilter_users_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/spamfilter_users_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/mail/templates/spamfilter_users_list.htm b/interface/web/mail/templates/spamfilter_users_list.htm
index 34b4b2d..d62d9c0 100644
--- a/interface/web/mail/templates/spamfilter_users_list.htm
+++ b/interface/web/mail/templates/spamfilter_users_list.htm
@@ -1,51 +1,51 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_spamfilter_users">
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('mail/spamfilter_users_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="mail/spamfilter_users_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_local" scope="col"><tmpl_var name="local_txt"></th>
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_priority" scope="col"><tmpl_var name="priority_txt"></th>
- <th class="tbl_col_policy_id" scope="col"><tmpl_var name="policy_id_txt"></th>
- <th class="tbl_col_fullname" scope="col"><tmpl_var name="fullname_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="local_txt"></th>
+ <th><tmpl_var name="server_id_txt"></th>
+ <th><tmpl_var name="priority_txt"></th>
+ <th><tmpl_var name="policy_id_txt"></th>
+ <th><tmpl_var name="fullname_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_local"><select name="search_local">{tmpl_var name='search_local'}</select></td>
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_priority"><select name="search_priority">{tmpl_var name='search_priority'}</select></td>
- <td class="tbl_col_policy_id"><select name="search_policy_id">{tmpl_var name='search_policy_id'}</select></td>
- <td class="tbl_col_fullname"><input type="text" name="search_fullname" value="{tmpl_var name='search_fullname'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/spamfilter_users_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <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><div class="col-sm-9"><input type="text" name="search_fullname" value="{tmpl_var name='search_fullname'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/spamfilter_users_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_local"><a href="#" onclick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="local"}</a></td>
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_priority"><a href="#" onclick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="priority"}</a></td>
- <td class="tbl_col_policy_id"><a href="#" onclick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="policy_id"}</a></td>
- <td class="tbl_col_fullname"><a href="#" onclick="loadContent('mail/spamfilter_users_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="fullname"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="mail/spamfilter_users_edit.php?id={tmpl_var name='id'}">{tmpl_var name="local"}</a></td>
+ <td><a href="#" data-load-content="mail/spamfilter_users_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
+ <td><a href="#" data-load-content="mail/spamfilter_users_edit.php?id={tmpl_var name='id'}">{tmpl_var name="priority"}</a></td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -57,11 +57,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+ <td colspan="6"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/mail/templates/spamfilter_whitelist_edit.htm b/interface/web/mail/templates/spamfilter_whitelist_edit.htm
index efb7018..beb7525 100644
--- a/interface/web/mail/templates/spamfilter_whitelist_edit.htm
+++ b/interface/web/mail/templates/spamfilter_whitelist_edit.htm
@@ -1,49 +1,46 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_spamfilter_whitelist">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
+
<!--
- <div class="ctrlHolder">
- <label for="server_id">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id" id="server_id" class="selectInput">
+ <div class="form-group">
+ <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
{tmpl_var name='server_id'}
</select>
- </div>
+ </div></div>
-->
- <div class="ctrlHolder">
- <label for="rid">{tmpl_var name='rid_txt'}</label>
- <select name="rid" id="rid" class="selectInput">
+ <div class="form-group">
+ <label for="rid" class="col-sm-3 control-label">{tmpl_var name='rid_txt'}</label>
+ <div class="col-sm-9"><select name="rid" id="rid" class="form-control">
{tmpl_var name='rid'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="email">{tmpl_var name='email_txt'}</label>
- <input name="email" id="email" value="{tmpl_var name='email'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="priority">{tmpl_var name='priority_txt'}</label>
- <select name="priority" id="priority" class="selectInput formLengthHalf">
+ </div></div>
+ <div class="form-group">
+ <label for="email" class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="email" id="email" value="{tmpl_var name='email'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="priority" class="col-sm-3 control-label">{tmpl_var name='priority_txt'}</label>
+ <div class="col-sm-9"><select name="priority" id="priority" class="form-control">
{tmpl_var name='priority'}
</select>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input type="hidden" name="wb" value="{tmpl_var name='wb'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/spamfilter_whitelist_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('mail/spamfilter_whitelist_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/spamfilter_whitelist_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/spamfilter_whitelist_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/mail/templates/spamfilter_whitelist_list.htm b/interface/web/mail/templates/spamfilter_whitelist_list.htm
index ea4d724..1d6af87 100644
--- a/interface/web/mail/templates/spamfilter_whitelist_list.htm
+++ b/interface/web/mail/templates/spamfilter_whitelist_list.htm
@@ -1,51 +1,51 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_spamfilter_whitelist">
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('mail/spamfilter_whitelist_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="mail/spamfilter_whitelist_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_priority" scope="col"><tmpl_var name="priority_txt"></th>
- <th class="tbl_col_rid" scope="col"><tmpl_var name="rid_txt"></th>
- <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="active_txt"></th>
+ <th><tmpl_var name="server_id_txt"></th>
+ <th><tmpl_var name="priority_txt"></th>
+ <th><tmpl_var name="rid_txt"></th>
+ <th><tmpl_var name="email_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_priority"><select name="search_priority">{tmpl_var name='search_priority'}</select></td>
- <td class="tbl_col_rid"><select name="search_rid">{tmpl_var name='search_rid'}</select></td>
- <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/spamfilter_whitelist_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <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><div class="col-sm-9"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/spamfilter_whitelist_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_priority"><a href="#" onclick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="priority"}</a></td>
- <td class="tbl_col_rid"><a href="#" onclick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="rid"}</a></td>
- <td class="tbl_col_email"><a href="#" onclick="loadContent('mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="email"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
+ <td><a href="#" data-load-content="mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
+ <td><a href="#" data-load-content="mail/spamfilter_whitelist_edit.php?id={tmpl_var name='id'}">{tmpl_var name="priority"}</a></td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -58,11 +58,10 @@
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+ <td colspan="6"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/mail/templates/user_quota_stats_list.htm b/interface/web/mail/templates/user_quota_stats_list.htm
index e700557..e01f571 100644
--- a/interface/web/mail/templates/user_quota_stats_list.htm
+++ b/interface/web/mail/templates/user_quota_stats_list.htm
@@ -1,39 +1,40 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
-<div class="panel panel_list_user_quota_stats">
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
- <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
- <th class="tbl_col_used_sort" scope="col"><tmpl_var name="used_txt"></th>
- <th class="tbl_col_quota" scope="col"><tmpl_var name="quota_txt"></th>
- <th class="tbl_col_percentage_sort" scope="col"><tmpl_var name="percentage_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="email_txt"></th>
+ <th><tmpl_var name="name_txt"></th>
+ <th><tmpl_var name="used_txt"></th>
+ <th><tmpl_var name="quota_txt"></th>
+ <th><tmpl_var name="percentage_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
- <td class="tbl_col_name"><input type="text" name="search_system_user" value="{tmpl_var name='search_name'}" /></td>
- <td class="tbl_col_used"> </td>
- <td class="tbl_col_quota"> </td>
- <td class="tbl_col_percentage"> </td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/user_quota_stats.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><div class="col-sm-9"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_system_user" value="{tmpl_var name='search_name'}" /></div></td>
+ <td> </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>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_email"><a href="#" onclick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="email"}</a></td>
- <td class="tbl_col_name"><a href="#" onclick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td>
- <td class="tbl_col_used"><a href="#" onclick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="used"}</a></td>
- <td class="tbl_col_quota"><a href="#" onclick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="quota"}</a></td>
- <td class="tbl_col_percentage"><a href="#" onclick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="percentage"}</a></td>
- <td class="tbl_col_buttons"></td>
+ <td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="email"}</a></td>
+ <td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="name"}</a></td>
+ <td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="used"}</a></td>
+ <td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="quota"}</a></td>
+ <td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="percentage"}</a></td>
+ <td></td>
</tr>
</tmpl_loop>
<tmpl_unless name="records">
@@ -44,11 +45,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+ <td colspan="6"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
</div>
+
+ </div>
diff --git a/interface/web/mailuser/templates/index.htm b/interface/web/mailuser/templates/index.htm
index c320253..e9ac8ad 100644
--- a/interface/web/mailuser/templates/index.htm
+++ b/interface/web/mailuser/templates/index.htm
@@ -1,34 +1,36 @@
-<h2><tmpl_var name="page_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="page_head_txt"></h1>
+</div>
<p><tmpl_var name="page_desc_txt"></p>
<div class="panel panel_mailuser">
<div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='email_txt'}</p>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
<p class="value">{tmpl_var name='email'}</p>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='login_txt'}</p>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='login_txt'}</label>
<p class="value">{tmpl_var name='login'}</p>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='server_address_txt'}</p>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='server_address_txt'}</label>
<p class="value">{tmpl_var name='server_name'}</p>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='quota_txt'}</p>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='quota_txt'}</label>
<p class="value">{tmpl_var name='quota'}</p>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='cc_txt'}</p>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='cc_txt'}</label>
<p class="value">{tmpl_var name='cc'}</p>
</div>
- <div class="buttonHolder buttons">
+ <div class="clear"><div class="right">
- </div>
- </fieldset>
+ </div></div>
+
</div>
</div>
\ No newline at end of file
diff --git a/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm b/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm
index 34b7f0d..bb4ebc7 100644
--- a/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm
+++ b/interface/web/mailuser/templates/mail_user_autoresponder_edit.htm
@@ -1,37 +1,34 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_mailuser_autoresponder">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="autoresponder_subject">{tmpl_var name='autoresponder_subject_txt'}</label>
- <input type="text" name="autoresponder_subject" id="autoresponder_subject" maxlength='250' value="{tmpl_var name='autoresponder_subject'}" />
- </div>
- <div class="ctrlHolder">
- <label for="autoresponder_text">{tmpl_var name='autoresponder_text_txt'}</label>
+
+
+ <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></div>
+ <div class="form-group">
+ <label for="autoresponder_text" class="col-sm-3 control-label">{tmpl_var name='autoresponder_text_txt'}</label>
<textarea name="autoresponder_text" id="autoresponder_text" rows='15' cols='30'>{tmpl_var name='autoresponder_text'}</textarea>
</div>
- <div class="ctrlHolder">
- <label for="autoresponder">{tmpl_var name='autoresponder_active'}</label>
- <input type="checkbox" value="y" id="autoresponder" name="autoresponder" onclick="AR_ResetDates();" {tmpl_var name='ar_active'} />
- </div>
- <div class="ctrlHolder">
- <label for="autoresponder_start_date">{tmpl_var name='autoresponder_start_date_txt'}</label>
+ <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></div>
+ <div class="form-group">
+ <label for="autoresponder_start_date" class="col-sm-3 control-label">{tmpl_var name='autoresponder_start_date_txt'}</label>
{tmpl_var name='autoresponder_start_date'}
<a href="javascript:AR_SetNow();">{tmpl_var name='now_txt'}</a>
</div>
- <div class="ctrlHolder">
- <label for="autoresponder_end_date">{tmpl_var name='autoresponder_end_date_txt'}</label>
+ <div class="form-group">
+ <label for="autoresponder_end_date" class="col-sm-3 control-label">{tmpl_var name='autoresponder_end_date_txt'}</label>
{tmpl_var name='autoresponder_end_date'}
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mailuser/mail_user_autoresponder_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('mailuser/index.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mailuser/mail_user_autoresponder_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mailuser/index.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/mailuser/templates/mail_user_cc_edit.htm b/interface/web/mailuser/templates/mail_user_cc_edit.htm
index 3b82c46..0ba06e8 100644
--- a/interface/web/mailuser/templates/mail_user_cc_edit.htm
+++ b/interface/web/mailuser/templates/mail_user_cc_edit.htm
@@ -1,26 +1,23 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_mailuser_cc">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='email_txt'}</p>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
<p class="value">{tmpl_var name='email'}</p>
</div>
- <div class="ctrlHolder">
- <label for="name">{tmpl_var name='cc_txt'}</label>
- <input name="cc" id="cc" value="{tmpl_var name='cc'}" size="30" maxlength="255" type="text" class="textInput" /> {tmpl_var name='name_optional_txt'} {tmpl_var name='cc_note_txt'}
- </div>
- </fieldset>
+ <div class="form-group">
+ <label for="name" class="col-sm-3 control-label">{tmpl_var name='cc_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="cc" id="cc" value="{tmpl_var name='cc'}" class="form-control" /> {tmpl_var name='name_optional_txt'} {tmpl_var name='cc_note_txt'}
+ </div></div>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mailuser/mail_user_cc_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('mailuser/index.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mailuser/mail_user_cc_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mailuser/index.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/mailuser/templates/mail_user_filter_edit.htm b/interface/web/mailuser/templates/mail_user_filter_edit.htm
index 3205677..2004c2c 100644
--- a/interface/web/mailuser/templates/mail_user_filter_edit.htm
+++ b/interface/web/mailuser/templates/mail_user_filter_edit.htm
@@ -1,38 +1,35 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_mailuser_filter">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="rulename" class="wf_preField">{tmpl_var name='rulename_txt'}</label>
- <input type="text" id="rulename" name="rulename" value="{tmpl_var name='rulename'}" size="30" maxlength="255" class="textInput">
- </div>
- <div class="ctrlHolder">
- <label for="source" class="wf_preField">{tmpl_var name='source_txt'}</label>
+
+ <div class="form-group">
+ <label for="rulename" class="col-sm-3 control-label">{tmpl_var name='rulename_txt'}</label>
+ <div class="col-sm-9"><input type="text" id="rulename" name="rulename" value="{tmpl_var name='rulename'}" class="form-control">
+ </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>
- <input type="text" id="searchterm" name="searchterm" value="{tmpl_var name='searchterm'}" size="30" maxlength="255" class="textInput">
- </div>
- <div class="ctrlHolder">
- <label for="action" class="wf_preField">{tmpl_var name='action_txt'}</label>
+ <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>
- <input type="text" id="target" name="target" value="{tmpl_var name='target'}" size="30" maxlength="255" class="textInput formLengthHalf">
- </div>
- <div class="ctrlHolder">
- <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>
+ <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">
+ <label for="active" class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
<span class="">{tmpl_var name='active'}</span>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input name="mailuser_id" type="hidden" value="{tmpl_var name='mailuser_id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mailuser/mail_user_filter_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('mailuser/mail_user_filter_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mailuser/mail_user_filter_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mailuser/mail_user_filter_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/mailuser/templates/mail_user_filter_list.htm b/interface/web/mailuser/templates/mail_user_filter_list.htm
index 0725183..69d5a6c 100644
--- a/interface/web/mailuser/templates/mail_user_filter_list.htm
+++ b/interface/web/mailuser/templates/mail_user_filter_list.htm
@@ -1,38 +1,38 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
-<div class="panel panel_list_mailuser_filter">
-
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('mailuser/mail_user_filter_edit.php');">
+
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="mailuser/mail_user_filter_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_rulename" scope="col"><tmpl_var name="rulename_txt"></th>
- <th class="tbl_col_buttons" scope="col"> </th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="rulename_txt"></th>
+ <th> </th>
</tr>
- <tr class="filter">
- <td class="tbl_col_rulename"><input type="text" name="search_rulename" value="{tmpl_var name='search_rulename'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_user_edit.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><div class="col-sm-9"><input type="text" name="search_rulename" value="{tmpl_var name='search_rulename'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','mail/mail_user_edit.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_rulename"><a href="#" onclick="loadContent('mailuser/mail_user_filter_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="rulename"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -45,11 +45,10 @@
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+ <td colspan="3"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/mailuser/templates/mail_user_password_edit.htm b/interface/web/mailuser/templates/mail_user_password_edit.htm
index b28d3a3..48c5a3e 100644
--- a/interface/web/mailuser/templates/mail_user_password_edit.htm
+++ b/interface/web/mailuser/templates/mail_user_password_edit.htm
@@ -1,37 +1,34 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_mailuser_password">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='email_txt'}</p>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
<p class="value">{tmpl_var name='email'}</p>
</div>
- <div class="ctrlHolder">
- <label for="password">{tmpl_var name='password_txt'}</label>
+ <div class="form-group">
+ <label for="password" class="col-sm-3 control-label">{tmpl_var name='password_txt'}</label>
<input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" /> <a href="javascript:void(0);" onclick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='password_strength_txt'}</p>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='password_strength_txt'}</label>
<div id="passBar"></div>
<p class="formHint"><span id="passText"> </span></p>
</div>
- <div class="ctrlHolder">
- <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+ <div class="form-group">
+ <label for="repeat_password" class="col-sm-3 control-label">{tmpl_var name='repeat_password_txt'}</label>
<input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;" autocomplete="off" onkeyup="checkPassMatch('password','repeat_password');" />
</div>
<div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
<div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mailuser/mail_user_password_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('mailuser/index.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mailuser/mail_user_password_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mailuser/index.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/mailuser/templates/mail_user_spamfilter_edit.htm b/interface/web/mailuser/templates/mail_user_spamfilter_edit.htm
index 4fdc5f8..39e8670 100644
--- a/interface/web/mailuser/templates/mail_user_spamfilter_edit.htm
+++ b/interface/web/mailuser/templates/mail_user_spamfilter_edit.htm
@@ -1,28 +1,25 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_mailuser_spamfilter">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='email_txt'}</p>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='email_txt'}</label>
<p class="value">{tmpl_var name='email'}</p>
</div>
- <div class="ctrlHolder">
- <label for="policy">{tmpl_var name='policy_txt'}</label>
- <select name="policy" id="policy" class="selectInput">
+ <div class="form-group">
+ <label for="policy" class="col-sm-3 control-label">{tmpl_var name='policy_txt'}</label>
+ <div class="col-sm-9"><select name="policy" id="policy" class="form-control">
{tmpl_var name='policy'}
</select>
- </div>
- </fieldset>
+ </div></div>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mailuser/mail_user_spamfilter_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('mailuser/index.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mailuser/mail_user_spamfilter_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mailuser/index.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/monitor/templates/datalog_list.htm b/interface/web/monitor/templates/datalog_list.htm
index 480aa94..2f4e186 100644
--- a/interface/web/monitor/templates/datalog_list.htm
+++ b/interface/web/monitor/templates/datalog_list.htm
@@ -1,38 +1,39 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_datalog">
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_tstamp" scope="col"><tmpl_var name="tstamp_txt"></th>
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_action" scope="col"><tmpl_var name="action_txt"></th>
- <th class="tbl_col_dbtable" scope="col"><tmpl_var name="dbtable_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="tstamp_txt"></th>
+ <th><tmpl_var name="server_id_txt"></th>
+ <th><tmpl_var name="action_txt"></th>
+ <th><tmpl_var name="dbtable_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_tstamp"> </td>
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_action"><select name="search_action">{tmpl_var name='search_action'}</select></td>
- <td class="tbl_col_dbtable"><input type="text" name="search_dbtable" value="{tmpl_var name='search_dbtable'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','monitor/datalog_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <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><div class="col-sm-9"><input type="text" name="search_dbtable" value="{tmpl_var name='search_dbtable'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','monitor/datalog_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_tstamp">{tmpl_var name="tstamp"}</td>
- <td class="tbl_col_server_id">{tmpl_var name="server_id"}</td>
- <td class="tbl_col_action">{tmpl_var name="action"}</td>
- <td class="tbl_col_dbtable">{tmpl_var name="dbtable"}</td>
- <td class="tbl_col_buttons">
- <!--<a class="button icons16 icoDelete" href="javascript: del_record('monitor/datalog_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a> -->
+ <td>{tmpl_var name="tstamp"}</td>
+ <td>{tmpl_var name="server_id"}</td>
+ <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> -->
</td>
</tr>
</tmpl_loop>
@@ -44,11 +45,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+ <td colspan="5"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+ </div>
\ No newline at end of file
diff --git a/interface/web/monitor/templates/show_data.htm b/interface/web/monitor/templates/show_data.htm
index 818208d..9e2cd9a 100644
--- a/interface/web/monitor/templates/show_data.htm
+++ b/interface/web/monitor/templates/show_data.htm
@@ -1,12 +1,14 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
<div class="panel panel_system">
<div class="pnl_formarea">
- <fieldset><legend><tmpl_var name="monTransDate"><tmpl_var name="time"></legend>
+ <p><tmpl_var name="monTransDate"><tmpl_var name="time"></p>
<div class="systemmonitor"><tmpl_var name="output"></div>
- </fieldset>
+
</div>
</div>
\ No newline at end of file
diff --git a/interface/web/monitor/templates/show_log.htm b/interface/web/monitor/templates/show_log.htm
index 271d46b..befb5eb 100644
--- a/interface/web/monitor/templates/show_log.htm
+++ b/interface/web/monitor/templates/show_log.htm
@@ -1,25 +1,23 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_logview">
- <div class="pnl_toolsarea">
- <fieldset class="inlineLabels"><legend><tmpl_var name="monTransRefreshsq"></legend>
- <div class="buttons">
- <div class="ctrlHolder">
- <label for="refreshinterval">{tmpl_var name='refreshinterval_txt'}</label>
- <select name="refreshinterval" id="refreshinterval" class="selectInput" onChange="loadContentRefresh('monitor/show_log.php?log={tmpl_var name="log_id"}')">
+ <legend><tmpl_var name="monTransRefreshsq"></legend>
+
+ <div class="form-group">
+ <label for="refreshinterval" class="col-sm-3 control-label">{tmpl_var name='refreshinterval_txt'}</label>
+ <div class="col-sm-9"><select name="refreshinterval" id="refreshinterval" class="form-control" onChange="loadContentRefresh('monitor/show_log.php?log={tmpl_var name="log_id"}')">
{tmpl_var name='refresh'}
</select>
- </div>
+
</div>
- </fieldset>
+
</div>
<div class="pnl_formarea">
- <fieldset><legend><tmpl_var name="monTransDate"><tmpl_var name="time"></legend>
+ <p><tmpl_var name="monTransDate"><tmpl_var name="time"></p>
<div class="codeview"><tmpl_var name="log_data"></div>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+
+ </div>
\ No newline at end of file
diff --git a/interface/web/monitor/templates/show_monit.htm b/interface/web/monitor/templates/show_monit.htm
index 27265bd..5053458 100644
--- a/interface/web/monitor/templates/show_monit.htm
+++ b/interface/web/monitor/templates/show_monit.htm
@@ -1,4 +1,6 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
<div class="panel panel_system">
diff --git a/interface/web/monitor/templates/show_munin.htm b/interface/web/monitor/templates/show_munin.htm
index 86d33f1..3119413 100644
--- a/interface/web/monitor/templates/show_munin.htm
+++ b/interface/web/monitor/templates/show_munin.htm
@@ -1,4 +1,6 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
<div class="panel panel_system">
diff --git a/interface/web/monitor/templates/show_sys_state.htm b/interface/web/monitor/templates/show_sys_state.htm
index ceb4195..262425c 100644
--- a/interface/web/monitor/templates/show_sys_state.htm
+++ b/interface/web/monitor/templates/show_sys_state.htm
@@ -1,25 +1,23 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_sys_state">
- <div class="pnl_toolsarea">
- <fieldset class="inlineLabels"><legend><tmpl_var name="monTransRefreshsq"></legend>
- <div class="buttons">
- <div class="ctrlHolder">
- <label for="refreshinterval"> </label>
- <select name="refreshinterval" id="refreshinterval" class="selectInput withicons" onChange="loadContentRefresh('monitor/show_sys_state.php?state={tmpl_var name="state_type"}')">
+ <legend><tmpl_var name="monTransRefreshsq"></legend>
+
+ <div class="form-group">
+ <label for="refreshinterval" class="col-sm-3 control-label"> </label>
+ <div class="col-sm-9"><select name="refreshinterval" id="refreshinterval" class="form-control" onChange="loadContentRefresh('monitor/show_sys_state.php?state={tmpl_var name="state_type"}')">
{tmpl_var name='refresh'}
</select>
- </div>
+
</div>
- </fieldset>
+
</div>
<div class="pnl_formarea">
- <fieldset><legend></legend>
+ <p></p>
<div class="stateview"><tmpl_var name="state_data"></div>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+
+ </div>
\ No newline at end of file
diff --git a/interface/web/monitor/templates/syslog_list.htm b/interface/web/monitor/templates/syslog_list.htm
index a14f68d..2458d14 100644
--- a/interface/web/monitor/templates/syslog_list.htm
+++ b/interface/web/monitor/templates/syslog_list.htm
@@ -1,42 +1,43 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_syslog">
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_tstamp" scope="col"><tmpl_var name="tstamp_txt"></th>
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_loglevel" scope="col"><tmpl_var name="loglevel_txt"></th>
- <th class="tbl_col_message" scope="col"><tmpl_var name="message_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="tstamp_txt"></th>
+ <th><tmpl_var name="server_id_txt"></th>
+ <th><tmpl_var name="loglevel_txt"></th>
+ <th><tmpl_var name="message_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_tstamp"> </td>
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_loglevel"><select name="search_loglevel">{tmpl_var name='search_loglevel'}</select></td>
- <td class="tbl_col_message"><input type="text" name="search_message" value="{tmpl_var name='search_message'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','monitor/log_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <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><div class="col-sm-9"><input type="text" name="search_message" value="{tmpl_var name='search_message'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','monitor/log_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_tstamp">{tmpl_var name="tstamp"}</td>
- <td class="tbl_col_server_id">{tmpl_var name="server_id"}</td>
- <td class="tbl_col_loglevel">{tmpl_var name="loglevel"}</td>
- <td class="tbl_col_message">{tmpl_var name="message"}</td>
- <td class="tbl_col_buttons">
+ <td>{tmpl_var name="tstamp"}</td>
+ <td>{tmpl_var name="server_id"}</td>
+ <td>{tmpl_var name="loglevel"}</td>
+ <td>{tmpl_var name="message"}</td>
+ <td>
<tmpl_if name="loglevel" op="==" value="Error">
- <a class="button icons16 icoDelete" href="javascript: del_record('monitor/log_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+ <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>
</tmpl_if>
<tmpl_if name="loglevel" op="==" value="Warning">
- <a class="button icons16 icoDelete" href="javascript: del_record('monitor/log_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+ <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>
</tmpl_if>
</td>
</tr>
@@ -49,11 +50,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+ <td colspan="5"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+ </div>
\ No newline at end of file
diff --git a/interface/web/sites/templates/aps_install_package.htm b/interface/web/sites/templates/aps_install_package.htm
index c911ced..8ccfee1 100644
--- a/interface/web/sites/templates/aps_install_package.htm
+++ b/interface/web/sites/templates/aps_install_package.htm
@@ -11,28 +11,26 @@
<div id="errorMsg"><h3>ERROR</h3><ol>{tmpl_var name='error'}</ol></div>
</tmpl_if>
-<div class="panel panel_install_package">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
+
+
<legend>{tmpl_var name='basic_settings_txt'}</legend>
- <div class="ctrlHolder">
- <label for="main_domain">{tmpl_var name='install_location_txt'}</label>
+ <div class="form-group">
+ <label for="main_domain" class="col-sm-3 control-label">{tmpl_var name='install_location_txt'}</label>
<div class="resetButton">http(s):// </div>DOMAIN_LIST_SPACE<div style="float:left;"> / </div>
- <input type="text" name="main_location" id="main_location" value="{tmpl_var name='inp_main_location'}" maxlength="255" class="textInput formLengthHalf" />
- </div>
+ <div class="col-sm-9"><input type="text" name="main_location" id="main_location" value="{tmpl_var name='inp_main_location'}" class="form-control" />
+ </div></div>
<tmpl_if name='pkg_requirements_database' op='!=' value=''>
- <div class="ctrlHolder">
- <label for="main_database_password">{tmpl_var name='new_database_password_txt'}</label>
- <input type="text" class="textInput" name="main_database_password" id="main_database_password" value="{tmpl_var name='inp_main_database_password'}" size="10" maxlength="255" />
- </div>
+ <div class="form-group">
+ <label for="main_database_password" class="col-sm-3 control-label">{tmpl_var name='new_database_password_txt'}</label>
+ <div class="col-sm-9"><input type="text" class="form-control" name="main_database_password" id="main_database_password" value="{tmpl_var name='inp_main_database_password'}" />
+ </div></div>
</tmpl_if>
PKG_SETTINGS_SPACE
<legend>{tmpl_var name='license_txt'}</legend>
- <div class="ctrlHolder">
- <label for="license">{tmpl_var name='license_txt'}</label>
+ <div class="form-group">
+ <label for="license" class="col-sm-3 control-label">{tmpl_var name='license_txt'}</label>
<tmpl_if name='pkg_license_content' op='==' value=''>{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>
@@ -40,17 +38,14 @@
<textarea rows="10" cols="80" id="license_text">{tmpl_var name='pkg_license_content'}</textarea>
</tmpl_if>
</div>
- <div class="ctrlHolder">
- <label for="license">{tmpl_var name='acceptance_txt'}</label>
- <input type="checkbox" name="license" id="license" <tmpl_if name='inp_license' op='==' value='true'>checked</tmpl_if> /> {tmpl_var name='acceptance_text'}
+ <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>
- </fieldset>
+
<input type="hidden" name="install" value="0" />
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_install_txt'}" name="btn_install" onclick="document.pageForm.install.value=1; submitForm('pageForm','sites/aps_install_package.php?id={tmpl_var name='pkg_id'}');"><span>{tmpl_var name='btn_install_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/aps_availablepackages_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_install_txt'}" name="btn_install" onclick="document.pageForm.install.value=1; submitForm('pageForm','sites/aps_install_package.php?id={tmpl_var name='pkg_id'}');">{tmpl_var name='btn_install_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="sites/aps_availablepackages_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
diff --git a/interface/web/sites/templates/aps_instances_list.htm b/interface/web/sites/templates/aps_instances_list.htm
index 2d9c50f..bb65999 100644
--- a/interface/web/sites/templates/aps_instances_list.htm
+++ b/interface/web/sites/templates/aps_instances_list.htm
@@ -1,50 +1,49 @@
<h2>{tmpl_var name="list_head_txt"}</h2>
-<div class="panel panel_list_instances">
-
- <div class="pnl_listarea">
- <fieldset><legend>{tmpl_var name="list_head_txt"}</legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_name" scope="col">{tmpl_var name='name_txt'}</th>
- <th class="tbl_col_version" scope="col">{tmpl_var name='version_txt'}</th>
+
+ <p>{tmpl_var name="list_head_txt"}</p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th>{tmpl_var name='name_txt'}</th>
+ <th>{tmpl_var name='version_txt'}</th>
<tmpl_if name='is_noclient'>
- <!--<th class="tbl_col_customer" scope="col">{tmpl_var name='customer_txt'}</th>-->
+ <!--<th>{tmpl_var name='customer_txt'}</th>-->
</tmpl_if>
- <th class="tbl_col_installlocation" scope="col">{tmpl_var name='install_location_txt'}</th>
- <th class="tbl_col_instancestatus" scope="col">{tmpl_var name='status_txt'}</th>
- <th class="tbl_col_limit" scope="col" > </th>
+ <th>{tmpl_var name='install_location_txt'}</th>
+ <th>{tmpl_var name='status_txt'}</th>
+ <th > </th>
</tr>
- <tr class="filter">
- <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
- <td class="tbl_col_version"><input type="text" name="search_version" value="{tmpl_var name='search_version'}" /></td>
+ <tr>
+ <td><div class="col-sm-9"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_version" value="{tmpl_var name='search_version'}" /></div></td>
<tmpl_if name='is_noclient'>
- <!--<td class="tbl_col_customer"><input type="text" name="search_customer_name" value="{tmpl_var name='search_customer_name'}" /></td>-->
+ <!--<td><div class="col-sm-9"><input type="text" name="search_customer_name" value="{tmpl_var name='search_customer_name'}" /></div></td>-->
</tmpl_if>
- <td class="tbl_col_installlocation"> </td>
- <td class="tbl_col_instancestatus"><select name="search_instance_status" onChange="submitForm('pageForm','sites/aps_installedpackages_list.php');">{tmpl_var name='search_instance_status'}</select></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name='filter_txt'}" onclick="submitForm('pageForm','sites/aps_installedpackages_list.php');"><span>{tmpl_var name='filter_txt'}</span></button>
+ <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>
+ <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>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name='records'>
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_name"><a href="#" onclick="loadContent('sites/aps_packagedetails_show.php?id={tmpl_var name='package_id'}');">{tmpl_var name='package_name'}</a></td>
- <td class="tbl_col_version">{tmpl_var name='package_version'}-{tmpl_var name='package_release'}</td>
+ <td><a href="#" data-load-content="sites/aps_packagedetails_show.php?id={tmpl_var name='package_id'}">{tmpl_var name='package_name'}</a></td>
+ <td>{tmpl_var name='package_version'}-{tmpl_var name='package_release'}</td>
<tmpl_if name='is_noclient'>
- <!--<td class="tbl_col_customer"><a href="#" onclick="loadContent('sites/aps_packagedetails_show.php?id={tmpl_var name='package_id'}');">{tmpl_var name='customer_name'}</a></td>-->
+ <!--<td><a href="#" data-load-content="sites/aps_packagedetails_show.php?id={tmpl_var name='package_id'}">{tmpl_var name='customer_name'}</a></td>-->
</tmpl_if>
- <td class="tbl_col_installlocation"><a href="http://{tmpl_var name='install_location'}" target="_blank">{tmpl_var name='install_location_short'}</a></td>
- <td class="tbl_col_instancestatus"><span id="status_content{tmpl_var name='__ROWNUM__'}">{tmpl_var name='instance_status'}</span></td>
- <td class="tbl_col_buttons">
+ <td><a href="http://{tmpl_var name='install_location'}" target="_blank">{tmpl_var name='install_location_short'}</a></td>
+ <td><span id="status_content{tmpl_var name='__ROWNUM__'}">{tmpl_var name='instance_status'}</span></td>
+ <td>
<tmpl_if name='delete_possible'>
- <a class="button icons16 icoDelete" href="javascript: del_record('sites/aps_do_operation.php?action=delete_instance&id={tmpl_var name='id'}','{tmpl_var name='pkg_delete_confirmation'}')"><span>{tmpl_var name='delete_txt'}</span></a>
+ <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>
</tmpl_if>
<tmpl_if name='reinstall_possible'>
- <a class="button icons16 icoEdit" href="javascript: del_record('sites/aps_do_operation.php?action=reinstall_instance&id={tmpl_var name='id'}','{tmpl_var name='pkg_reinstall_confirmation'}')"><span>{tmpl_var name='reinstall_txt'}</span></a>
+ <a class="btn btn-default formbutton-default" href="javascript: del_record('sites/aps_do_operation.php?action=reinstall_instance&id={tmpl_var name='id'}','{tmpl_var name='pkg_reinstall_confirmation'}')">{tmpl_var name='reinstall_txt'}</button>
</tmpl_if>
</td>
</tr>
@@ -52,11 +51,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="6">{tmpl_var name='paging'}</td>
+ <td colspan="6">{tmpl_var name='paging'}</td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+ </div>
\ No newline at end of file
diff --git a/interface/web/sites/templates/aps_packagedetails_show.htm b/interface/web/sites/templates/aps_packagedetails_show.htm
index 5456a89..9e50565 100644
--- a/interface/web/sites/templates/aps_packagedetails_show.htm
+++ b/interface/web/sites/templates/aps_packagedetails_show.htm
@@ -9,13 +9,12 @@
<div class="pnl_toolsarea">
<fieldset>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/aps_install_package.php?id={tmpl_var name='pkg_id'}');">
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="sites/aps_install_package.php?id={tmpl_var name='pkg_id'}">
<span>{tmpl_var name="install_package_txt"}</span>
</button>
- </div>
+
</fieldset>
-</div>
<p> </p><p> </p>
@@ -42,41 +41,42 @@
<div class="panel panel_list_packages">
- <div class="pnl_listarea">
- <table class="list">
+
+ <div class="table-wrapper marginTop15">
+<table class="table">
<tbody>
<tmpl_if name='next_tab' op='==' value='details'>
- <tr class="tbl_row_uneven">
+ <tr>
<td width="25%">{tmpl_var name='version_txt'}</td>
<td>{tmpl_var name='pkg_version'} (Release {tmpl_var name='pkg_release'})</td>
</tr>
- <tr class="tbl_row_even">
+ <tr>
<td>{tmpl_var name='category_txt'}</td>
<td>{tmpl_var name='pkg_category'}</td>
</tr>
- <tr class="tbl_row_uneven">
+ <tr>
<td>{tmpl_var name='description_txt'}</td>
<td>{tmpl_var name='pkg_description'}</td>
</tr>
- <tr class="tbl_row_even">
+ <tr>
<td>{tmpl_var name='homepage_txt'}</td>
<td>
<a href="{tmpl_var name='pkg_homepage'}" target="_blank">{tmpl_var name='pkg_homepage'}</a>
</td>
</tr>
- <tr class="tbl_row_uneven">
+ <tr>
<td>{tmpl_var name='installed_size_txt'}</td>
<td>{tmpl_var name='pkg_installed_size'}</td>
</tr>
- <tr class="tbl_row_even">
+ <tr>
<td>{tmpl_var name='supported_languages_txt'}</td>
<td>{tmpl_var name='pkg_languages'}</td>
</tr>
- <tr class="tbl_row_uneven">
+ <tr>
<td>{tmpl_var name='config_script_txt'}</td>
<td>{tmpl_var name='pkg_config_script'}</td>
</tr>
- <tr class="tbl_row_even">
+ <tr>
<td>{tmpl_var name='license_txt'}</td>
<td>
<tmpl_if name='pkg_license_name'>{tmpl_var name='pkg_license_name'}<br /></tmpl_if>
@@ -88,7 +88,7 @@
</tr>
<tmpl_elseif name='next_tab' op='==' value='screenshots'>
<tmpl_if name='pkg_screenshots'>
- <tr class="tbl_row_even">
+ <tr>
<td style="text-align:center;">
<tmpl_loop name='pkg_screenshots'>
<img src="{tmpl_var name='ScreenPath'}" alt="{tmpl_var name='ScreenDescription'}" /><br />
@@ -99,7 +99,7 @@
</tmpl_if>
<tmpl_elseif name='next_tab' op='==' value='changelog'>
<tmpl_if name='pkg_changelog'>
- <tr class="tbl_row_even">
+ <tr>
<td>
<ul>
<tmpl_loop name='pkg_changelog'>
@@ -115,27 +115,27 @@
</tr>
</tmpl_if>
<tmpl_elseif name='next_tab' op='==' value='settings'>
- <tr class="tbl_row_uneven">
+ <tr>
<td width="25%">{tmpl_var name='php_extensions_txt'}</td>
<td>{tmpl_var name='pkg_requirements_php_extensions'}</td>
</tr>
- <tr class="tbl_row_even">
+ <tr>
<td>{tmpl_var name='php_settings_txt'}</td>
<td>
<tmpl_loop name='pkg_requirements_php_settings'>{tmpl_var name='PHPSettingName'} = {tmpl_var name='PHPSettingValue'}<br /></tmpl_loop>
</td>
</tr>
- <tr class="tbl_row_uneven">
+ <tr>
<td>{tmpl_var name='supported_php_versions_txt'}</td>
<td>{tmpl_var name='pkg_requirements_supported_php_versions'}</td>
</tr>
- <tr class="tbl_row_even">
+ <tr>
<td>{tmpl_var name='database_txt'}</td>
<td>{tmpl_var name='pkg_requirements_database'}</a></td>
</tr>
</tmpl_if>
</tbody>
</table>
+</div>
</div>
-</div>
\ No newline at end of file
diff --git a/interface/web/sites/templates/aps_packages_list.htm b/interface/web/sites/templates/aps_packages_list.htm
index 1042e71..26f65d1 100644
--- a/interface/web/sites/templates/aps_packages_list.htm
+++ b/interface/web/sites/templates/aps_packages_list.htm
@@ -1,40 +1,39 @@
<h2>{tmpl_var name="list_head_txt"}</h2>
-<div class="panel panel_list_packages">
-
- <div class="pnl_listarea">
- <fieldset><legend>{tmpl_var name="list_head_txt"} ({tmpl_var name='package_count'})</legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_name" scope="col">{tmpl_var name='name_txt'}</th>
- <th class="tbl_col_version" scope="col">{tmpl_var name='version_txt'}</th>
- <th class="tbl_col_category" scope="col">{tmpl_var name='category_txt'}</th>
+
+ <p>{tmpl_var name="list_head_txt"} ({tmpl_var name='package_count'})</p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th>{tmpl_var name='name_txt'}</th>
+ <th>{tmpl_var name='version_txt'}</th>
+ <th>{tmpl_var name='category_txt'}</th>
<tmpl_if name='is_admin'>
- <th class="tbl_col_package_status" scope="col">{tmpl_var name='status_txt'}</th>
+ <th>{tmpl_var name='status_txt'}</th>
</tmpl_if>
- <th class="tbl_col_limit" scope="col"> </th>
+ <th> </th>
</tr>
- <tr class="filter">
- <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td>
- <td class="tbl_col_version"><input type="text" name="search_version" value="{tmpl_var name='search_version'}" /></td>
- <td class="tbl_col_customerid"><select name="search_category" onChange="submitForm('pageForm','sites/aps_availablepackages_list.php');">{tmpl_var name='search_category'}</select></td>
+ <tr>
+ <td><div class="col-sm-9"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_version" value="{tmpl_var name='search_version'}" /></div></td>
+ <td><select name="search_category" onChange="submitForm('pageForm','sites/aps_availablepackages_list.php');">{tmpl_var name='search_category'}</select></td>
<tmpl_if name='is_admin'>
- <td class="tbl_col_status"><select name="search_package_status" onChange="submitForm('pageForm','sites/aps_availablepackages_list.php');">{tmpl_var name='search_package_status'}</select></td>
+ <td><select name="search_package_status" onChange="submitForm('pageForm','sites/aps_availablepackages_list.php');">{tmpl_var name='search_package_status'}</select></td>
</tmpl_if>
- <td class="tbl_col_buttons"><button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name='filter_txt'}" onclick="submitForm('pageForm','sites/aps_availablepackages_list.php');"><span>{tmpl_var name='filter_txt'}</span></button></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_availablepackages_list.php');">{tmpl_var name='filter_txt'}</button></td>
</tr>
</thead>
<tbody>
<tmpl_loop name='records'>
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_name"><a href="#" onclick="loadContent('sites/aps_packagedetails_show.php?id={tmpl_var name='id'}');">{tmpl_var name='name'}</a></td>
- <td class="tbl_col_version">{tmpl_var name='version'}-{tmpl_var name='release'}</td>
- <td class="tbl_col_category">{tmpl_var name='category'}</td>
+ <td><a href="#" data-load-content="sites/aps_packagedetails_show.php?id={tmpl_var name='id'}">{tmpl_var name='name'}</a></td>
+ <td>{tmpl_var name='version'}-{tmpl_var name='release'}</td>
+ <td>{tmpl_var name='category'}</td>
<tmpl_if name='is_admin'>
- <td class="tbl_col_status"><a href="javascript:loadContentInto('status_content{tmpl_var name='__ROWNUM__'}', 'sites/aps_do_operation.php?action=change_status&id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');"><span id="status_content{tmpl_var name='__ROWNUM__'}">{tmpl_var name='package_status'}</span></a></td>
+ <td><a href="javascript:loadContentInto('status_content{tmpl_var name='__ROWNUM__'}', 'sites/aps_do_operation.php?action=change_status&id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}');"><span id="status_content{tmpl_var name='__ROWNUM__'}">{tmpl_var name='package_status'}</span></a></td>
</tmpl_if>
- <td class="tbl_col_buttons"> </td>
+ <td> </td>
</tr>
</tmpl_loop>
<tmpl_unless name="records">
@@ -45,11 +44,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="5">{tmpl_var name='paging'}</td>
+ <td colspan="5">{tmpl_var name='paging'}</td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+ </div>
\ No newline at end of file
diff --git a/interface/web/sites/templates/aps_update_packagelist.htm b/interface/web/sites/templates/aps_update_packagelist.htm
index bd8edfd..b366386 100644
--- a/interface/web/sites/templates/aps_update_packagelist.htm
+++ b/interface/web/sites/templates/aps_update_packagelist.htm
@@ -1,20 +1,12 @@
-<h2><tmpl_var name="head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_language_import">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>{tmpl_var name="legend_txt"}</legend>
+
+ <legend>{tmpl_var name="legend_txt"}</legend>
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="Update Packagelist" onClick="loadContent('sites/aps_cron_apscrawler_if.php')"><span>{tmpl_var name="btn_start_txt"}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="Cancel" onClick="loadContent('sites/aps_availablepackages_list.php');"><span>{tmpl_var name="btn_cancel_txt"}</span></button>
- </div>
- </fieldset>
-
-
-
-
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="Update Packagelist" onClick="loadContent('sites/aps_cron_apscrawler_if.php')">{tmpl_var name="btn_start_txt"}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="Cancel" data-load-content="sites/aps_availablepackages_list.php"><span>{tmpl_var name="btn_cancel_txt"}</span></button>
+ </div></div>
diff --git a/interface/web/sites/templates/cron_edit.htm b/interface/web/sites/templates/cron_edit.htm
index 20b1922..a27e163 100644
--- a/interface/web/sites/templates/cron_edit.htm
+++ b/interface/web/sites/templates/cron_edit.htm
@@ -1,74 +1,71 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_cron">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>Cron Job</legend>
- <div class="ctrlHolder">
+ <legend>Cron Job</legend>
+ <div class="form-group">
<tmpl_if name="edit_disabled">
- <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
- <select name="parent_domain_id" id="parent_domain_id" class="selectInput" disabled="disabled">
+ <label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='parent_domain_id_txt'}</label>
+ <div class="col-sm-9"><select name="parent_domain_id" id="parent_domain_id" class="form-control" disabled="disabled">
{tmpl_var name='parent_domain_id'}
</select>
- <input type="hidden" name="parent_domain_id" value="{tmpl_var name='parent_domain_id_value'}" />
+ </div><input type="hidden" name="parent_domain_id" value="{tmpl_var name='parent_domain_id_value'}" />
<tmpl_else>
- <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
- <select name="parent_domain_id" id="parent_domain_id" class="selectInput">
+ <label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='parent_domain_id_txt'}</label>
+ <div class="col-sm-9"><select name="parent_domain_id" id="parent_domain_id" class="form-control">
{tmpl_var name='parent_domain_id'}
</select>
- </tmpl_if>
+ </div></tmpl_if>
</div>
- <div class="ctrlHolder">
- <label for="run_min">{tmpl_var name='run_min_txt'}</label>
- <input name="run_min" id="run_min" value="{tmpl_var name='run_min'}" size="10" maxlength="255" type="text" class="textInput" />
- <p class="formHint">e.g. *, */3, 10-20</p>
+ <div class="form-group">
+ <label for="run_min" class="col-sm-3 control-label">{tmpl_var name='run_min_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="run_min" id="run_min" value="{tmpl_var name='run_min'}" class="form-control" />
+ </div><p class="formHint">e.g. *, */3, 10-20</p>
</div>
- <div class="ctrlHolder">
- <label for="run_hour">{tmpl_var name='run_hour_txt'}</label>
- <input name="run_hour" id="run_hour" value="{tmpl_var name='run_hour'}" size="10" maxlength="255" type="text" class="textInput" />
- <p class="formHint">e.g. *, */2, 0, 10-12</p>
+ <div class="form-group">
+ <label for="run_hour" class="col-sm-3 control-label">{tmpl_var name='run_hour_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="run_hour" id="run_hour" value="{tmpl_var name='run_hour'}" class="form-control" />
+ </div><p class="formHint">e.g. *, */2, 0, 10-12</p>
</div>
- <div class="ctrlHolder">
- <label for="run_mday">{tmpl_var name='run_mday_txt'}</label>
- <input name="run_mday" id="run_mday" value="{tmpl_var name='run_mday'}" size="10" maxlength="255" type="text" class="textInput" />
- <p class="formHint">e.g. *, */4, 1-5</p>
+ <div class="form-group">
+ <label for="run_mday" class="col-sm-3 control-label">{tmpl_var name='run_mday_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="run_mday" id="run_mday" value="{tmpl_var name='run_mday'}" class="form-control" />
+ </div><p class="formHint">e.g. *, */4, 1-5</p>
</div>
- <div class="ctrlHolder">
- <label for="run_month">{tmpl_var name='run_month_txt'}</label>
- <input name="run_month" id="run_month" value="{tmpl_var name='run_month'}" size="10" maxlength="255" type="text" class="textInput" />
- <p class="formHint">e.g. *, 1-6</p>
+ <div class="form-group">
+ <label for="run_month" class="col-sm-3 control-label">{tmpl_var name='run_month_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="run_month" id="run_month" value="{tmpl_var name='run_month'}" class="form-control" />
+ </div><p class="formHint">e.g. *, 1-6</p>
</div>
- <div class="ctrlHolder">
- <label for="run_wday">{tmpl_var name='run_wday_txt'}</label>
- <input name="run_wday" id="run_wday" value="{tmpl_var name='run_wday'}" size="10" maxlength="255" type="text" class="textInput" />
- <p class="formHint">e.g. *, 0, 1-5</p>
+ <div class="form-group">
+ <label for="run_wday" class="col-sm-3 control-label">{tmpl_var name='run_wday_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="run_wday" id="run_wday" value="{tmpl_var name='run_wday'}" class="form-control" />
+ </div><p class="formHint">e.g. *, 0, 1-5</p>
</div>
- <div class="ctrlHolder">
- <label for="command">{tmpl_var name='command_txt'}</label>
- <input name="command" id="command" value="{tmpl_var name='command'}" size="30" maxlength="255" type="text" class="textInput" />
- <p class="formHint">{tmpl_var name='command_hint_txt'}</p>
+ <div class="form-group">
+ <label for="command" class="col-sm-3 control-label">{tmpl_var name='command_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="command" id="command" value="{tmpl_var name='command'}" class="form-control" />
+ </div><p class="formHint">{tmpl_var name='command_hint_txt'}</p>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='log_output_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='log_output_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='log'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/cron_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/cron_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/cron_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="sites/cron_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/sites/templates/cron_list.htm b/interface/web/sites/templates/cron_list.htm
index 42d04e3..8b5b462 100644
--- a/interface/web/sites/templates/cron_list.htm
+++ b/interface/web/sites/templates/cron_list.htm
@@ -1,64 +1,64 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_cron">
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/cron_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="sites/cron_edit.php">
<span>{tmpl_var name="add_new_cron_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
- <th class="tbl_col_run_min" scope="col"><tmpl_var name="run_min_txt"></th>
- <th class="tbl_col_run_hour" scope="col"><tmpl_var name="run_hour_txt"></th>
- <th class="tbl_col_run_mday" scope="col"><tmpl_var name="run_mday_txt"></th>
- <th class="tbl_col_run_month" scope="col"><tmpl_var name="run_month_txt"></th>
- <th class="tbl_col_run_wday" scope="col"><tmpl_var name="run_wday_txt"></th>
- <th class="tbl_col_command" scope="col"><tmpl_var name="command_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="active_txt"></th>
+ <th><tmpl_var name="server_id_txt"></th>
+ <th><tmpl_var name="parent_domain_id_txt"></th>
+ <th><tmpl_var name="run_min_txt"></th>
+ <th><tmpl_var name="run_hour_txt"></th>
+ <th><tmpl_var name="run_mday_txt"></th>
+ <th><tmpl_var name="run_month_txt"></th>
+ <th><tmpl_var name="run_wday_txt"></th>
+ <th><tmpl_var name="command_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
- <td class="tbl_col_run_min"><input type="text" name="search_run_min" size="1" value="{tmpl_var name='search_run_min'}" /></td>
- <td class="tbl_col_run_hour"><input type="text" name="search_run_hour" size="1" value="{tmpl_var name='search_run_hour'}" /></td>
- <td class="tbl_col_run_mday"><input type="text" name="search_run_mday" size="1" value="{tmpl_var name='search_run_mday'}" /></td>
- <td class="tbl_col_run_month"><input type="text" name="search_run_month" size="1" value="{tmpl_var name='search_run_month'}" /></td>
- <td class="tbl_col_run_wday"><input type="text" name="search_run_wday" size="1" value="{tmpl_var name='search_run_wday'}" /></td>
- <td class="tbl_col_command"><input type="text" name="search_command" value="{tmpl_var name='search_command'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/cron_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <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><div class="col-sm-9"><input type="text" name="search_run_min" value="{tmpl_var name='search_run_min'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_run_hour" value="{tmpl_var name='search_run_hour'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_run_mday" value="{tmpl_var name='search_run_mday'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_run_month" value="{tmpl_var name='search_run_month'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_run_wday" value="{tmpl_var name='search_run_wday'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_command" value="{tmpl_var name='search_command'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/cron_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_parent_domain_id"><a href="#" onclick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
- <td class="tbl_col_run_min"><a href="#" onclick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="run_min"}</a></td>
- <td class="tbl_col_run_hour"><a href="#" onclick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="run_hour"}</a></td>
- <td class="tbl_col_run_mday"><a href="#" onclick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="run_mday"}</a></td>
- <td class="tbl_col_run_month"><a href="#" onclick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="run_month"}</a></td>
- <td class="tbl_col_run_wday"><a href="#" onclick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="run_wday"}</a></td>
- <td class="tbl_col_commnd"><a href="#" onclick="loadContent('sites/cron_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="command"}</a></td>
- <td class="tbl_col_buttons">
+ <td><a href="#" data-load-content="sites/cron_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
+ <td><a href="#" data-load-content="sites/cron_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
+ <td><a href="#" data-load-content="sites/cron_edit.php?id={tmpl_var name='id'}">{tmpl_var name="parent_domain_id"}</a></td>
+ <td><a href="#" data-load-content="sites/cron_edit.php?id={tmpl_var name='id'}">{tmpl_var name="run_min"}</a></td>
+ <td><a href="#" data-load-content="sites/cron_edit.php?id={tmpl_var name='id'}">{tmpl_var name="run_hour"}</a></td>
+ <td><a href="#" data-load-content="sites/cron_edit.php?id={tmpl_var name='id'}">{tmpl_var name="run_mday"}</a></td>
+ <td><a href="#" data-load-content="sites/cron_edit.php?id={tmpl_var name='id'}">{tmpl_var name="run_month"}</a></td>
+ <td><a href="#" data-load-content="sites/cron_edit.php?id={tmpl_var name='id'}">{tmpl_var name="run_wday"}</a></td>
+ <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="button icons16 icoDelete" href="javascript: del_record('sites/cron_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+ <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>
</div>
</td>
</tr>
@@ -71,11 +71,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="10"><tmpl_var name="paging"></td>
+ <td colspan="10"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/sites/templates/database_admin_list.htm b/interface/web/sites/templates/database_admin_list.htm
index d7fecea..46dc57b 100644
--- a/interface/web/sites/templates/database_admin_list.htm
+++ b/interface/web/sites/templates/database_admin_list.htm
@@ -1,63 +1,63 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
-<div class="panel panel_list_database_admin">
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/database_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="sites/database_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_remote_access" scope="col"><tmpl_var name="remote_access_txt"></th>
- <th class="tbl_col_type" scope="col"><tmpl_var name="type_txt"></th>
- <th class="tbl_col_sys_groupid" scope="col"><tmpl_var name="sys_groupid_txt"></th>
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
- <th class="tbl_col_database_user_id" scope="col"><tmpl_var name="database_user_txt"></th>
- <th class="tbl_col_database_name" scope="col"><tmpl_var name="database_name_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="active_txt"></th>
+ <th><tmpl_var name="remote_access_txt"></th>
+ <th><tmpl_var name="type_txt"></th>
+ <th><tmpl_var name="sys_groupid_txt"></th>
+ <th><tmpl_var name="server_id_txt"></th>
+ <th><tmpl_var name="parent_domain_id_txt"></th>
+ <th><tmpl_var name="database_user_txt"></th>
+ <th><tmpl_var name="database_name_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_remote_access"><select name="search_remote_access">{tmpl_var name='search_remote_access'}</select></td>
- <td class="tbl_col_type"><select name="search_type">{tmpl_var name='search_type'}</select></td>
- <td class="tbl_col_sys_groupid"><select name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
- <td class="tbl_col_database_user"><select name="search_database_user_id">{tmpl_var name='search_database_user_id'}</select></td>
- <td class="tbl_col_database_name"><input type="text" name="search_database_name" value="{tmpl_var name='search_database_name'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/database_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <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><div class="col-sm-9"><input type="text" name="search_database_name" value="{tmpl_var name='search_database_name'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/database_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_remote_access"><a href="#" onclick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="remote_access"}</a></td>
- <td class="tbl_col_type"><a href="#" onclick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="type"}</a></td>
- <td class="tbl_col_sys_groupid"><a href="#" onclick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="sys_groupid"}</a></td>
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_parent_domain_id"><a href="#" onclick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
- <td class="tbl_col_database_user"><a href="#" onclick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="database_user_id"}</a></td>
- <td class="tbl_col_database_name"><a href="#" onclick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="database_name"}</a></td>
- <td class="tbl_col_buttons">
+ <td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
+ <td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="remote_access"}</a></td>
+ <td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="type"}</a></td>
+ <td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="sys_groupid"}</a></td>
+ <td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
+ <td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="parent_domain_id"}</a></td>
+ <td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="database_user_id"}</a></td>
+ <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="button icons16 icoDbAdmin" href="sites/database_phpmyadmin.php?id={tmpl_var name='id'}" target="phpmyadmin"><span>{tmpl_var name='admin_txt'}</span></a>
+ <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>
</tmpl_if>
- <a class="button icons16 icoEdit" href="javascript: loadContent('sites/database_edit.php?id={tmpl_var name='id'}');"><span>{tmpl_var name='edit_txt'}</span></a>
- <a class="button icons16 icoDelete" href="javascript: del_record('sites/database_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+ <a class="button icons16 icoEdit" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}"><span>{tmpl_var name='edit_txt'}</span></a>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -69,11 +69,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="8"><tmpl_var name="paging"></td>
+ <td colspan="8"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/sites/templates/database_edit.htm b/interface/web/sites/templates/database_edit.htm
index 3e1489c..d8bb87e 100644
--- a/interface/web/sites/templates/database_edit.htm
+++ b/interface/web/sites/templates/database_edit.htm
@@ -1,124 +1,121 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_database">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
+
<tmpl_if name="is_admin">
- <div class="ctrlHolder">
+ <div class="form-group">
<tmpl_if name="edit_disabled">
- <label for="server_id_disabled">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id_disabled" id="server_id_disabled" class="selectInput" disabled="disabled">
+ <label for="server_id_disabled" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id_disabled" id="server_id_disabled" class="form-control" disabled="disabled">
{tmpl_var name='server_id'}
</select>
- <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+ </div><input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
<tmpl_else>
- <label for="server_id">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id" id="server_id" class="selectInput">
+ <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
{tmpl_var name='server_id'}
</select>
- </tmpl_if>
+ </div></tmpl_if>
</div>
<tmpl_else>
<tmpl_if name="only_one_server">
<input type="hidden" id="server_id" name="server_id" value="{tmpl_var name='server_id_value'}" />
<tmpl_else>
- <div class="ctrlHolder">
+ <div class="form-group">
<tmpl_if name="edit_disabled">
- <label for="server_id_disabled">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id_disabled" id="server_id_disabled" class="selectInput" disabled="disabled">
+ <label for="server_id_disabled" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id_disabled" id="server_id_disabled" class="form-control" disabled="disabled">
{tmpl_var name='server_id'}
</select>
- <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+ </div><input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
<tmpl_else>
- <label for="server_id">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id" id="server_id" class="selectInput">
+ <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
{tmpl_var name='server_id'}
</select>
- </tmpl_if>
+ </div></tmpl_if>
</div>
</tmpl_if>
</tmpl_if>
- <div class="ctrlHolder">
- <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
- <select name="parent_domain_id" id="parent_domain_id" class="selectInput">
+ <div class="form-group">
+ <label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='parent_domain_id_txt'}</label>
+ <div class="col-sm-9"><select name="parent_domain_id" id="parent_domain_id" class="form-control">
{tmpl_var name='parent_domain_id'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="type">{tmpl_var name='type_txt'}</label>
- <select name="type" id="type" class="selectInput formLengthHalf">
+ </div></div>
+ <div class="form-group">
+ <label for="type" class="col-sm-3 control-label">{tmpl_var name='type_txt'}</label>
+ <div class="col-sm-9"><select name="type" id="type" class="form-control">
{tmpl_var name='type'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="database_name">{tmpl_var name='database_name_txt'}</label>
+ </div></div>
+ <div class="form-group">
+ <label for="database_name" class="col-sm-3 control-label">{tmpl_var name='database_name_txt'}</label>
<p class="prefix">{tmpl_var name='database_name_prefix'}</p>
<tmpl_if name="edit_disabled">
- <input name="database_name" id="database_name" value="{tmpl_var name='database_name'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" disabled="disabled" />
- <input name="database_name" type="hidden" value="{tmpl_var name='database_name'}" />
+ <div class="col-sm-9"><input type="text" name="database_name" id="database_name" value="{tmpl_var name='database_name'}" class="form-control" disabled="disabled" />
+ </div><input name="database_name" type="hidden" value="{tmpl_var name='database_name'}" />
<tmpl_else>
- <input name="database_name" id="database_name" value="{tmpl_var name='database_name'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
- </tmpl_if>
+ <div class="col-sm-9"><input type="text" name="database_name" id="database_name" value="{tmpl_var name='database_name'}" class="form-control" />
+ </div></tmpl_if>
</div>
- <div class="ctrlHolder">
- <label for="database_quota">{tmpl_var name='limit_database_quota_txt'}</label>
- <input name="database_quota" id="database_quota" value="{tmpl_var name='limit_database_quota'}" size="10" maxlength="10" type="text" class="textInput formLengthLimit" /> MB
- </div>
- <div class="ctrlHolder">
- <label for="database_user_id">{tmpl_var name='database_user_txt'}</label>
- <select name="database_user_id" id="database_user_id" class="selectInput">
+ <div class="form-group">
+ <label for="database_quota" class="col-sm-3 control-label">{tmpl_var name='limit_database_quota_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="database_quota" id="database_quota" value="{tmpl_var name='limit_database_quota'}" class="form-control" /> MB
+ </div></div>
+ <div class="form-group">
+ <label for="database_user_id" class="col-sm-3 control-label">{tmpl_var name='database_user_txt'}</label>
+ <div class="col-sm-9"><select name="database_user_id" id="database_user_id" class="form-control">
{tmpl_var name='database_user_id'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="database_ro_user_id">{tmpl_var name='database_ro_user_txt'}</label>
- <select name="database_ro_user_id" id="database_ro_user_id" class="selectInput">
+ </div></div>
+ <div class="form-group">
+ <label for="database_ro_user_id" class="col-sm-3 control-label">{tmpl_var name='database_ro_user_txt'}</label>
+ <div class="col-sm-9"><select name="database_ro_user_id" id="database_ro_user_id" class="form-control">
{tmpl_var name='database_ro_user_id'}
</select> {tmpl_var name='optional_txt'}
- </div>
- <div class="ctrlHolder">
+ </div></div>
+ <div class="form-group">
<tmpl_if name="edit_disabled">
- <label for="database_charset_disabled">{tmpl_var name='database_charset_txt'}</label>
- <select name="database_charset_disabled" id="database_charset_disabled" class="selectInput formLengthHalf" disabled="disabled">
+ <label for="database_charset_disabled" class="col-sm-3 control-label">{tmpl_var name='database_charset_txt'}</label>
+ <div class="col-sm-9"><select name="database_charset_disabled" id="database_charset_disabled" class="form-control" disabled="disabled">
{tmpl_var name='database_charset'}
</select>
- <input type="hidden" name="database_charset" value="{tmpl_var name='database_charset_value'}" />
+ </div><input type="hidden" name="database_charset" value="{tmpl_var name='database_charset_value'}" />
<tmpl_else>
- <label for="database_charset">{tmpl_var name='database_charset_txt'}</label>
- <select name="database_charset" id="database_charset" class="selectInput formLengthHalf">
+ <label for="database_charset" class="col-sm-3 control-label">{tmpl_var name='database_charset_txt'}</label>
+ <div class="col-sm-9"><select name="database_charset" id="database_charset" class="form-control">
{tmpl_var name='database_charset'}
</select>
- </tmpl_if>
+ </div></tmpl_if>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='remote_access_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='remote_access_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='remote_access'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="remote_ips">{tmpl_var name='remote_ips_txt'}</label>
- <input name="remote_ips" id="remote_ips" value="{tmpl_var name='remote_ips'}" size="30" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label for="remote_ips" class="col-sm-3 control-label">{tmpl_var name='remote_ips_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="remote_ips" id="remote_ips" value="{tmpl_var name='remote_ips'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/database_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/database_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/database_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="sites/database_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
<script language="JavaScript" type="text/javascript">
<tmpl_if name="is_admin">
function reloadDatabaseUsers() {
diff --git a/interface/web/sites/templates/database_list.htm b/interface/web/sites/templates/database_list.htm
index 15a8ae7..a0ce563 100644
--- a/interface/web/sites/templates/database_list.htm
+++ b/interface/web/sites/templates/database_list.htm
@@ -1,9 +1,9 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_database">
- <div class="pnl_toolsarea">
<tmpl_if name='datalog_changes_count' op='>' value='0'>
<div>
<div class="systemmonitor-state state-info">
@@ -20,58 +20,58 @@
</div><br />
</div>
</tmpl_if>
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/database_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="sites/database_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_remote_access" scope="col"><tmpl_var name="remote_access_txt"></th>
- <th class="tbl_col_type" scope="col"><tmpl_var name="type_txt"></th>
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
- <th class="tbl_col_database_user_id" scope="col"><tmpl_var name="database_user_txt"></th>
- <th class="tbl_col_database_name" scope="col"><tmpl_var name="database_name_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="active_txt"></th>
+ <th><tmpl_var name="remote_access_txt"></th>
+ <th><tmpl_var name="type_txt"></th>
+ <th><tmpl_var name="server_id_txt"></th>
+ <th><tmpl_var name="parent_domain_id_txt"></th>
+ <th><tmpl_var name="database_user_txt"></th>
+ <th><tmpl_var name="database_name_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_remote_access"><select name="search_remote_access">{tmpl_var name='search_remote_access'}</select></td>
- <td class="tbl_col_type"><select name="search_type">{tmpl_var name='search_type'}</select></td>
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
- <td class="tbl_col_database_user_id"><select name="search_database_user_id">{tmpl_var name='search_database_user_id'}</select></td>
- <td class="tbl_col_database_name"><input type="text" name="search_database_name" value="{tmpl_var name='search_database_name'}"/></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/database_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <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><div class="col-sm-9"><input type="text" name="search_database_name" value="{tmpl_var name='search_database_name'}"/></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/database_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_remote_access"><a href="#" onclick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="remote_access"}</a></td>
- <td class="tbl_col_type"><a href="#" onclick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="type"}</a></td>
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_parent_domain_id"><a href="#" onclick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
- <td class="tbl_col_database_user"><a href="#" onclick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="database_user_id"}</a></td>
- <td class="tbl_col_database_name"><a href="#" onclick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="database_name"}</a></td>
- <td class="tbl_col_buttons">
+ <td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
+ <td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="remote_access"}</a></td>
+ <td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="type"}</a></td>
+ <td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
+ <td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="parent_domain_id"}</a></td>
+ <td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="database_user_id"}</a></td>
+ <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="button icons16 icoDbAdmin" href="sites/database_phpmyadmin.php?id={tmpl_var name='id'}" target="phpmyadmin"><span>{tmpl_var name='admin_txt'}</span></a>
+ <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>
</tmpl_if>
- <a class="button icons16 icoEdit" href="javascript: loadContent('sites/database_edit.php?id={tmpl_var name='id'}');"><span>{tmpl_var name='edit_txt'}</span></a>
- <a class="button icons16 icoDelete" href="javascript: del_record('sites/database_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
+ <a class="button icons16 icoEdit" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}"><span>{tmpl_var name='edit_txt'}</span></a>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -83,11 +83,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="7"><tmpl_var name="paging"></td>
+ <td colspan="7"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
</div>
+
+
\ No newline at end of file
diff --git a/interface/web/sites/templates/database_quota_stats_list.htm b/interface/web/sites/templates/database_quota_stats_list.htm
index caa20b7..5a3185a 100644
--- a/interface/web/sites/templates/database_quota_stats_list.htm
+++ b/interface/web/sites/templates/database_quota_stats_list.htm
@@ -1,39 +1,40 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
-<div class="panel panel_list_database_quota_stats">
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_database tbl_col_nosort" scope="col"><tmpl_var name="database_txt"></th>
- <th class="tbl_col_client tbl_col_nosort" scope="col"><tmpl_var name="client_txt"></th>
- <th class="tbl_col_used_sort" scope="col"><tmpl_var name="used_txt"></th>
- <th class="tbl_col_quota tbl_col_nosort" scope="col"><tmpl_var name="quota_txt"></th>
- <th class="tbl_col_percentage tbl_col_nosort" scope="col"><tmpl_var name="percentage_txt">
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="database_txt"></th>
+ <th><tmpl_var name="client_txt"></th>
+ <th><tmpl_var name="used_txt"></th>
+ <th><tmpl_var name="quota_txt"></th>
+ <th><tmpl_var name="percentage_txt">
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_database"><input type="text" name="search_database_name" value="{tmpl_var name='search_database_name'}" /></td>
- <td class="tbl_col_client"> </td>
- <td class="tbl_col_used"> </td>
- <td class="tbl_col_quota"> </td>
- <td class="tbl_col_percentage"> </td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/database_quota_stats.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><div class="col-sm-9"><input type="text" name="search_database_name" value="{tmpl_var name='search_database_name'}" /></div></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>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_database"><a href="#" onclick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="database"}</a></td>
- <td class="tbl_col_client"><a href="#" onclick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client"}</a></td>
- <td class="tbl_col_used"><a href="#" onclick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="used"}</a></td>
- <td class="tbl_col_quota"><a href="#" onclick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="quota"}</a></td>
- <td class="tbl_col_percentage"><a href="#" onclick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="percentage"}</a></td>
- <td class="tbl_col_buttons"></td>
+ <td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="database"}</a></td>
+ <td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="client"}</a></td>
+ <td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="used"}</a></td>
+ <td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="quota"}</a></td>
+ <td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="percentage"}</a></td>
+ <td></td>
</tr>
</tmpl_loop>
<tmpl_unless name="records">
@@ -44,11 +45,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="7"><tmpl_var name="paging"></td>
+ <td colspan="7"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
</div>
+
+ </div>
diff --git a/interface/web/sites/templates/database_user_admin_list.htm b/interface/web/sites/templates/database_user_admin_list.htm
index d3c3332..1efd450 100644
--- a/interface/web/sites/templates/database_user_admin_list.htm
+++ b/interface/web/sites/templates/database_user_admin_list.htm
@@ -1,38 +1,38 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_database_user_admin">
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/database_user_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="sites/database_user_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_database_user" scope="col"><tmpl_var name="database_user_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="database_user_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_database_user"><input type="text" name="search_database_user" value="{tmpl_var name='search_database_user'}"/></td>
- <td class="tbl_col_buttons"><button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/database_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></td>
+ <tr>
+ <td><div class="col-sm-9"><input type="text" name="search_database_user" value="{tmpl_var name='search_database_user'}"/></div></td>
+ <td><button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/database_user_list.php');">{tmpl_var name="filter_txt"}</button></td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_database_user"><a href="#" onclick="loadContent('sites/database_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="database_user"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoEdit" href="javascript: loadContent('sites/database_user_edit.php?id={tmpl_var name='id'}');"><span>{tmpl_var name='edit_txt'}</span></a>
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <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="button icons16 icoEdit" data-load-content="sites/database_user_edit.php?id={tmpl_var name='id'}"><span>{tmpl_var name='edit_txt'}</span></a>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -44,11 +44,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="2"><tmpl_var name="paging"></td>
+ <td colspan="2"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/sites/templates/database_user_edit.htm b/interface/web/sites/templates/database_user_edit.htm
index 9bcf886..f8411e2 100644
--- a/interface/web/sites/templates/database_user_edit.htm
+++ b/interface/web/sites/templates/database_user_edit.htm
@@ -1,54 +1,51 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_database_user">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
+
<tmpl_if name="is_admin">
- <div class="ctrlHolder">
- <label for="client_group_id">{tmpl_var name='client_txt'}</label>
- <select name="client_group_id" id="client_group_id" class="selectInput">
+ <div class="form-group">
+ <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
+ <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
{tmpl_var name='client_group_id'}
</select>
- </div>
+ </div></div>
</tmpl_if>
<tmpl_if name="is_reseller">
- <div class="ctrlHolder">
- <label for="client_group_id">{tmpl_var name='client_txt'}</label>
- <select name="client_group_id" id="client_group_id" class="selectInput">
+ <div class="form-group">
+ <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
+ <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
{tmpl_var name='client_group_id'}
</select>
- </div>
+ </div></div>
</tmpl_if>
- <div class="ctrlHolder">
- <label for="database_user">{tmpl_var name='database_user_txt'}</label>
+ <div class="form-group">
+ <label for="database_user" class="col-sm-3 control-label">{tmpl_var name='database_user_txt'}</label>
<p class="prefix">{tmpl_var name='database_user_prefix'}</p>
- <input name="database_user" id="database_user" value="{tmpl_var name='database_user'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
- </div>
- <div class="ctrlHolder">
- <label for="database_password">{tmpl_var name='database_password_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="database_user" id="database_user" value="{tmpl_var name='database_user'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="database_password" class="col-sm-3 control-label">{tmpl_var name='database_password_txt'}</label>
<input name="database_password" id="database_password" value="{tmpl_var name='database_password'}" size="30" maxlength="255" type="password" class="textInput formLengthHalf" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('database_password','repeat_password');" /> <a href="javascript:void(0);" onclick="generatePassword('database_password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='password_strength_txt'}</p>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='password_strength_txt'}</label>
<div id="passBar"></div>
<p class="formHint"><span id="passText"> </span></p>
</div>
- <div class="ctrlHolder">
- <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+ <div class="form-group">
+ <label for="repeat_password" class="col-sm-3 control-label">{tmpl_var name='repeat_password_txt'}</label>
<input name="repeat_password" id="repeat_password" value="" size="30" maxlength="100" type="password" class="textInput formLengthHalf" autocomplete="off" onkeyup="checkPassMatch('database_password','repeat_password');" />
</div>
<div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
<div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/database_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/database_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/database_user_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="sites/database_user_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/sites/templates/database_user_list.htm b/interface/web/sites/templates/database_user_list.htm
index be133f2..7e9a7ae 100644
--- a/interface/web/sites/templates/database_user_list.htm
+++ b/interface/web/sites/templates/database_user_list.htm
@@ -1,9 +1,9 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_database">
- <div class="pnl_toolsarea">
<tmpl_if name='datalog_changes_count' op='>' value='0'>
<div>
<div class="systemmonitor-state state-info">
@@ -20,35 +20,35 @@
</div><br />
</div>
</tmpl_if>
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/database_user_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="sites/database_user_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_database_user" scope="col"><tmpl_var name="database_user_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="database_user_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_database_user"><input type="text" name="search_database_user" value="{tmpl_var name='search_database_user'}"/></td>
- <td class="tbl_col_buttons"><button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/database_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></td>
+ <tr>
+ <td><div class="col-sm-9"><input type="text" name="search_database_user" value="{tmpl_var name='search_database_user'}"/></div></td>
+ <td><button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/database_user_list.php');">{tmpl_var name="filter_txt"}</button></td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_database_user"><a href="#" onclick="loadContent('sites/database_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="database_user"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoEdit" href="javascript: loadContent('sites/database_user_edit.php?id={tmpl_var name='id'}');"><span>{tmpl_var name='edit_txt'}</span></a>
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <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="button icons16 icoEdit" data-load-content="sites/database_user_edit.php?id={tmpl_var name='id'}"><span>{tmpl_var name='edit_txt'}</span></a>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -60,11 +60,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="2"><tmpl_var name="paging"></td>
+ <td colspan="2"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/sites/templates/ftp_user_advanced.htm b/interface/web/sites/templates/ftp_user_advanced.htm
index 2c452d8..35e54dc 100644
--- a/interface/web/sites/templates/ftp_user_advanced.htm
+++ b/interface/web/sites/templates/ftp_user_advanced.htm
@@ -1,54 +1,51 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_ftp_user">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="uid">{tmpl_var name='uid_txt'}</label>
- <input name="uid" id="uid" value="{tmpl_var name='uid'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+
+ <div class="form-group">
+ <label for="uid" class="col-sm-3 control-label">{tmpl_var name='uid_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="uid" id="uid" value="{tmpl_var name='uid'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="gid" class="col-sm-3 control-label">{tmpl_var name='gid_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="gid" id="gid" value="{tmpl_var name='gid'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="dir" class="col-sm-3 control-label">{tmpl_var name='dir_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="dir" id="dir" value="{tmpl_var name='dir'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="quota_files" class="col-sm-3 control-label">{tmpl_var name='quota_files_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="quota_files" id="quota_files" value="{tmpl_var name='quota_files'}" class="form-control" /></div><label class="col-sm-3 control-label">{tmpl_var name='quota_files_unity_txt'}</label>
</div>
- <div class="ctrlHolder">
- <label for="gid">{tmpl_var name='gid_txt'}</label>
- <input name="gid" id="gid" value="{tmpl_var name='gid'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+ <div class="form-group">
+ <label for="ul_ratio" class="col-sm-3 control-label">{tmpl_var name='ul_ratio_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="ul_ratio" id="ul_ratio" value="{tmpl_var name='ul_ratio'}" class="form-control" /></div><label class="col-sm-3 control-label"></label>
</div>
- <div class="ctrlHolder">
- <label for="dir">{tmpl_var name='dir_txt'}</label>
- <input name="dir" id="dir" value="{tmpl_var name='dir'}" size="30" maxlength="255" type="text" class="textInput" />
+ <div class="form-group">
+ <label for="dl_ratio" class="col-sm-3 control-label">{tmpl_var name='dl_ratio_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="dl_ratio" id="dl_ratio" value="{tmpl_var name='dl_ratio'}" class="form-control" /></div><label class="col-sm-3 control-label"></label>
</div>
- <div class="ctrlHolder">
- <label for="quota_files">{tmpl_var name='quota_files_txt'}</label>
- <input name="quota_files" id="quota_files" value="{tmpl_var name='quota_files'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /><p class="label">{tmpl_var name='quota_files_unity_txt'}</p>
+ <div class="form-group">
+ <label for="ul_bandwidth" class="col-sm-3 control-label">{tmpl_var name='ul_bandwidth_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="ul_bandwidth" id="ul_bandwidth" value="{tmpl_var name='ul_bandwidth'}" class="form-control" /></div><label class="col-sm-3 control-label">kb/s</label>
</div>
- <div class="ctrlHolder">
- <label for="ul_ratio">{tmpl_var name='ul_ratio_txt'}</label>
- <input name="ul_ratio" id="ul_ratio" value="{tmpl_var name='ul_ratio'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /><p class="label"></p>
+ <div class="form-group">
+ <label for="dl_bandwidth" class="col-sm-3 control-label">{tmpl_var name='dl_bandwidth_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="dl_bandwidth" id="dl_bandwidth" value="{tmpl_var name='dl_bandwidth'}" class="form-control" /></div><label class="col-sm-3 control-label">kb/s</label>
</div>
- <div class="ctrlHolder">
- <label for="dl_ratio">{tmpl_var name='dl_ratio_txt'}</label>
- <input name="dl_ratio" id="dl_ratio" value="{tmpl_var name='dl_ratio'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /><p class="label"></p>
- </div>
- <div class="ctrlHolder">
- <label for="ul_bandwidth">{tmpl_var name='ul_bandwidth_txt'}</label>
- <input name="ul_bandwidth" id="ul_bandwidth" value="{tmpl_var name='ul_bandwidth'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /><p class="label">kb/s</p>
- </div>
- <div class="ctrlHolder">
- <label for="dl_bandwidth">{tmpl_var name='dl_bandwidth_txt'}</label>
- <input name="dl_bandwidth" id="dl_bandwidth" value="{tmpl_var name='dl_bandwidth'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /><p class="label">kb/s</p>
- </div>
- <div class="ctrlHolder">
- <label for="expires">{tmpl_var name='expires_txt'}</label>
+ <div class="form-group">
+ <label for="expires" class="col-sm-3 control-label">{tmpl_var name='expires_txt'}</label>
{tmpl_var name='expires'}
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/ftp_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/ftp_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/ftp_user_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="sites/ftp_user_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
diff --git a/interface/web/sites/templates/ftp_user_advanced_client.htm b/interface/web/sites/templates/ftp_user_advanced_client.htm
index dfca480..e779e35 100644
--- a/interface/web/sites/templates/ftp_user_advanced_client.htm
+++ b/interface/web/sites/templates/ftp_user_advanced_client.htm
@@ -1,26 +1,23 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_ftp_user">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="dir">{tmpl_var name='dir_txt'}</label>
- <input name="dir" id="dir" value="{tmpl_var name='dir'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="expires">{tmpl_var name='expires_txt'}</label>
+
+ <div class="form-group">
+ <label for="dir" class="col-sm-3 control-label">{tmpl_var name='dir_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="dir" id="dir" value="{tmpl_var name='dir'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="expires" class="col-sm-3 control-label">{tmpl_var name='expires_txt'}</label>
{tmpl_var name='expires'}
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/ftp_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/ftp_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/ftp_user_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="sites/ftp_user_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
diff --git a/interface/web/sites/templates/ftp_user_edit.htm b/interface/web/sites/templates/ftp_user_edit.htm
index 24a0dc3..d9e352a 100644
--- a/interface/web/sites/templates/ftp_user_edit.htm
+++ b/interface/web/sites/templates/ftp_user_edit.htm
@@ -1,54 +1,51 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_ftp_user">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
- <select name="parent_domain_id" id="parent_domain_id" class="selectInput">
+
+ <div class="form-group">
+ <label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='parent_domain_id_txt'}</label>
+ <div class="col-sm-9"><select name="parent_domain_id" id="parent_domain_id" class="form-control">
{tmpl_var name='parent_domain_id'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="username">{tmpl_var name='username_txt'}</label>
+ </div></div>
+ <div class="form-group">
+ <label for="username" class="col-sm-3 control-label">{tmpl_var name='username_txt'}</label>
<p class="prefix">{tmpl_var name='username_prefix'}</p>
- <input name="username" id="username" value="{tmpl_var name='username'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="password">{tmpl_var name='password_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="username" id="username" value="{tmpl_var name='username'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="password" class="col-sm-3 control-label">{tmpl_var name='password_txt'}</label>
<input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" /> <a href="javascript:void(0);" onclick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='password_strength_txt'}</p>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='password_strength_txt'}</label>
<div id="passBar"></div>
<p class="formHint"><span id="passText"> </span></p>
</div>
- <div class="ctrlHolder">
- <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+ <div class="form-group">
+ <label for="repeat_password" class="col-sm-3 control-label">{tmpl_var name='repeat_password_txt'}</label>
<input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;" autocomplete="off" onkeyup="checkPassMatch('password','repeat_password');" />
</div>
<div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
<div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
- <div class="ctrlHolder">
- <label for="quota_size">{tmpl_var name='quota_size_txt'}</label>
- <input name="quota_size" id="quota_size" value="{tmpl_var name='quota_size'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /><p class="label">MB</p>
+ <div class="form-group">
+ <label for="quota_size" class="col-sm-3 control-label">{tmpl_var name='quota_size_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="quota_size" id="quota_size" value="{tmpl_var name='quota_size'}" class="form-control" /></div><label class="col-sm-3 control-label">MB</label>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/ftp_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/ftp_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/ftp_user_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="sites/ftp_user_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/sites/templates/ftp_user_list.htm b/interface/web/sites/templates/ftp_user_list.htm
index 89e81c7..aad13d0 100644
--- a/interface/web/sites/templates/ftp_user_list.htm
+++ b/interface/web/sites/templates/ftp_user_list.htm
@@ -1,9 +1,9 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_ftp_user">
- <div class="pnl_toolsarea">
<tmpl_if name='datalog_changes_count' op='>' value='0'>
<div>
<div class="systemmonitor-state state-info">
@@ -20,48 +20,48 @@
</div><br />
</div>
</tmpl_if>
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/ftp_user_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="sites/ftp_user_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
- <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="active_txt"></th>
+ <th><tmpl_var name="server_id_txt"></th>
+ <th><tmpl_var name="parent_domain_id_txt"></th>
+ <th><tmpl_var name="username_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
- <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/ftp_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <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><div class="col-sm-9"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/ftp_user_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_parent_domain_id"><a href="#" onclick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
- <td class="tbl_col_username"><a href="#" onclick="loadContent('sites/ftp_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
- <td class="tbl_col_buttons">
+ <td><a href="#" data-load-content="sites/ftp_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
+ <td><a href="#" data-load-content="sites/ftp_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
+ <td><a href="#" data-load-content="sites/ftp_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="parent_domain_id"}</a></td>
+ <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="button icons16 icoDbAdmin" href="{tmpl_var name='webftp_url'}" target="_blank"><span>{tmpl_var name='admin_txt'}</span></a>
+ <a class="btn btn-default formbutton-default" href="{tmpl_var name='webftp_url'}" target="_blank">{tmpl_var name='admin_txt'}</button>
</tmpl_if>
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -73,11 +73,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+ <td colspan="5"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/sites/templates/shell_user_advanced.htm b/interface/web/sites/templates/shell_user_advanced.htm
index a16b50c..5c099e5 100644
--- a/interface/web/sites/templates/shell_user_advanced.htm
+++ b/interface/web/sites/templates/shell_user_advanced.htm
@@ -1,34 +1,31 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_shell_user">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="puser">{tmpl_var name='puser_txt'}</label>
- <input name="puser" id="puser" value="{tmpl_var name='puser'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
- </div>
- <div class="ctrlHolder">
- <label for="pgroup">{tmpl_var name='pgroup_txt'}</label>
- <input name="pgroup" id="pgroup" value="{tmpl_var name='pgroup'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
- </div>
- <div class="ctrlHolder">
- <label for="shell">{tmpl_var name='shell_txt'}</label>
- <input name="shell" id="shell" value="{tmpl_var name='shell'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="dir">{tmpl_var name='dir_txt'}</label>
- <input name="dir" id="dir" value="{tmpl_var name='dir'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- </fieldset>
+
+ <div class="form-group">
+ <label for="puser" class="col-sm-3 control-label">{tmpl_var name='puser_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="puser" id="puser" value="{tmpl_var name='puser'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="pgroup" class="col-sm-3 control-label">{tmpl_var name='pgroup_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="pgroup" id="pgroup" value="{tmpl_var name='pgroup'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="shell" class="col-sm-3 control-label">{tmpl_var name='shell_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="shell" id="shell" value="{tmpl_var name='shell'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="dir" class="col-sm-3 control-label">{tmpl_var name='dir_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="dir" id="dir" value="{tmpl_var name='dir'}" class="form-control" />
+ </div></div>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/shell_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/shell_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/shell_user_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="sites/shell_user_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/sites/templates/shell_user_edit.htm b/interface/web/sites/templates/shell_user_edit.htm
index 364b05e..faaca7a 100644
--- a/interface/web/sites/templates/shell_user_edit.htm
+++ b/interface/web/sites/templates/shell_user_edit.htm
@@ -1,72 +1,69 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_shell_user">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
+
+ <div class="form-group">
<tmpl_if name="edit_disabled">
- <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
- <select name="parent_domain_id" id="parent_domain_id" class="selectInput" disabled="disabled">
+ <label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='parent_domain_id_txt'}</label>
+ <div class="col-sm-9"><select name="parent_domain_id" id="parent_domain_id" class="form-control" disabled="disabled">
{tmpl_var name='parent_domain_id'}
</select>
- <input type="hidden" name="parent_domain_id" value="{tmpl_var name='parent_domain_id_value'}" />
+ </div><input type="hidden" name="parent_domain_id" value="{tmpl_var name='parent_domain_id_value'}" />
<tmpl_else>
- <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
- <select name="parent_domain_id" id="parent_domain_id" class="selectInput">
+ <label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='parent_domain_id_txt'}</label>
+ <div class="col-sm-9"><select name="parent_domain_id" id="parent_domain_id" class="form-control">
{tmpl_var name='parent_domain_id'}
</select>
- </tmpl_if>
+ </div></tmpl_if>
</div>
- <div class="ctrlHolder">
- <label for="username">{tmpl_var name='username_txt'}</label>
+ <div class="form-group">
+ <label for="username" class="col-sm-3 control-label">{tmpl_var name='username_txt'}</label>
<p class="prefix">{tmpl_var name='username_prefix'} </p>
- <input name="username" id="username" value="{tmpl_var name='username'}" size="30" maxlength="255" type="text" class="textInput formLengthFourth"/>
- </div>
- <div class="ctrlHolder">
- <label for="password">{tmpl_var name='password_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="username" id="username" value="{tmpl_var name='username'}" class="form-control"/>
+ </div></div>
+ <div class="form-group">
+ <label for="password" class="col-sm-3 control-label">{tmpl_var name='password_txt'}</label>
<input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');"/> <a href="javascript:void(0);" onclick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='password_strength_txt'}</p>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='password_strength_txt'}</label>
<div id="passBar"></div>
<p class="formHint"><span id="passText"> </span></p>
</div>
- <div class="ctrlHolder">
- <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+ <div class="form-group">
+ <label for="repeat_password" class="col-sm-3 control-label">{tmpl_var name='repeat_password_txt'}</label>
<input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;" autocomplete="off" onkeyup="checkPassMatch('password','repeat_password');" />
</div>
<div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
<div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
- <div class="ctrlHolder">
- <label for="chroot">{tmpl_var name='chroot_txt'}</label>
- <select name="chroot" id="chroot" class="selectInput formLengthHalf">
+ <div class="form-group">
+ <label for="chroot" class="col-sm-3 control-label">{tmpl_var name='chroot_txt'}</label>
+ <div class="col-sm-9"><select name="chroot" id="chroot" class="form-control">
{tmpl_var name='chroot'}
</select>
+ </div></div>
+ <div class="form-group">
+ <label for="quota_size" class="col-sm-3 control-label">{tmpl_var name='quota_size_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="quota_size" id="quota_size" value="{tmpl_var name='quota_size'}" class="form-control" /></div><label class="col-sm-3 control-label">MB</label>
</div>
- <div class="ctrlHolder">
- <label for="quota_size">{tmpl_var name='quota_size_txt'}</label>
- <input name="quota_size" id="quota_size" value="{tmpl_var name='quota_size'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /><p class="label">MB</p>
- </div>
- <div class="ctrlHolder">
- <label for="ssh_rsa">{tmpl_var name='ssh_rsa_txt'}</label>
+ <div class="form-group">
+ <label for="ssh_rsa" class="col-sm-3 control-label">{tmpl_var name='ssh_rsa_txt'}</label>
<textarea name="ssh_rsa" id="ssh_rsa" rows="10" cols="30">{tmpl_var name='ssh_rsa'}</textarea>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/shell_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/shell_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/shell_user_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="sites/shell_user_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/sites/templates/shell_user_list.htm b/interface/web/sites/templates/shell_user_list.htm
index 65509cf..4854947 100644
--- a/interface/web/sites/templates/shell_user_list.htm
+++ b/interface/web/sites/templates/shell_user_list.htm
@@ -1,9 +1,9 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_shell_user">
- <div class="pnl_toolsarea">
<tmpl_if name='datalog_changes_count' op='>' value='0'>
<div>
<div class="systemmonitor-state state-info">
@@ -20,45 +20,45 @@
</div><br />
</div>
</tmpl_if>
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/shell_user_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="sites/shell_user_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
- <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="active_txt"></th>
+ <th><tmpl_var name="server_id_txt"></th>
+ <th><tmpl_var name="parent_domain_id_txt"></th>
+ <th><tmpl_var name="username_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
- <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/shell_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <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><div class="col-sm-9"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/shell_user_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_parent_domain_id"><a href="#" onclick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
- <td class="tbl_col_username"><a href="#" onclick="loadContent('sites/shell_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="sites/shell_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
+ <td><a href="#" data-load-content="sites/shell_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -70,11 +70,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+ <td colspan="5"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/sites/templates/user_quota_stats_list.htm b/interface/web/sites/templates/user_quota_stats_list.htm
index 1403a01..bc3bd0c 100644
--- a/interface/web/sites/templates/user_quota_stats_list.htm
+++ b/interface/web/sites/templates/user_quota_stats_list.htm
@@ -1,42 +1,43 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
-<div class="panel panel_list_user_quota_stats">
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
- <th class="tbl_col_system_user" scope="col"><tmpl_var name="system_user_txt"></th>
- <th class="tbl_col_used_sort" scope="col"><tmpl_var name="used_txt"></th>
- <th class="tbl_col_soft tbl_col_nosort" scope="col"><tmpl_var name="soft_txt"></th>
- <th class="tbl_col_hard tbl_col_nosort" scope="col"><tmpl_var name="hard_txt"></th>
- <th class="tbl_col_files" scope="col"><tmpl_var name="files_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="domain_txt"></th>
+ <th><tmpl_var name="system_user_txt"></th>
+ <th><tmpl_var name="used_txt"></th>
+ <th><tmpl_var name="soft_txt"></th>
+ <th><tmpl_var name="hard_txt"></th>
+ <th><tmpl_var name="files_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
- <td class="tbl_col_system_user"><input type="text" name="search_system_user" value="{tmpl_var name='search_system_user'}" /></td>
- <td class="tbl_col_used"> </td>
- <td class="tbl_col_soft"> </td>
- <td class="tbl_col_hard"> </td>
- <td class="tbl_col_files"> </td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/user_quota_stats.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><div class="col-sm-9"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_system_user" value="{tmpl_var name='search_system_user'}" /></div></td>
+ <td> </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>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_domain"><a href="#" onclick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
- <td class="tbl_col_system_user"><a href="#" onclick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="system_user"}</a></td>
- <td class="tbl_col_used"><a href="#" onclick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="used"}</a></td>
- <td class="tbl_col_soft"><a href="#" onclick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="soft"}</a></td>
- <td class="tbl_col_hard"><a href="#" onclick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="hard"}</a></td>
- <td class="tbl_col_files"><a href="#" onclick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="files"}</a></td>
- <td class="tbl_col_buttons"></td>
+ <td><a href="#" data-load-content="sites/web_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="domain"}</a></td>
+ <td><a href="#" data-load-content="sites/web_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="system_user"}</a></td>
+ <td><a href="#" data-load-content="sites/web_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="used"}</a></td>
+ <td><a href="#" data-load-content="sites/web_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="soft"}</a></td>
+ <td><a href="#" data-load-content="sites/web_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="hard"}</a></td>
+ <td><a href="#" data-load-content="sites/web_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="files"}</a></td>
+ <td></td>
</tr>
</tmpl_loop>
<tmpl_unless name="records">
@@ -47,11 +48,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="7"><tmpl_var name="paging"></td>
+ <td colspan="7"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+ </div>
\ No newline at end of file
diff --git a/interface/web/sites/templates/web_backup_list.htm b/interface/web/sites/templates/web_backup_list.htm
index 780897d..0077618 100644
--- a/interface/web/sites/templates/web_backup_list.htm
+++ b/interface/web/sites/templates/web_backup_list.htm
@@ -6,31 +6,30 @@
</tmpl_if>
<h3><tmpl_var name="list_head_txt"></h3>
-<div class="panel panel_list_web_backup">
-
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_date" scope="col"><tmpl_var name="date_txt"></th>
- <th class="tbl_col_date" scope="col"><tmpl_var name="backup_type_txt"></th>
- <th class="tbl_col_filename" scope="col"><tmpl_var name="filename_txt"></th>
- <th class="tbl_col_filename" scope="col"><tmpl_var name="filesize_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="date_txt"></th>
+ <th><tmpl_var name="backup_type_txt"></th>
+ <th><tmpl_var name="filename_txt"></th>
+ <th><tmpl_var name="filesize_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_date">{tmpl_var name="date"}</td>
- <td class="tbl_col_date">{tmpl_var name="backup_type"}</td>
- <td class="tbl_col_filename">{tmpl_var name="filename"}</td>
- <td class="tbl_col_filesize">{tmpl_var name="filesize"}</td>
- <td class="tbl_col_buttons">
+ <td>{tmpl_var name="date"}</td>
+ <td>{tmpl_var name="backup_type"}</td>
+ <td>{tmpl_var name="filename"}</td>
+ <td>{tmpl_var name="filesize"}</td>
+ <td>
<div class="buttons">
- <button class="button iconstxt icoRestore" type="button" onclick="confirm_action('sites/web_domain_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&backup_action=restore&backup_id={tmpl_var name='backup_id'}','{tmpl_var name='restore_confirm_txt'}');"><span>{tmpl_var name="restore_backup_txt"}</span></button>
- <button class="button iconstxt icoDownload" type="button" onclick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&backup_action=download&backup_id={tmpl_var name='backup_id'}');"><span>{tmpl_var name="download_backup_txt"}</span></button>
+ <button class="btn btn-default formbutton-default" type="button" onclick="confirm_action('sites/web_domain_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&backup_action=restore&backup_id={tmpl_var name='backup_id'}','{tmpl_var name='restore_confirm_txt'}');">{tmpl_var name="restore_backup_txt"}</button>
+ <button class="button iconstxt icoDownload" type="button" data-load-content="sites/web_domain_edit.php?id={tmpl_var name='parent_id'}&next_tab=backup&backup_action=download&backup_id={tmpl_var name='backup_id'}"><span>{tmpl_var name="download_backup_txt"}</span></button>
</div>
</td>
</tr>
@@ -42,7 +41,6 @@
</tmpl_unless>
</tbody>
</table>
- </fieldset>
- </div>
-
</div>
+
+ </div>
diff --git a/interface/web/sites/templates/web_childdomain_advanced.htm b/interface/web/sites/templates/web_childdomain_advanced.htm
index d2704ed..7163924 100644
--- a/interface/web/sites/templates/web_childdomain_advanced.htm
+++ b/interface/web/sites/templates/web_childdomain_advanced.htm
@@ -1,25 +1,22 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_web_childdomain">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>Options</legend>
- <div class="ctrlHolder proxy">
- <label for="proxy_directives">{tmpl_var name='proxy_directives_txt'}</label>
+ <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>
<textarea name="proxy_directives" id="proxy_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='proxy_directives'}</textarea> <b>{tmpl_var name="available_proxy_directive_snippets_txt"}</b><br><br> {tmpl_var name="proxy_directive_snippets_txt"}
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_childdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_childdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_childdomain_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="sites/web_childdomain_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
<script language="JavaScript" type="text/javascript">
var webId = jQuery('input[name="id"]').val();
adjustForm();
diff --git a/interface/web/sites/templates/web_childdomain_edit.htm b/interface/web/sites/templates/web_childdomain_edit.htm
index b0e0ebd..2f1472c 100644
--- a/interface/web/sites/templates/web_childdomain_edit.htm
+++ b/interface/web/sites/templates/web_childdomain_edit.htm
@@ -1,94 +1,91 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_web_childdomain">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
+
<tmpl_if name="childdomain_type" value="subdomain">
<tmpl_if name="domain_option">
- <div class="ctrlHolder">
- <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
- <select id="parent_domain_id" name="parent_domain_id" class="selectInput formLengthHalf">{tmpl_var name='parent_domain_id'}</select>
- </div>
+ <div class="form-group">
+ <label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='parent_domain_id_txt'}</label>
+ <div class="col-sm-9"><select id="parent_domain_id" name="parent_domain_id" class="form-control">{tmpl_var name='parent_domain_id'}</select>
+ </div></div>
</tmpl_if>
- <div class="ctrlHolder">
- <label for="domain">{tmpl_var name='host_txt'}</label>
- <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
- </div>
+ <div class="form-group">
+ <label for="domain" class="col-sm-3 control-label">{tmpl_var name='host_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="domain" id="domain" value="{tmpl_var name='domain'}" class="form-control" />
+ </div></div>
<tmpl_if name="domain_option">
- <div class="ctrlHolder">
- <label for="sel_domain">{tmpl_var name='domain_txt'}</label>
- <select name="sel_domain" id="sel_domain" class="selectInput">
+ <div class="form-group">
+ <label for="sel_domain" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}</label>
+ <div class="col-sm-9"><select name="sel_domain" id="sel_domain" class="form-control">
{tmpl_var name='domain_option'}
</select>
- </div>
+ </div></div>
<tmpl_else>
- <div class="ctrlHolder">
- <label for="parent_domain_id">{tmpl_var name='domain_txt'}</label>
- <select id="parent_domain_id" name="parent_domain_id" class="selectInput formLengthHalf">{tmpl_var name='parent_domain_id'}</select>
- </div>
+ <div class="form-group">
+ <label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}</label>
+ <div class="col-sm-9"><select id="parent_domain_id" name="parent_domain_id" class="form-control">{tmpl_var name='parent_domain_id'}</select>
+ </div></div>
</tmpl_if>
<tmpl_else>
- <div class="ctrlHolder">
+ <div class="form-group">
<tmpl_if name="domain_option">
- <label for="domain">{tmpl_var name='domain_txt'}</label>
- <select name="domain" id="domain" class="selectInput">
+ <label for="domain" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}</label>
+ <div class="col-sm-9"><select name="domain" id="domain" class="form-control">
{tmpl_var name='domain_option'}
</select>
- <tmpl_else>
- <label for="domain">{tmpl_var name='domain_txt'}</label>
- <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
- </tmpl_if>
+ </div><tmpl_else>
+ <label for="domain" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="domain" id="domain" value="{tmpl_var name='domain'}" class="form-control" />
+ </div></tmpl_if>
</div>
- <div class="ctrlHolder">
- <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
- <select id="parent_domain_id" name="parent_domain_id" class="selectInput">
+ <div class="form-group">
+ <label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='parent_domain_id_txt'}</label>
+ <div class="col-sm-9"><select id="parent_domain_id" name="parent_domain_id" class="form-control">
{tmpl_var name='parent_domain_id'}
</select>
- </div>
+ </div></div>
</tmpl_if>
- <div class="ctrlHolder">
- <label for="redirect_type">{tmpl_var name='redirect_type_txt'}</label>
- <select name="redirect_type" id="redirect_type" class="selectInput formLengthHalf">
+ <div class="form-group">
+ <label for="redirect_type" class="col-sm-3 control-label">{tmpl_var name='redirect_type_txt'}</label>
+ <div class="col-sm-9"><select name="redirect_type" id="redirect_type" class="form-control">
{tmpl_var name='redirect_type'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="redirect_path">{tmpl_var name='redirect_path_txt'}</label>
- <input name="redirect_path" id="redirect_path" value="{tmpl_var name='redirect_path'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
+ </div></div>
+ <div class="form-group">
+ <label for="redirect_path" class="col-sm-3 control-label">{tmpl_var name='redirect_path_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="redirect_path" id="redirect_path" value="{tmpl_var name='redirect_path'}" class="form-control" />
+ </div></div>
<tmpl_if name="childdomain_type" value="aliasdomain">
- <div class="ctrlHolder">
- <label for="subdomain">{tmpl_var name='subdomain_txt'}</label>
- <select name="subdomain" id="subdomain" class="selectInput formLengthHalf">
+ <div class="form-group">
+ <label for="subdomain" class="col-sm-3 control-label">{tmpl_var name='subdomain_txt'}</label>
+ <div class="col-sm-9"><select name="subdomain" id="subdomain" class="form-control">
{tmpl_var name='subdomain'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="seo_redirect">{tmpl_var name='seo_redirect_txt'}</label>
- <select name="seo_redirect" id="seo_redirect" class="selectInput">
+ </div></div>
+ <div class="form-group">
+ <label for="seo_redirect" class="col-sm-3 control-label">{tmpl_var name='seo_redirect_txt'}</label>
+ <div class="col-sm-9"><select name="seo_redirect" id="seo_redirect" class="form-control">
{tmpl_var name='seo_redirect'}
</select>
- </div>
+ </div></div>
</tmpl_if>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_childdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_childdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_childdomain_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="sites/web_childdomain_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
<script language="JavaScript" type="text/javascript">
var webId = jQuery('#parent_domain_id').val();
var serverId;
diff --git a/interface/web/sites/templates/web_childdomain_list.htm b/interface/web/sites/templates/web_childdomain_list.htm
index 0895769..fa16ce8 100644
--- a/interface/web/sites/templates/web_childdomain_list.htm
+++ b/interface/web/sites/templates/web_childdomain_list.htm
@@ -1,9 +1,9 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_web_childdomain">
- <div class="pnl_toolsarea">
<tmpl_if name='datalog_changes_count' op='>' value='0'>
<div>
<div class="systemmonitor-state state-info">
@@ -20,45 +20,45 @@
</div><br />
</div>
</tmpl_if>
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/web_childdomain_edit.php?type={tmpl_var name='childdomain_type'}');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="sites/web_childdomain_edit.php?type={tmpl_var name='childdomain_type'}">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
- <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="active_txt"></th>
+ <th><tmpl_var name="server_id_txt"></th>
+ <th><tmpl_var name="parent_domain_id_txt"></th>
+ <th><tmpl_var name="domain_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
- <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/web_childdomain_list.php?type={tmpl_var name="childdomain_type"}');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <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><div class="col-sm-9"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/web_childdomain_list.php?type={tmpl_var name="childdomain_type"}');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('sites/web_childdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('sites/web_childdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_parent_domain_id"><a href="#" onclick="loadContent('sites/web_childdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
- <td class="tbl_col_domain"><a href="#" onclick="loadContent('sites/web_childdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="domain"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="sites/web_childdomain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
+ <td><a href="#" data-load-content="sites/web_childdomain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -70,11 +70,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+ <td colspan="5"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/sites/templates/web_directive_snippets.htm b/interface/web/sites/templates/web_directive_snippets.htm
index 664a07f..e89581f 100644
--- a/interface/web/sites/templates/web_directive_snippets.htm
+++ b/interface/web/sites/templates/web_directive_snippets.htm
@@ -1,9 +1,9 @@
-<div class="ctrlHolder">
- <label for="directive_snippets_id">
+<div class="form-group">
+ <label for="directive_snippets_id" class="col-sm-3 control-label">
{tmpl_var name='directive_snippets_id_txt'}
</label>
- <select name="directive_snippets_id" id="directive_snippets_id" class="selectInput formLengthHalf">
+ <div class="col-sm-9"><select name="directive_snippets_id" id="directive_snippets_id" class="form-control">
<option value="0"></option>
<tmpl_loop name="records">
<option {tmpl_if name='is_selected' op='==' value='true'}selected="selected" {/tmpl_if}value="{tmpl_var name='directive_snippets_id'}">
@@ -11,4 +11,4 @@
</option>
</tmpl_loop>
</select>
-</div>
\ No newline at end of file
+</div></div>
\ No newline at end of file
diff --git a/interface/web/sites/templates/web_folder_edit.htm b/interface/web/sites/templates/web_folder_edit.htm
index a5dc3b9..53ff196 100644
--- a/interface/web/sites/templates/web_folder_edit.htm
+++ b/interface/web/sites/templates/web_folder_edit.htm
@@ -1,34 +1,31 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_web_folder">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>Folder</legend>
- <div class="ctrlHolder">
- <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
- <select name="parent_domain_id" id="parent_domain_id" class="selectInput">
+ <legend>Folder</legend>
+ <div class="form-group">
+ <label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='parent_domain_id_txt'}</label>
+ <div class="col-sm-9"><select name="parent_domain_id" id="parent_domain_id" class="form-control">
{tmpl_var name='parent_domain_id'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="path">{tmpl_var name='path_txt'}</label>
- <input name="path" id="path" value="{tmpl_var name='path'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ </div></div>
+ <div class="form-group">
+ <label for="path" class="col-sm-3 control-label">{tmpl_var name='path_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="path" id="path" value="{tmpl_var name='path'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_folder_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_folder_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_folder_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="sites/web_folder_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
diff --git a/interface/web/sites/templates/web_folder_list.htm b/interface/web/sites/templates/web_folder_list.htm
index 9a274b5..0dfa379 100644
--- a/interface/web/sites/templates/web_folder_list.htm
+++ b/interface/web/sites/templates/web_folder_list.htm
@@ -1,8 +1,8 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
-<div class="panel panel_list_web_folder">
- <div class="pnl_toolsarea">
<tmpl_if name='datalog_changes_count' op='>' value='0'>
<div>
<div class="systemmonitor-state state-info">
@@ -19,45 +19,45 @@
</div><br />
</div>
</tmpl_if>
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/web_folder_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="sites/web_folder_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
- <th class="tbl_col_path" scope="col"><tmpl_var name="path_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="active_txt"></th>
+ <th><tmpl_var name="server_id_txt"></th>
+ <th><tmpl_var name="parent_domain_id_txt"></th>
+ <th><tmpl_var name="path_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','sites/web_folder_list.php');">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','sites/web_folder_list.php');">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id" onChange="submitForm('pageForm','sites/web_folder_list.php');">{tmpl_var name='search_parent_domain_id'}</select></td>
- <td class="tbl_col_path"><input type="text" name="search_path" value="{tmpl_var name='search_path'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/web_folder_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <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><div class="col-sm-9"><input type="text" name="search_path" value="{tmpl_var name='search_path'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/web_folder_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('sites/web_folder_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('sites/web_folder_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_parent_domain_id"><a href="#" onclick="loadContent('sites/web_folder_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
- <td class="tbl_col_path"><a href="#" onclick="loadContent('sites/web_folder_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="path"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="sites/web_folder_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
+ <td><a href="#" data-load-content="sites/web_folder_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -69,11 +69,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+ <td colspan="5"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/sites/templates/web_folder_user_edit.htm b/interface/web/sites/templates/web_folder_user_edit.htm
index 7defdde..eed5e8a 100644
--- a/interface/web/sites/templates/web_folder_user_edit.htm
+++ b/interface/web/sites/templates/web_folder_user_edit.htm
@@ -1,49 +1,46 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_web_folder_user">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>Folder</legend>
- <div class="ctrlHolder">
- <label for="web_folder_id">{tmpl_var name='web_folder_id_txt'}</label>
- <select name="web_folder_id" id="web_folder_id" class="selectInput">
+ <legend>Folder</legend>
+ <div class="form-group">
+ <label for="web_folder_id" class="col-sm-3 control-label">{tmpl_var name='web_folder_id_txt'}</label>
+ <div class="col-sm-9"><select name="web_folder_id" id="web_folder_id" class="form-control">
{tmpl_var name='web_folder_id'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="username">{tmpl_var name='username_txt'}</label>
- <input name="username" id="username" value="{tmpl_var name='username'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="password">{tmpl_var name='password_txt'}</label>
+ </div></div>
+ <div class="form-group">
+ <label for="username" class="col-sm-3 control-label">{tmpl_var name='username_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="username" id="username" value="{tmpl_var name='username'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="password" class="col-sm-3 control-label">{tmpl_var name='password_txt'}</label>
<input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" /> <a href="javascript:void(0);" onclick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='password_strength_txt'}</p>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='password_strength_txt'}</label>
<div id="passBar"></div>
<p class="formHint"><span id="passText"> </span></p>
</div>
- <div class="ctrlHolder">
- <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+ <div class="form-group">
+ <label for="repeat_password" class="col-sm-3 control-label">{tmpl_var name='repeat_password_txt'}</label>
<input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;" autocomplete="off" onkeyup="checkPassMatch('password','repeat_password');" />
</div>
<div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
<div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_folder_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_folder_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_folder_user_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="sites/web_folder_user_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
diff --git a/interface/web/sites/templates/web_folder_user_list.htm b/interface/web/sites/templates/web_folder_user_list.htm
index 500c647..ed49976 100644
--- a/interface/web/sites/templates/web_folder_user_list.htm
+++ b/interface/web/sites/templates/web_folder_user_list.htm
@@ -1,8 +1,8 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
-<div class="panel panel_list_web_folder_user">
- <div class="pnl_toolsarea">
<tmpl_if name='datalog_changes_count' op='>' value='0'>
<div>
<div class="systemmonitor-state state-info">
@@ -19,42 +19,42 @@
</div><br />
</div>
</tmpl_if>
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/web_folder_user_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="sites/web_folder_user_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_web_folder_id" scope="col"><tmpl_var name="web_folder_id_txt"></th>
- <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="active_txt"></th>
+ <th><tmpl_var name="web_folder_id_txt"></th>
+ <th><tmpl_var name="username_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','sites/web_folder_user_list.php');">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_web_folder_id"><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 class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/web_folder_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><select name="search_active" onChange="submitForm('pageForm','sites/web_folder_user_list.php');">{tmpl_var name='search_active'}</select></td>
+ <td><select name="search_web_folder_id" onChange="submitForm('pageForm','sites/web_folder_user_list.php');">{tmpl_var name='search_web_folder_id'}</select></td>
+ <td><div class="col-sm-9"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/web_folder_user_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('sites/web_folder_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_web_folder_id"><a href="#" onclick="loadContent('sites/web_folder_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="web_folder_id"}</a></td>
- <td class="tbl_col_username"><a href="#" onclick="loadContent('sites/web_folder_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="sites/web_folder_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -66,11 +66,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="4"><tmpl_var name="paging"></td>
+ <td colspan="4"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/sites/templates/web_sites_stats_list.htm b/interface/web/sites/templates/web_sites_stats_list.htm
index 8a1241a..64fd474 100644
--- a/interface/web/sites/templates/web_sites_stats_list.htm
+++ b/interface/web/sites/templates/web_sites_stats_list.htm
@@ -1,40 +1,41 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_web_sites_stats">
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
- <th class="tbl_col_web_traffic_this_month" scope="col"><tmpl_var name="this_month_txt"></th>
- <th class="tbl_col_web_traffic_last_month" scope="col"><tmpl_var name="last_month_txt"></th>
- <th class="tbl_col_web_traffic_this_year" scope="col"><tmpl_var name="this_year_txt"></th>
- <th class="tbl_col_web_traffic_last_year" scope="col"><tmpl_var name="last_year_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="domain_txt"></th>
+ <th><tmpl_var name="this_month_txt"></th>
+ <th><tmpl_var name="last_month_txt"></th>
+ <th><tmpl_var name="this_year_txt"></th>
+ <th><tmpl_var name="last_year_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
- <td class="tbl_col_this_month"></td>
- <td class="tbl_col_last_month"></td>
- <td class="tbl_col_this_year"></td>
- <td class="tbl_col_last_year"></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/web_sites_stats.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><div class="col-sm-9"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></div></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>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_domain"><a target="_blank" href="http://{tmpl_var name="domain"}/stats">{tmpl_var name="domain"}</a></td>
- <td class="tbl_col_this_month"><a href="#" onclick="loadContent('sites/web_<tmpl_if name='type' op='==' value='vhostsubdomain'>vhost_sub</tmpl_if><tmpl_if name='type' op='==' value='vhostalias'>vhost_alias</tmpl_if>domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="this_month"} MB</a></td>
- <td class="tbl_col_last_month"><a href="#" onclick="loadContent('sites/web_<tmpl_if name='type' op='==' value='vhostsubdomain'>vhost_sub</tmpl_if><tmpl_if name='type' op='==' value='vhostalias'>vhost_alias</tmpl_if>domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="last_month"} MB</a></td>
- <td class="tbl_col_this_year"><a href="#" onclick="loadContent('sites/web_<tmpl_if name='type' op='==' value='vhostsubdomain'>vhost_sub</tmpl_if><tmpl_if name='type' op='==' value='vhostalias'>vhost_alias</tmpl_if>domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="this_year"} MB</a></td>
- <td class="tbl_col_last_year"><a href="#" onclick="loadContent('sites/web_<tmpl_if name='type' op='==' value='vhostsubdomain'>vhost_sub</tmpl_if><tmpl_if name='type' op='==' value='vhostalias'>vhost_alias</tmpl_if>domain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="last_year"} MB</a></td>
- <td class="tbl_col_buttons"></td>
+ <td><a target="_blank" href="http://{tmpl_var name="domain"}/stats">{tmpl_var name="domain"}</a></td>
+ <td><a href="#" data-load-content="sites/web_<tmpl_if name='type' op='==' value='vhostsubdomain'>vhost_sub</tmpl_if><tmpl_if name='type' op='==' value='vhostalias'>vhost_alias</tmpl_if>domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="this_month"} MB</a></td>
+ <td><a href="#" data-load-content="sites/web_<tmpl_if name='type' op='==' value='vhostsubdomain'>vhost_sub</tmpl_if><tmpl_if name='type' op='==' value='vhostalias'>vhost_alias</tmpl_if>domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="last_month"} MB</a></td>
+ <td><a href="#" data-load-content="sites/web_<tmpl_if name='type' op='==' value='vhostsubdomain'>vhost_sub</tmpl_if><tmpl_if name='type' op='==' value='vhostalias'>vhost_alias</tmpl_if>domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="this_year"} MB</a></td>
+ <td><a href="#" data-load-content="sites/web_<tmpl_if name='type' op='==' value='vhostsubdomain'>vhost_sub</tmpl_if><tmpl_if name='type' op='==' value='vhostalias'>vhost_alias</tmpl_if>domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="last_year"} MB</a></td>
+ <td></td>
</tr>
</tmpl_loop>
<tmpl_unless name="records">
@@ -43,21 +44,20 @@
</tr>
</tmpl_unless>
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_domain"><a href="#" onclick="return false;" style="font-weight:bold;">{tmpl_var name="sum_txt"}</a></td>
- <td class="tbl_col_this_month"><a href="#" onclick="return false;" style="font-weight:bold;">{tmpl_var name="sum_this_month"} MB</a></td>
- <td class="tbl_col_last_month"><a href="#" onclick="return false;" style="font-weight:bold;">{tmpl_var name="sum_last_month"} MB</a></td>
- <td class="tbl_col_this_year"><a href="#" onclick="return false;" style="font-weight:bold;">{tmpl_var name="sum_this_year"} MB</a></td>
- <td class="tbl_col_last_year"><a href="#" onclick="return false;" style="font-weight:bold;">{tmpl_var name="sum_last_year"} MB</a></td>
- <td class="tbl_col_buttons"></td>
+ <td><a href="#" onclick="return false;" style="font-weight:bold;">{tmpl_var name="sum_txt"}</a></td>
+ <td><a href="#" onclick="return false;" style="font-weight:bold;">{tmpl_var name="sum_this_month"} MB</a></td>
+ <td><a href="#" onclick="return false;" style="font-weight:bold;">{tmpl_var name="sum_last_month"} MB</a></td>
+ <td><a href="#" onclick="return false;" style="font-weight:bold;">{tmpl_var name="sum_this_year"} MB</a></td>
+ <td><a href="#" onclick="return false;" style="font-weight:bold;">{tmpl_var name="sum_last_year"} MB</a></td>
+ <td></td>
</tr>
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+ <td colspan="6"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
</div>
+
+ </div>
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 1ec96a6..c27caab 100644
--- a/interface/web/sites/templates/web_vhost_domain_admin_list.htm
+++ b/interface/web/sites/templates/web_vhost_domain_admin_list.htm
@@ -1,53 +1,53 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
-<div class="panel panel_list_web_vhost_domain_admin">
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/web_vhost_domain_edit.php?type={tmpl_var name='vhostdomain_type'}');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="sites/web_vhost_domain_edit.php?type={tmpl_var name='vhostdomain_type'}">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <tmpl_if name="vhostdomain_type" value="domain"><th class="tbl_col_domain_id" scope="col"><tmpl_var name="domain_id_txt"></th></tmpl_if>
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_sys_groupid" scope="col"><tmpl_var name="sys_groupid_txt"></th>
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <tmpl_if name="vhostdomain_type" op="!=" value="domain"><th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th></tmpl_if>
- <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <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>
+ <th><tmpl_var name="sys_groupid_txt"></th>
+ <th><tmpl_var name="server_id_txt"></th>
+ <tmpl_if name="vhostdomain_type" op="!=" value="domain"><th><tmpl_var name="parent_domain_id_txt"></th></tmpl_if>
+ <th><tmpl_var name="domain_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <tmpl_if name="vhostdomain_type" value="domain"><td class="tbl_col_domain_id"><input type="text" size="5" name="search_domain_id" value="{tmpl_var name='search_domain_id'}" /></td></tmpl_if>
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_sys_groupid"><select name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <tmpl_if name="vhostdomain_type" op="!=" value="domain"><td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td></tmpl_if>
- <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/web_vhost_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <tmpl_if name="vhostdomain_type" value="domain"><td><div class="col-sm-9"><input type="text" name="search_domain_id" value="{tmpl_var name='search_domain_id'}" /></div></td></tmpl_if>
+ <td><select name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select name="search_sys_groupid">{tmpl_var name='search_sys_groupid'}</select></td>
+ <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <tmpl_if name="vhostdomain_type" op="!=" value="domain"><td><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td></tmpl_if>
+ <td><div class="col-sm-9"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/web_vhost_domain_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <tmpl_if name="vhostdomain_type" value="domain"><td class="tbl_col_domain_id"><a href="#" onclick="loadContent('sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}&type={tmpl_var name='vhostdomain_type'}');">{tmpl_var name="domain_id"}</a></td></tmpl_if>
- <td class="tbl_col_active"><a href="#" onclick="loadContent('sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}&type={tmpl_var name='vhostdomain_type'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_sys_groupid"><a href="#" onclick="loadContent('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 class="tbl_col_server_id"><a href="#" onclick="loadContent('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 class="tbl_col_parent_domain_id"><a href="#" onclick="loadContent('sites/web_vhost_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td></tmpl_if>
- <td class="tbl_col_domain"><a href="#" onclick="loadContent('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="button icons16 icoLink"><span>Link</span></a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <tmpl_if name="vhostdomain_type" value="domain"><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_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="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="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 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>
</td>
</tr>
</tmpl_loop>
@@ -59,11 +59,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+ <td colspan="6"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/sites/templates/web_vhost_domain_advanced.htm b/interface/web/sites/templates/web_vhost_domain_advanced.htm
index 8529819..4e97410 100644
--- a/interface/web/sites/templates/web_vhost_domain_advanced.htm
+++ b/interface/web/sites/templates/web_vhost_domain_advanced.htm
@@ -1,4 +1,6 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
<tmpl_if name="config_error_msg">
@@ -10,105 +12,100 @@
</div>
</tmpl_if>
-<div class="panel panel_web_domain">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
+
<input name="document_root" id="document_root" value="{tmpl_var name='document_root'}" size="30" maxlength="255" type="hidden" class="textInput" />
- <div class="ctrlHolder">
- <label for="added_date">{tmpl_var name='added_date_txt'}</label>
- <input name="added_date" id="added_date" value="{tmpl_var name='added_date'}" size="10" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="added_by">{tmpl_var name='added_by_txt'}</label>
- <input name="added_by" id="added_by" value="{tmpl_var name='added_by'}" size="10" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="system_user">{tmpl_var name='system_user_txt'}</label>
- <label for="system_user">{tmpl_var name='system_user'}</label>
+ <div class="form-group">
+ <label for="added_date" class="col-sm-3 control-label">{tmpl_var name='added_date_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="added_date" id="added_date" value="{tmpl_var name='added_date'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="added_by" class="col-sm-3 control-label">{tmpl_var name='added_by_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="added_by" id="added_by" value="{tmpl_var name='added_by'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="system_user" class="col-sm-3 control-label">{tmpl_var name='system_user_txt'}</label>
+ <label for="system_user" class="col-sm-3 control-label">{tmpl_var name='system_user'}</label>
<input name="system_user" id="system_user" value="{tmpl_var name='system_user'}" type="hidden" />
</div>
- <div class="ctrlHolder">
- <label for="system_group">{tmpl_var name='system_group_txt'}</label>
- <label for="system_group">{tmpl_var name='system_group'}</label>
+ <div class="form-group">
+ <label for="system_group" class="col-sm-3 control-label">{tmpl_var name='system_group_txt'}</label>
+ <label for="system_group" class="col-sm-3 control-label">{tmpl_var name='system_group'}</label>
<input name="system_group" id="system_group" value="{tmpl_var name='system_group'}" type="hidden" />
</div>
- <div class="ctrlHolder apache">
- <label for="allow_override">{tmpl_var name='allow_override_txt'}</label>
- <input name="allow_override" id="allow_override" value="{tmpl_var name='allow_override'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
+ <div class="form-group apache">
+ <label for="allow_override" class="col-sm-3 control-label">{tmpl_var name='allow_override_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="allow_override" id="allow_override" value="{tmpl_var name='allow_override'}" class="form-control" />
+ </div></div>
<div class="phpfpm">
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='php_fpm_use_socket_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='php_fpm_use_socket_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='php_fpm_use_socket'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="pm">{tmpl_var name='pm_txt'}</label>
- <select name="pm" id="pm" class="selectInput">
+ <div class="form-group">
+ <label for="pm" class="col-sm-3 control-label">{tmpl_var name='pm_txt'}</label>
+ <div class="col-sm-9"><select name="pm" id="pm" class="form-control">
{tmpl_var name='pm'}
</select>
- </div>
+ </div></div>
<div class="ctrlHolder pm_ondemand" style="background: #ffdfdf; border: 1px solid #df7d7d; border-width: 1px 0; margin: 1.5em 0 1.5em 0; padding: 7px;">
{tmpl_var name='pm_ondemand_hint_txt'}
</div>
- <div class="ctrlHolder">
- <label for="pm_max_children">{tmpl_var name='pm_max_children_txt'}</label>
- <input name="pm_max_children" id="pm_max_children" value="{tmpl_var name='pm_max_children'}" size="6" maxlength="6" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder pm_dynamic">
- <label for="pm_start_servers">{tmpl_var name='pm_start_servers_txt'}</label>
- <input name="pm_start_servers" id="pm_start_servers" value="{tmpl_var name='pm_start_servers'}" size="6" maxlength="6" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder pm_dynamic">
- <label for="pm_min_spare_servers">{tmpl_var name='pm_min_spare_servers_txt'}</label>
- <input name="pm_min_spare_servers" id="pm_min_spare_servers" value="{tmpl_var name='pm_min_spare_servers'}" size="6" maxlength="6" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder pm_dynamic">
- <label for="pm_max_spare_servers">{tmpl_var name='pm_max_spare_servers_txt'}</label>
- <input name="pm_max_spare_servers" id="pm_max_spare_servers" value="{tmpl_var name='pm_max_spare_servers'}" size="6" maxlength="6" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder pm_ondemand">
- <label for="pm_process_idle_timeout">{tmpl_var name='pm_process_idle_timeout_txt'}</label>
- <input name="pm_process_idle_timeout" id="pm_process_idle_timeout" value="{tmpl_var name='pm_process_idle_timeout'}" size="6" maxlength="6" type="text" class="textInput formLengthLimit" /> s
- </div>
- <div class="ctrlHolder">
- <label for="pm_max_requests">{tmpl_var name='pm_max_requests_txt'}</label>
- <input name="pm_max_requests" id="pm_max_requests" value="{tmpl_var name='pm_max_requests'}" size="6" maxlength="6" type="text" class="textInput formLengthLimit" />
- </div>
+ <div class="form-group">
+ <label for="pm_max_children" class="col-sm-3 control-label">{tmpl_var name='pm_max_children_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="pm_max_children" id="pm_max_children" value="{tmpl_var name='pm_max_children'}" class="form-control" />
+ </div></div>
+ <div class="form-group pm_dynamic">
+ <label for="pm_start_servers" class="col-sm-3 control-label">{tmpl_var name='pm_start_servers_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="pm_start_servers" id="pm_start_servers" value="{tmpl_var name='pm_start_servers'}" class="form-control" />
+ </div></div>
+ <div class="form-group pm_dynamic">
+ <label for="pm_min_spare_servers" class="col-sm-3 control-label">{tmpl_var name='pm_min_spare_servers_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="pm_min_spare_servers" id="pm_min_spare_servers" value="{tmpl_var name='pm_min_spare_servers'}" class="form-control" />
+ </div></div>
+ <div class="form-group pm_dynamic">
+ <label for="pm_max_spare_servers" class="col-sm-3 control-label">{tmpl_var name='pm_max_spare_servers_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="pm_max_spare_servers" id="pm_max_spare_servers" value="{tmpl_var name='pm_max_spare_servers'}" class="form-control" />
+ </div></div>
+ <div class="form-group pm_ondemand">
+ <label for="pm_process_idle_timeout" class="col-sm-3 control-label">{tmpl_var name='pm_process_idle_timeout_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="pm_process_idle_timeout" id="pm_process_idle_timeout" value="{tmpl_var name='pm_process_idle_timeout'}" class="form-control" /> s
+ </div></div>
+ <div class="form-group">
+ <label for="pm_max_requests" class="col-sm-3 control-label">{tmpl_var name='pm_max_requests_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="pm_max_requests" id="pm_max_requests" value="{tmpl_var name='pm_max_requests'}" class="form-control" />
+ </div></div>
</div>
- <div class="ctrlHolder php">
- <label for="php_open_basedir">{tmpl_var name='php_open_basedir_txt'}</label>
- <input name="php_open_basedir" id="php_open_basedir" value="{tmpl_var name='php_open_basedir'}" size="30" type="text" class="textInput" style="width:400px;" />
- </div>
- <div class="ctrlHolder php">
- <label for="custom_php_ini">{tmpl_var name='custom_php_ini_txt'}</label>
+ <div class="form-group php">
+ <label for="php_open_basedir" class="col-sm-3 control-label">{tmpl_var name='php_open_basedir_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="php_open_basedir" id="php_open_basedir" value="{tmpl_var name='php_open_basedir'}" class="form-control" style="width:400px;" />
+ </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>
<textarea name="custom_php_ini" id="custom_php_ini" rows='10' cols='50' style="width:400px;">{tmpl_var name='custom_php_ini'}</textarea> <b>{tmpl_var name="available_php_directive_snippets_txt"}</b><br><br> {tmpl_var name="php_directive_snippets_txt"}
</div>
- <div class="ctrlHolder apache">
- <label for="apache_directives">{tmpl_var name='apache_directives_txt'}</label>
+ <div class="form-group apache">
+ <label for="apache_directives" class="col-sm-3 control-label">{tmpl_var name='apache_directives_txt'}</label>
<textarea name="apache_directives" id="apache_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='apache_directives'}</textarea> <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="ctrlHolder nginx">
- <label for="nginx_directives">{tmpl_var name='nginx_directives_txt'}</label>
+ <div class="form-group nginx">
+ <label for="nginx_directives" class="col-sm-3 control-label">{tmpl_var name='nginx_directives_txt'}</label>
<textarea name="nginx_directives" id="nginx_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='nginx_directives'}</textarea> <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="ctrlHolder proxy">
- <label for="proxy_directives">{tmpl_var name='proxy_directives_txt'}</label>
+ <div class="form-group proxy">
+ <label for="proxy_directives" class="col-sm-3 control-label">{tmpl_var name='proxy_directives_txt'}</label>
<textarea name="proxy_directives" id="proxy_directives" rows='10' cols='50' style="width:400px;">{tmpl_var name='proxy_directives'}</textarea> <b>{tmpl_var name="available_proxy_directive_snippets_txt"}</b><br><br> {tmpl_var name="proxy_directive_snippets_txt"}
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_vhost_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_domain_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="sites/web_vhost_domain_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
<script language="JavaScript" type="text/javascript">
var webId = jQuery('input[name="id"]').val();
var serverId;
diff --git a/interface/web/sites/templates/web_vhost_domain_backup.htm b/interface/web/sites/templates/web_vhost_domain_backup.htm
index 7f573b8..63d645c 100644
--- a/interface/web/sites/templates/web_vhost_domain_backup.htm
+++ b/interface/web/sites/templates/web_vhost_domain_backup.htm
@@ -1,4 +1,6 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
<tmpl_if name="config_error_msg">
@@ -10,36 +12,31 @@
</div>
</tmpl_if>
-<div class="panel panel_web_domain">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>Backup</legend>
- <div class="ctrlHolder">
- <label for="backup_interval">{tmpl_var name='backup_interval_txt'}</label>
- <select name="backup_interval" id="backup_interval" class="selectInput">
+ <legend>Backup</legend>
+ <div class="form-group">
+ <label for="backup_interval" class="col-sm-3 control-label">{tmpl_var name='backup_interval_txt'}</label>
+ <div class="col-sm-9"><select name="backup_interval" id="backup_interval" class="form-control">
{tmpl_var name='backup_interval'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="backup_copies">{tmpl_var name='backup_copies_txt'}</label>
- <select name="backup_copies" id="backup_copies" class="selectInput">
+ </div></div>
+ <div class="form-group">
+ <label for="backup_copies" class="col-sm-3 control-label">{tmpl_var name='backup_copies_txt'}</label>
+ <div class="col-sm-9"><select name="backup_copies" id="backup_copies" class="form-control">
{tmpl_var name='backup_copies'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="backup_excludes">{tmpl_var name='backup_excludes_txt'}</label>
- <input name="backup_excludes" id="backup_excludes" value="{tmpl_var name='backup_excludes'}" size="30" type="text" class="textInput" /> {tmpl_var name='backup_excludes_note_txt'}
- </div>
- </fieldset>
+ </div></div>
+ <div class="form-group">
+ <label for="backup_excludes" class="col-sm-3 control-label">{tmpl_var name='backup_excludes_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="backup_excludes" id="backup_excludes" value="{tmpl_var name='backup_excludes'}" class="form-control" /> {tmpl_var name='backup_excludes_note_txt'}
+ </div></div>
+
{tmpl_var name='backup_records'}
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_vhost_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_domain_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="sites/web_vhost_domain_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/sites/templates/web_vhost_domain_edit.htm b/interface/web/sites/templates/web_vhost_domain_edit.htm
index 6548e82..369df18 100644
--- a/interface/web/sites/templates/web_vhost_domain_edit.htm
+++ b/interface/web/sites/templates/web_vhost_domain_edit.htm
@@ -1,4 +1,6 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
<tmpl_if name="config_error_msg">
@@ -10,233 +12,228 @@
</div>
</tmpl_if>
-<div class="panel panel_web_domain">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
+
<tmpl_if name="vhostdomain_type" value="domain">
<tmpl_if name="is_admin">
- <div class="ctrlHolder">
+ <div class="form-group">
<tmpl_if name="edit_disabled">
- <label for="server_id_disabled">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id_disabled" id="server_id_disabled" class="selectInput" disabled="disabled">
+ <label for="server_id_disabled" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id_disabled" id="server_id_disabled" class="form-control" disabled="disabled">
{tmpl_var name='server_id'}
</select>
- <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+ </div><input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
<tmpl_else>
- <label for="server_id">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id" id="server_id" class="selectInput">
+ <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
{tmpl_var name='server_id'}
</select>
- </tmpl_if>
+ </div></tmpl_if>
</div>
<tmpl_unless name="domain_option">
- <div class="ctrlHolder">
- <label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
- <select name="client_group_id" id="client_group_id" class="selectInput">
+ <div class="form-group">
+ <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_group_id_txt'}</label>
+ <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
{tmpl_var name='client_group_id'}
</select>
- </div>
+ </div></div>
</tmpl_unless>
<tmpl_else>
<tmpl_if name="only_one_server">
<input type="hidden" id="server_id" name="server_id" value="{tmpl_var name='server_id_value'}" />
<tmpl_else>
- <div class="ctrlHolder">
+ <div class="form-group">
<tmpl_if name="edit_disabled">
- <label for="server_id_disabled">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id_disabled" id="server_id_disabled" class="selectInput" disabled="disabled">
+ <label for="server_id_disabled" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id_disabled" id="server_id_disabled" class="form-control" disabled="disabled">
{tmpl_var name='server_id'}
</select>
- <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+ </div><input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
<tmpl_else>
- <label for="server_id">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id" id="server_id" class="selectInput">
+ <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
{tmpl_var name='server_id'}
</select>
- </tmpl_if>
+ </div></tmpl_if>
</div>
</tmpl_if>
</tmpl_if>
<tmpl_if name="is_reseller">
<tmpl_unless name="domain_option">
- <div class="ctrlHolder">
- <label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
- <select name="client_group_id" id="client_group_id" class="selectInput">
+ <div class="form-group">
+ <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_group_id_txt'}</label>
+ <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
{tmpl_var name='client_group_id'}
</select>
- </div>
+ </div></div>
</tmpl_unless>
</tmpl_if>
- <div class="ctrlHolder">
- <label for="ip_address">{tmpl_var name='ip_address_txt'}</label>
- <select name="ip_address" id="ip_address" class="selectInput formLengthIPv4">
+ <div class="form-group">
+ <label for="ip_address" class="col-sm-3 control-label">{tmpl_var name='ip_address_txt'}</label>
+ <div class="col-sm-9"><select name="ip_address" id="ip_address" class="form-control">
{tmpl_var name='ip_address'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="ipv6_address">{tmpl_var name='ipv6_address_txt'}</label>
- <select name="ipv6_address" id="ipv6_address" class="selectInput formLengthIPv6">
+ </div></div>
+ <div class="form-group">
+ <label for="ipv6_address" class="col-sm-3 control-label">{tmpl_var name='ipv6_address_txt'}</label>
+ <div class="col-sm-9"><select name="ipv6_address" id="ipv6_address" class="form-control">
{tmpl_var name='ipv6_address'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="domain">{tmpl_var name='domain_txt'}</label>
+ </div></div>
+ <div class="form-group">
+ <label for="domain" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}</label>
<tmpl_if name="domain_option">
- <select name="domain" id="domain" class="selectInput">
+ <div class="col-sm-9"><select name="domain" id="domain" class="form-control">
{tmpl_var name='domain_option'}
</select>
- <tmpl_else>
- <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
- </tmpl_if>
+ </div><tmpl_else>
+ <div class="col-sm-9"><input type="text" name="domain" id="domain" value="{tmpl_var name='domain'}" class="form-control" />
+ </div></tmpl_if>
</div>
- <div class="ctrlHolder">
- <label for="hd_quota">{tmpl_var name='hd_quota_txt'}</label>
- <input name="hd_quota" id="hd_quota" value="{tmpl_var name='hd_quota'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /> MB
- </div>
+ <div class="form-group">
+ <label for="hd_quota" class="col-sm-3 control-label">{tmpl_var name='hd_quota_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="hd_quota" id="hd_quota" value="{tmpl_var name='hd_quota'}" class="form-control" /> MB
+ </div></div>
</tmpl_if>
<tmpl_if name="vhostdomain_type" value="subdomain">
<input type="hidden" name="server_id" id="server_id" value="{tmpl_var name='server_id_value'}" />
<tmpl_if name="domain_option">
- <div class="ctrlHolder">
- <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
- <select id="parent_domain_id" name="parent_domain_id" class="selectInput formLengthHalf">{tmpl_var name='parent_domain_id'}</select>
- </div>
+ <div class="form-group">
+ <label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='parent_domain_id_txt'}</label>
+ <div class="col-sm-9"><select id="parent_domain_id" name="parent_domain_id" class="form-control">{tmpl_var name='parent_domain_id'}</select>
+ </div></div>
</tmpl_if>
- <div class="ctrlHolder">
- <label for="domain">{tmpl_var name='host_txt'}</label>
- <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
- </div>
+ <div class="form-group">
+ <label for="domain" class="col-sm-3 control-label">{tmpl_var name='host_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="domain" id="domain" value="{tmpl_var name='domain'}" class="form-control" />
+ </div></div>
<tmpl_if name="domain_option">
- <div class="ctrlHolder">
- <label for="sel_domain">{tmpl_var name='domain_txt'}</label>
- <select name="sel_domain" id="sel_domain" class="selectInput">
+ <div class="form-group">
+ <label for="sel_domain" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}</label>
+ <div class="col-sm-9"><select name="sel_domain" id="sel_domain" class="form-control">
{tmpl_var name='domain_option'}
</select>
- </div>
+ </div></div>
<tmpl_else>
- <div class="ctrlHolder">
- <label for="parent_domain_id">{tmpl_var name='domain_txt'}</label>
- <select id="parent_domain_id" name="parent_domain_id" class="selectInput formLengthHalf">{tmpl_var name='parent_domain_id'}</select>
- </div>
+ <div class="form-group">
+ <label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}</label>
+ <div class="col-sm-9"><select id="parent_domain_id" name="parent_domain_id" class="form-control">{tmpl_var name='parent_domain_id'}</select>
+ </div></div>
</tmpl_if>
- <div class="ctrlHolder">
- <label for="web_folder">{tmpl_var name='web_folder_txt'}</label>
- <input name="web_folder" id="web_folder" value="{tmpl_var name='web_folder'}" size="30" maxlength="100" type="text" class="textInput formLengthHalf"<tmpl_if name='fixed_folder' op='==' value='y'> readonly="readonly"</tmpl_if> />
+ <div class="form-group">
+ <label for="web_folder" class="col-sm-3 control-label">{tmpl_var name='web_folder_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="web_folder" id="web_folder" value="{tmpl_var name='web_folder'}" class="form-control"<tmpl_if name='fixed_folder' op='==' value='y'> readonly="readonly"</div></tmpl_if> />
</div>
</tmpl_if>
<tmpl_if name="vhostdomain_type" value="aliasdomain">
<input type="hidden" name="server_id" id="server_id" value="{tmpl_var name='server_id_value'}" />
- <div class="ctrlHolder">
- <label for="domain">{tmpl_var name='domain_txt'}</label>
+ <div class="form-group">
+ <label for="domain" class="col-sm-3 control-label">{tmpl_var name='domain_txt'}</label>
<tmpl_if name="domain_option">
- <select name="domain" id="domain" class="selectInput">
+ <div class="col-sm-9"><select name="domain" id="domain" class="form-control">
{tmpl_var name='domain_option'}
</select>
- <tmpl_else>
- <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
- </tmpl_if>
+ </div><tmpl_else>
+ <div class="col-sm-9"><input type="text" name="domain" id="domain" value="{tmpl_var name='domain'}" class="form-control" />
+ </div></tmpl_if>
</div>
- <div class="ctrlHolder">
- <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
- <select name="parent_domain_id" id="parent_domain_id" class="selectInput">
+ <div class="form-group">
+ <label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='parent_domain_id_txt'}</label>
+ <div class="col-sm-9"><select name="parent_domain_id" id="parent_domain_id" class="form-control">
{tmpl_var name='parent_domain_id'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="web_folder">{tmpl_var name='web_folder_txt'}</label>
- <input name="web_folder" id="web_folder" value="{tmpl_var name='web_folder'}" size="30" maxlength="100" type="text" class="textInput formLengthHalf"<tmpl_if name='fixed_folder' op='==' value='y'> readonly="readonly"</tmpl_if> />
+ </div></div>
+ <div class="form-group">
+ <label for="web_folder" class="col-sm-3 control-label">{tmpl_var name='web_folder_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="web_folder" id="web_folder" value="{tmpl_var name='web_folder'}" class="form-control"<tmpl_if name='fixed_folder' op='==' value='y'> readonly="readonly"</div></tmpl_if> />
</div>
</tmpl_if>
- <div class="ctrlHolder">
- <label for="traffic_quota">{tmpl_var name='traffic_quota_txt'}</label>
- <input name="traffic_quota" id="traffic_quota" value="{tmpl_var name='traffic_quota'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" /> MB <tmpl_var name='traffic_quota_exceeded_txt'>
+ <div class="form-group">
+ <label for="traffic_quota" class="col-sm-3 control-label">{tmpl_var name='traffic_quota_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="traffic_quota" id="traffic_quota" value="{tmpl_var name='traffic_quota'}" class="form-control" /> MB </div><tmpl_var name='traffic_quota_exceeded_txt'>
</div>
- <tmpl_if name="limit_cgi" op="==" value="y"><div class="ctrlHolder">
- <p class="label">{tmpl_var name='cgi_txt'}</p>
- <div class="multiField">
+ <tmpl_if name="limit_cgi" op="==" value="y"><div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='cgi_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='cgi'}
</div>
</div></tmpl_if>
- <tmpl_if name="limit_ssi" op="==" value="y"><div class="ctrlHolder">
- <p class="label">{tmpl_var name='ssi_txt'}</p>
- <div class="multiField">
+ <tmpl_if name="limit_ssi" op="==" value="y"><div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='ssi_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='ssi'}
</div>
</div></tmpl_if>
- <tmpl_if name="limit_perl" op="==" value="y"><div class="ctrlHolder apache">
- <p class="label">{tmpl_var name='perl_txt'}</p>
- <div class="multiField">
+ <tmpl_if name="limit_perl" op="==" value="y"><div class="form-group apache">
+ <label class="col-sm-3 control-label">{tmpl_var name='perl_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='perl'}
</div>
</div></tmpl_if>
- <tmpl_if name="limit_ruby" op="==" value="y"><div class="ctrlHolder apache">
- <p class="label">{tmpl_var name='ruby_txt'}</p>
- <div class="multiField">
+ <tmpl_if name="limit_ruby" op="==" value="y"><div class="form-group apache">
+ <label class="col-sm-3 control-label">{tmpl_var name='ruby_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='ruby'}
</div>
</div></tmpl_if>
- <tmpl_if name="limit_python" op="==" value="y"><div class="ctrlHolder apache">
- <p class="label">{tmpl_var name='python_txt'}</p>
- <div class="multiField">
+ <tmpl_if name="limit_python" op="==" value="y"><div class="form-group apache">
+ <label class="col-sm-3 control-label">{tmpl_var name='python_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='python'}
</div>
</div></tmpl_if>
- <tmpl_if name="force_suexec" op="==" value="n"><div class="ctrlHolder apache">
- <p class="label">{tmpl_var name='suexec_txt'}</p>
- <div class="multiField">
+ <tmpl_if name="force_suexec" op="==" value="n"><div class="form-group apache">
+ <label class="col-sm-3 control-label">{tmpl_var name='suexec_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='suexec'}
</div>
</div></tmpl_if>
- <tmpl_if name="limit_hterror" op="==" value="y"><div class="ctrlHolder">
- <p class="label">{tmpl_var name='errordocs_txt'}</p>
- <div class="multiField">
+ <tmpl_if name="limit_hterror" op="==" value="y"><div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='errordocs_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='errordocs'}
</div>
</div></tmpl_if>
- <div class="ctrlHolder">
- <label for="subdomain">{tmpl_var name='subdomain_txt'}</label>
- <select name="subdomain" id="subdomain" class="selectInput formLengthHalf">
+ <div class="form-group">
+ <label for="subdomain" class="col-sm-3 control-label">{tmpl_var name='subdomain_txt'}</label>
+ <div class="col-sm-9"><select name="subdomain" id="subdomain" class="form-control">
{tmpl_var name='subdomain'}
</select>
- </div>
- <tmpl_if name="limit_ssl" op="==" value="y"><div class="ctrlHolder">
- <p class="label">{tmpl_var name='ssl_txt'}</p>
- <div class="multiField">
+ </div></div>
+ <tmpl_if name="limit_ssl" op="==" value="y"><div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='ssl_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='ssl'}
</div>
</div></tmpl_if>
- <div class="ctrlHolder">
- <label for="php">{tmpl_var name='php_txt'}</label>
- <select name="php" id="php" class="selectInput formLengthHalf">
+ <div class="form-group">
+ <label for="php" class="col-sm-3 control-label">{tmpl_var name='php_txt'}</label>
+ <div class="col-sm-9"><select name="php" id="php" class="form-control">
{tmpl_var name='php'}
</select>
- </div>
- <div class="ctrlHolder fastcgi_php_version">
- <label for="fastcgi_php_version">{tmpl_var name='fastcgi_php_version_txt'}</label>
- <select name="fastcgi_php_version" id="fastcgi_php_version" class="selectInput formLengthHalf">
+ </div></div>
+ <div class="form-group fastcgi_php_version">
+ <label for="fastcgi_php_version" class="col-sm-3 control-label">{tmpl_var name='fastcgi_php_version_txt'}</label>
+ <div class="col-sm-9"><select name="fastcgi_php_version" id="fastcgi_php_version" class="form-control">
{tmpl_var name='fastcgi_php_version'}
</select>
- </div>
+ </div></div>
{tmpl_var name="directive_snippets_id"}
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button id="dom-edit-submit" class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_vhost_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button id="dom-edit-submit" class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="sites/web_vhost_domain_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
<script language="JavaScript" type="text/javascript">
var serverId;
var clientGroupId = jQuery('#client_group_id').val();
diff --git a/interface/web/sites/templates/web_vhost_domain_list.htm b/interface/web/sites/templates/web_vhost_domain_list.htm
index f486b2f..5e39bb6 100644
--- a/interface/web/sites/templates/web_vhost_domain_list.htm
+++ b/interface/web/sites/templates/web_vhost_domain_list.htm
@@ -1,9 +1,9 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_web_vhost_domain">
- <div class="pnl_toolsarea">
<tmpl_if name='datalog_changes_count' op='>' value='0'>
<div>
<div class="systemmonitor-state state-info">
@@ -20,48 +20,48 @@
</div><br />
</div>
</tmpl_if>
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/web_vhost_domain_edit.php?type={tmpl_var name='vhostdomain_type'}');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="sites/web_vhost_domain_edit.php?type={tmpl_var name='vhostdomain_type'}">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <tmpl_if name="vhostdomain_type" value="domain"><th class="tbl_col_domain_id" scope="col"><tmpl_var name="domain_id_txt"></th></tmpl_if>
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <tmpl_if name="vhostdomain_type" op="!=" value="domain"><th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th></tmpl_if>
- <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <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>
+ <th><tmpl_var name="server_id_txt"></th>
+ <tmpl_if name="vhostdomain_type" op="!=" value="domain"><th><tmpl_var name="parent_domain_id_txt"></th></tmpl_if>
+ <th><tmpl_var name="domain_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <tmpl_if name="vhostdomain_type" value="domain"><td class="tbl_col_domain_id"><input type="text" size="5" name="search_domain_id" value="{tmpl_var name='search_domain_id'}" /></td></tmpl_if>
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <tmpl_if name="vhostdomain_type" op="!=" value="domain"><td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td></tmpl_if>
- <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/web_vhost_domain_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <tmpl_if name="vhostdomain_type" value="domain"><td><div class="col-sm-9"><input type="text" name="search_domain_id" value="{tmpl_var name='search_domain_id'}" /></div></td></tmpl_if>
+ <td><select name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <tmpl_if name="vhostdomain_type" op="!=" value="domain"><td><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td></tmpl_if>
+ <td><div class="col-sm-9"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/web_vhost_domain_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <tmpl_if name="vhostdomain_type" value="domain"><td class="tbl_col_domain_id"><a href="#" onclick="loadContent('sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}&type={tmpl_var name='vhostdomain_type'}');">{tmpl_var name="domain_id"}</a></td></tmpl_if>
- <td class="tbl_col_active"><a href="#" onclick="loadContent('sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}&type={tmpl_var name='vhostdomain_type'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('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 class="tbl_col_parent_domain_id"><a href="#" onclick="loadContent('sites/web_vhost_aliasdomain_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td></tmpl_if>
- <td class="tbl_col_domain"><a href="#" onclick="loadContent('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="button icons16 icoLink"><span>Link</span></a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <tmpl_if name="vhostdomain_type" value="domain"><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_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="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 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>
</td>
</tr>
</tmpl_loop>
@@ -73,11 +73,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+ <td colspan="5"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/sites/templates/web_vhost_domain_redirect.htm b/interface/web/sites/templates/web_vhost_domain_redirect.htm
index 3cd8da3..af70016 100644
--- a/interface/web/sites/templates/web_vhost_domain_redirect.htm
+++ b/interface/web/sites/templates/web_vhost_domain_redirect.htm
@@ -1,4 +1,6 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
<tmpl_if name="config_error_msg">
@@ -10,41 +12,36 @@
</div>
</tmpl_if>
-<div class="panel panel_web_domain">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="redirect_type">{tmpl_var name='redirect_type_txt'}</label>
- <select name="redirect_type" id="redirect_type" class="selectInput formLengthHalf">
+
+ <div class="form-group">
+ <label for="redirect_type" class="col-sm-3 control-label">{tmpl_var name='redirect_type_txt'}</label>
+ <div class="col-sm-9"><select name="redirect_type" id="redirect_type" class="form-control">
{tmpl_var name='redirect_type'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="redirect_path">{tmpl_var name='redirect_path_txt'}</label>
- <input name="redirect_path" id="redirect_path" value="{tmpl_var name='redirect_path'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="seo_redirect">{tmpl_var name='seo_redirect_txt'}</label>
- <select name="seo_redirect" id="seo_redirect" class="selectInput">
+ </div></div>
+ <div class="form-group">
+ <label for="redirect_path" class="col-sm-3 control-label">{tmpl_var name='redirect_path_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="redirect_path" id="redirect_path" value="{tmpl_var name='redirect_path'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="seo_redirect" class="col-sm-3 control-label">{tmpl_var name='seo_redirect_txt'}</label>
+ <div class="col-sm-9"><select name="seo_redirect" id="seo_redirect" class="form-control">
{tmpl_var name='seo_redirect'}
</select>
- </div>
- <div class="ctrlHolder nginx">
- <label for="rewrite_rules">{tmpl_var name='rewrite_rules_txt'}</label>
+ </div></div>
+ <div class="form-group nginx">
+ <label for="rewrite_rules" class="col-sm-3 control-label">{tmpl_var name='rewrite_rules_txt'}</label>
<textarea name="rewrite_rules" id="rewrite_rules" rows='10' cols='50' style="width:400px;">{tmpl_var name='rewrite_rules'}</textarea> <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>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_vhost_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_domain_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="sites/web_vhost_domain_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
<script language="JavaScript" type="text/javascript">
var webId = jQuery('input[name="id"]').val();
var serverId;
diff --git a/interface/web/sites/templates/web_vhost_domain_ssl.htm b/interface/web/sites/templates/web_vhost_domain_ssl.htm
index e910e22..7e45e20 100644
--- a/interface/web/sites/templates/web_vhost_domain_ssl.htm
+++ b/interface/web/sites/templates/web_vhost_domain_ssl.htm
@@ -1,4 +1,6 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
<tmpl_if name="config_error_msg">
@@ -10,76 +12,71 @@
</div>
</tmpl_if>
-<div class="panel panel_web_domain">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="ssl_state">{tmpl_var name='ssl_state_txt'}</label>
- <input name="ssl_state" id="ssl_state" value="{tmpl_var name='ssl_state'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="ssl_locality">{tmpl_var name='ssl_locality_txt'}</label>
- <input name="ssl_locality" id="ssl_locality" value="{tmpl_var name='ssl_locality'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="ssl_organisation">{tmpl_var name='ssl_organisation_txt'}</label>
- <input name="ssl_organisation" id="ssl_organisation" value="{tmpl_var name='ssl_organisation'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="ssl_organisation_unit">{tmpl_var name='ssl_organisation_unit_txt'}</label>
- <input name="ssl_organisation_unit" id="ssl_organisation_unit" value="{tmpl_var name='ssl_organisation_unit'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="ssl_country">{tmpl_var name='ssl_country_txt'}</label>
- <select name="ssl_country" id="ssl_country" class="selectInput flags">
+
+ <div class="form-group">
+ <label for="ssl_state" class="col-sm-3 control-label">{tmpl_var name='ssl_state_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="ssl_state" id="ssl_state" value="{tmpl_var name='ssl_state'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="ssl_locality" class="col-sm-3 control-label">{tmpl_var name='ssl_locality_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="ssl_locality" id="ssl_locality" value="{tmpl_var name='ssl_locality'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="ssl_organisation" class="col-sm-3 control-label">{tmpl_var name='ssl_organisation_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="ssl_organisation" id="ssl_organisation" value="{tmpl_var name='ssl_organisation'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="ssl_organisation_unit" class="col-sm-3 control-label">{tmpl_var name='ssl_organisation_unit_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="ssl_organisation_unit" id="ssl_organisation_unit" value="{tmpl_var name='ssl_organisation_unit'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="ssl_country" class="col-sm-3 control-label">{tmpl_var name='ssl_country_txt'}</label>
+ <div class="col-sm-9"><select name="ssl_country" id="ssl_country" class="form-control">
{tmpl_var name='ssl_country'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="client_group_id">{tmpl_var name='ssl_domain_txt'}</label>
- <select name="ssl_domain" id="ssl_domain" class="selectInput">
+ </div></div>
+ <div class="form-group">
+ <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='ssl_domain_txt'}</label>
+ <div class="col-sm-9"><select name="ssl_domain" id="ssl_domain" class="form-control">
{tmpl_var name='ssl_domain'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="ssl_request">{tmpl_var name='ssl_key_txt'}</label>
+ </div></div>
+ <div class="form-group">
+ <label for="ssl_request" class="col-sm-3 control-label">{tmpl_var name='ssl_key_txt'}</label>
<textarea name="ssl_key" id="ssl_key" rows='10' cols='30'>{tmpl_var name='ssl_key'}</textarea>
</div>
- <div class="ctrlHolder">
- <label for="ssl_request">{tmpl_var name='ssl_request_txt'}</label>
+ <div class="form-group">
+ <label for="ssl_request" class="col-sm-3 control-label">{tmpl_var name='ssl_request_txt'}</label>
<textarea name="ssl_request" id="ssl_request" rows='10' cols='30'>{tmpl_var name='ssl_request'}</textarea>
</div>
- <div class="ctrlHolder">
- <label for="ssl_cert">{tmpl_var name='ssl_cert_txt'}</label>
+ <div class="form-group">
+ <label for="ssl_cert" class="col-sm-3 control-label">{tmpl_var name='ssl_cert_txt'}</label>
<textarea name="ssl_cert" id="ssl_cert" rows='10' cols='30'>{tmpl_var name='ssl_cert'}</textarea>
</div>
- <div class="ctrlHolder">
- <label for="ssl_bundle">{tmpl_var name='ssl_bundle_txt'}</label>
+ <div class="form-group">
+ <label for="ssl_bundle" class="col-sm-3 control-label">{tmpl_var name='ssl_bundle_txt'}</label>
<textarea name="ssl_bundle" id="ssl_bundle" rows='10' cols='30'>{tmpl_var name='ssl_bundle'}</textarea>
</div>
- <div class="ctrlHolder">
- <label for="ssl_action">{tmpl_var name='ssl_action_txt'}</label>
- <select name="ssl_action" id="ssl_action" class="selectInput formLengthHalf">
+ <div class="form-group">
+ <label for="ssl_action" class="col-sm-3 control-label">{tmpl_var name='ssl_action_txt'}</label>
+ <div class="col-sm-9"><select name="ssl_action" id="ssl_action" class="form-control">
{tmpl_var name='ssl_action'}
</select>
- </div>
+ </div></div>
{tmpl_if name="is_spdy_enabled"}
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='enable_spdy_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='enable_spdy_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name="enable_spdy"}
</div>
</div>
{/tmpl_if}
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_vhost_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_domain_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="sites/web_vhost_domain_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
diff --git a/interface/web/sites/templates/web_vhost_domain_stats.htm b/interface/web/sites/templates/web_vhost_domain_stats.htm
index 8ba753e..ce9fbc0 100644
--- a/interface/web/sites/templates/web_vhost_domain_stats.htm
+++ b/interface/web/sites/templates/web_vhost_domain_stats.htm
@@ -1,4 +1,6 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
<tmpl_if name="config_error_msg">
@@ -10,42 +12,37 @@
</div>
</tmpl_if>
-<div class="panel panel_web_domain">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='stats_user_txt'}</p><p class="value">admin</p>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='stats_user_txt'}</label><p class="value">admin</p>
</div>
- <div class="ctrlHolder">
- <label for="stats_password">{tmpl_var name='stats_password_txt'}</label>
+ <div class="form-group">
+ <label for="stats_password" class="col-sm-3 control-label">{tmpl_var name='stats_password_txt'}</label>
<input name="stats_password" id="stats_password" value="{tmpl_var name='stats_password'}" size="15" maxlength="100" type="password" autocomplete="off" class="textInput" style="width:100px;" onkeyup="checkPassMatch('stats_password','repeat_password');" /> <a href="javascript:void(0);" onclick="generatePassword('stats_password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='password_strength_txt'}</p>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='password_strength_txt'}</label>
<div id="passBar"></div>
<p class="formHint"><span id="passText"> </span></p>
</div>
- <div class="ctrlHolder">
- <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+ <div class="form-group">
+ <label for="repeat_password" class="col-sm-3 control-label">{tmpl_var name='repeat_password_txt'}</label>
<input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" autocomplete="off" class="textInput" style="width:100px;" onkeyup="checkPassMatch('stats_password','repeat_password');" />
</div>
<div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
<div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
- <div class="ctrlHolder">
- <label for="stats_type">{tmpl_var name='stats_type_txt'}</label>
- <select name="stats_type" id="stats_type" class="selectInput" >
+ <div class="form-group">
+ <label for="stats_type" class="col-sm-3 control-label">{tmpl_var name='stats_type_txt'}</label>
+ <div class="col-sm-9"><select name="stats_type" id="stats_type" class="form-control" >
{tmpl_var name='stats_type'}
</select>
- </div>
- </fieldset>
+ </div></div>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_vhost_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_vhost_domain_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="sites/web_vhost_domain_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
diff --git a/interface/web/sites/templates/webdav_user_edit.htm b/interface/web/sites/templates/webdav_user_edit.htm
index c0f658b..90366af 100644
--- a/interface/web/sites/templates/webdav_user_edit.htm
+++ b/interface/web/sites/templates/webdav_user_edit.htm
@@ -1,64 +1,61 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_webdav_user">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
+
+ <div class="form-group">
<tmpl_if name="edit_disabled">
- <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
- <select name="parent_domain_id" id="parent_domain_id" class="selectInput" disabled="disabled">
+ <label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='parent_domain_id_txt'}</label>
+ <div class="col-sm-9"><select name="parent_domain_id" id="parent_domain_id" class="form-control" disabled="disabled">
{tmpl_var name='parent_domain_id'}
</select>
- <input type="hidden" name="parent_domain_id" value="{tmpl_var name='parent_domain_id_value'}" />
+ </div><input type="hidden" name="parent_domain_id" value="{tmpl_var name='parent_domain_id_value'}" />
<tmpl_else>
- <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
- <select name="parent_domain_id" id="parent_domain_id" class="selectInput">
+ <label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='parent_domain_id_txt'}</label>
+ <div class="col-sm-9"><select name="parent_domain_id" id="parent_domain_id" class="form-control">
{tmpl_var name='parent_domain_id'}
</select>
- </tmpl_if>
+ </div></tmpl_if>
</div>
- <div class="ctrlHolder">
- <label for="username">{tmpl_var name='username_txt'}</label>
+ <div class="form-group">
+ <label for="username" class="col-sm-3 control-label">{tmpl_var name='username_txt'}</label>
<p class="prefix">{tmpl_var name='username_prefix'}</p>
- <input name="username" id="username" value="{tmpl_var name='username'}" size="30" maxlength="255" type="text" class="textInput formLengthFourth" <tmpl_if name="edit_disabled">disabled="disabled"</tmpl_if>/>
+ <div class="col-sm-9"><input type="text" name="username" id="username" value="{tmpl_var name='username'}" class="form-control" <tmpl_if name="edit_disabled">disabled="disabled"</div></tmpl_if>/>
</div>
- <div class="ctrlHolder">
- <label for="password">{tmpl_var name='password_txt'}</label>
+ <div class="form-group">
+ <label for="password" class="col-sm-3 control-label">{tmpl_var name='password_txt'}</label>
<input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');"/> <a href="javascript:void(0);" onclick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='password_strength_txt'}</p>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='password_strength_txt'}</label>
<div id="passBar"></div>
<p class="formHint"><span id="passText"> </span></p>
</div>
- <div class="ctrlHolder">
- <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+ <div class="form-group">
+ <label for="repeat_password" class="col-sm-3 control-label">{tmpl_var name='repeat_password_txt'}</label>
<input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;" autocomplete="off" onkeyup="checkPassMatch('password','repeat_password');" />
</div>
<div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
<div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="dir">{tmpl_var name='dir_txt'}</label>
+ <div class="form-group">
+ <label for="dir" class="col-sm-3 control-label">{tmpl_var name='dir_txt'}</label>
<p class="prefix">webdav/</p>
- <input name="dir" id="dir" value="{tmpl_var name='dir'}" size="30" maxlength="255" type="text" class="textInput" <tmpl_if name="edit_disabled">disabled="disabled"</tmpl_if>/>
+ <div class="col-sm-9"><input type="text" name="dir" id="dir" value="{tmpl_var name='dir'}" class="form-control" <tmpl_if name="edit_disabled">disabled="disabled"</div></tmpl_if>/>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/webdav_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/webdav_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/webdav_user_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="sites/webdav_user_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/sites/templates/webdav_user_list.htm b/interface/web/sites/templates/webdav_user_list.htm
index b34ce21..85478ee 100644
--- a/interface/web/sites/templates/webdav_user_list.htm
+++ b/interface/web/sites/templates/webdav_user_list.htm
@@ -1,9 +1,9 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_list_webdav_user">
- <div class="pnl_toolsarea">
<tmpl_if name='datalog_changes_count' op='>' value='0'>
<div>
<div class="systemmonitor-state state-info">
@@ -20,45 +20,45 @@
</div><br />
</div>
</tmpl_if>
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('sites/webdav_user_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="sites/webdav_user_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
- <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="active_txt"></th>
+ <th><tmpl_var name="server_id_txt"></th>
+ <th><tmpl_var name="parent_domain_id_txt"></th>
+ <th><tmpl_var name="username_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_parent_domain_id"><select name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td>
- <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/webdav_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <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><div class="col-sm-9"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','sites/webdav_user_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('sites/webdav_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('sites/webdav_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_parent_domain_id"><a href="#" onclick="loadContent('sites/webdav_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="parent_domain_id"}</a></td>
- <td class="tbl_col_username"><a href="#" onclick="loadContent('sites/webdav_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="sites/webdav_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
+ <td><a href="#" data-load-content="sites/webdav_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -70,11 +70,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+ <td colspan="5"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/themes/blue/templates/main.tpl.htm b/interface/web/themes/blue/templates/main.tpl.htm
index 0007256..f2ace7f 100644
--- a/interface/web/themes/blue/templates/main.tpl.htm
+++ b/interface/web/themes/blue/templates/main.tpl.htm
@@ -142,8 +142,8 @@
<a class="skip" href="#content" title="skip link">Skip to the content</a><span class="hideme">.</span>
<!-- end: skip link navigation -->
<tmpl_if name="cpuser">
- <a href="#logout" onclick="loadContent('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'><input type="text" id="globalsearch" size="25" value="" /></tmpl_if>
+ <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>
</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">
- <input type="text" style="display:none" /><input type="password" style="display:none"/>
+ <div class="col-sm-9"><input 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,8 +178,8 @@
<div id="dummy_login" style="display:none;position:absolute;top:-1000px;left:-1000px;">
<form action="" method="post" target="dummy_login" id="dummy_login_form">
-<input name="username" id="dummy_username" type="text" autocomplete="on" value="" />
-<input name="passwort" id="dummy_passwort" type="password" autocomplete="on" value="" />
+<div class="col-sm-9"><input 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>
<iframe id="dummy_iframe" src="dummy_login.html" name="dummy_login" style="display:none;"></iframe>
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index 5192d1e..bb40c50 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -39,15 +39,15 @@
<div id='headerbar' class='clear'>
<!-- logout button -->
<tmpl_if name="cpuser">
- <button type='button' id='logout-button' class='btn btn-sm btn-danger' onclick="loadContent('login/logout.php');"><tmpl_var format="strtoupper" name="logout_txt"> <tmpl_var format="strtoupper" name="cpuser"></button>
+ <button type='button' id='logout-button' class='btn btn-sm btn-danger' data-load-content="login/logout.php"><tmpl_var format="strtoupper" name="logout_txt"> <tmpl_var format="strtoupper" name="cpuser"></button>
<tmpl_if name='usertype' op='==' value='normaluser'>
<!-- search field -->
<form action='#' method='get' id='searchform' role='form'>
<div>
<div>
<div class='input-group input-group-sm'>
- <input id='globalsearch' type='text' class='form-control' placeholder='Search' />
- <span class='input-group-btn'>
+ <div class="col-sm-9"><input type="text" id='globalsearch' class="form-control" placeholder='Search' />
+ </div><span class='input-group-btn'>
<button class='btn btn-default btn-sm' title='Search…'>
<span class='icon icon-lens'></span>
</button>
@@ -139,6 +139,14 @@
}
}
});
+
+ $(document).on('click', 'a[data-load-content],button[data-load-content]', function(e) {
+ e.preventDefault();
+ var content_to_load = $(this).attr('data-load-content');
+ if(!content_to_load) return this;
+
+ loadContent(content_to_load);
+ });
$(document).bind("keypress", function(event) {
//Use $ submit with keypress Enter in panel filterbar
diff --git a/interface/web/themes/default/templates/module.tpl.htm b/interface/web/themes/default/templates/module.tpl.htm
index f8a26de..ebbaf91 100644
--- a/interface/web/themes/default/templates/module.tpl.htm
+++ b/interface/web/themes/default/templates/module.tpl.htm
@@ -19,7 +19,7 @@
<tmpl_loop name="nav_left">
<table bgcolor="#F4F6FB" width="115">
<tr>
- <td class="navLeftHead"><tmpl_var name="title"></td>
+ <td><tmpl_var name="title"></td>
</tr>
<tr>
<td>
diff --git a/interface/web/themes/default/templates/module_tree.tpl.htm b/interface/web/themes/default/templates/module_tree.tpl.htm
index be21381..3eca1df 100644
--- a/interface/web/themes/default/templates/module_tree.tpl.htm
+++ b/interface/web/themes/default/templates/module_tree.tpl.htm
@@ -20,7 +20,7 @@
<tmpl_loop name="nav_left">
<table bgcolor="#F4F6FB" width="115">
<tr>
- <td class="navLeftHead"><tmpl_var name="title"></td>
+ <td><tmpl_var name="title"></td>
</tr>
<tr>
<td>
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 6d0395b..ca8bfeb 100644
--- a/interface/web/themes/default_64_navimg/templates/main.tpl.htm
+++ b/interface/web/themes/default_64_navimg/templates/main.tpl.htm
@@ -137,8 +137,8 @@
<a class="skip" href="#content" title="skip link">Skip to the content</a><span class="hideme">.</span>
<!-- end: skip link navigation -->
<tmpl_if name="cpuser">
- <span><a href="#logout" onclick="loadContent('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'><input type="text" id="globalsearch" size="25" value="" /></tmpl_if>
+ <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>
</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">
- <input type="text" style="display:none" /><input type="password" style="display:none"/>
+ <div class="col-sm-9"><input 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 1df185f..4a3694b 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 = $( "<input>" )
+ var input = this.input = $( "<div class="col-sm-9"><input type="text">" )
.insertAfter( select )
.width( oldWidth )
.val( value )
@@ -179,7 +179,7 @@
return {
label: text.replace(
new RegExp(
- "(?![^&;]+;)(?!<[^<>]*)(" +
+ "(?![^&;]+;)(?!</div><[^<>]*)(" +
$.ui.autocomplete.escapeRegex(request.term) +
")(?![^<>]*>)(?![^&;]+;)", "gi"
), "<strong>$1</strong>" ),
@@ -292,8 +292,8 @@
<a class="skip" href="#content" title="skip link">Skip to the content</a><span class="hideme">.</span>
<!-- end: skip link navigation -->
<tmpl_if name="cpuser">
- <span><a href="#logout" onclick="loadContent('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'><input type="text" id="globalsearch" size="25" value="" /></tmpl_if>
+ <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>
</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">
- <input type="text" style="display:none" /><input type="password" style="display:none"/>
+ <div class="col-sm-9"><input 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 adfc656..bbd956e 100644
--- a/interface/web/themes/default_no_navimg/templates/main.tpl.htm
+++ b/interface/web/themes/default_no_navimg/templates/main.tpl.htm
@@ -138,8 +138,8 @@
<a class="skip" href="#content" title="skip link">Skip to the content</a><span class="hideme">.</span>
<!-- end: skip link navigation -->
<tmpl_if name="cpuser">
- <span><a href="#logout" onclick="loadContent('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'><input type="text" id="globalsearch" size="25" value="" /></tmpl_if>
+ <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>
</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">
- <input type="text" style="display:none" /><input type="password" style="display:none"/>
+ <div class="col-sm-9"><input 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 ca44696..40edcb5 100644
--- a/interface/web/tools/templates/dns_import_tupa.htm
+++ b/interface/web/tools/templates/dns_import_tupa.htm
@@ -1,35 +1,33 @@
<h2><tmpl_var name="list_head_txt">Import DNS records from Tupa PowerDNS controlpanel</h2>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_tupa_import">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>PowerDNS Tupa import</legend>
- <div class="ctrlHolder">
- <p class="label">Tupa database hostname</p>
- <div class="multiField">
- <input id="dbhost" type="text" value="{tmpl_var name='dbhost'}" name="dbhost" />
- </div>
+
+ <legend>PowerDNS Tupa import</legend>
+ <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></div>
</div>
- <div class="ctrlHolder">
- <p class="label">Tupa database name</p>
- <div class="multiField">
- <input id="dbname" type="text" value="{tmpl_var name='dbname'}" name="dbname" />
- </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></div>
</div>
- <div class="ctrlHolder">
- <p class="label">Tupa database user</p>
- <div class="multiField">
- <input id="dbuser" type="text" value="{tmpl_var name='dbuser'}" name="dbuser" />
- </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></div>
</div>
- <div class="ctrlHolder">
- <p class="label">Tupa database password</p>
- <div class="multiField">
- <input id="dbpassword" type="text" value="{tmpl_var name='dbpassword'}" name="dbpassword" />
- </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></div>
</div>
- </fieldset>
+
<tmpl_if name="msg">
<div id="OKMsg"><p><tmpl_var name="msg"></p></div>
@@ -41,10 +39,7 @@
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input type="hidden" name="start" value="1">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="Import" onClick="submitForm('pageForm','tools/dns_import_tupa.php');"><span>Start</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="Cancel" onClick="loadContent('tools/index.php');"><span>Cancel</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="Import" onClick="submitForm('pageForm','tools/dns_import_tupa.php');">Start</button>
+ <button class="negative iconstxt icoNegative" type="button" value="Cancel" data-load-content="tools/index.php"><span>Cancel</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/tools/templates/import_ispconfig.htm b/interface/web/tools/templates/import_ispconfig.htm
index f7b97e8..9363936 100644
--- a/interface/web/tools/templates/import_ispconfig.htm
+++ b/interface/web/tools/templates/import_ispconfig.htm
@@ -1,82 +1,84 @@
-<h2><tmpl_var name="head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
<div class="panel panel_language_import">
<div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>{tmpl_var name="legend_txt"}</legend>
- <div class="ctrlHolder">
- <p class="label">Remote API URL</p>
- <div class="multiField">
- <input id="remote_server" type="text" value="{tmpl_var name='remote_server'}" name="remote_server" /> (e.g. https://www.example.com:8080/remote/ )
- </div>
+ <legend>{tmpl_var name="legend_txt"}</legend>
+ <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></div>
</div>
- <div class="ctrlHolder">
- <p class="label">Remote User</p>
- <div class="multiField">
- <input id="remote_user" type="text" value="{tmpl_var name='remote_user'}" name="remote_user" />
- </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></div>
</div>
- <div class="ctrlHolder">
- <p class="label">Remote password</p>
- <div class="multiField">
- <input id="remote_password" type="text" value="{tmpl_var name='remote_password'}" name="remote_password" />
- </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></div>
</div>
- </fieldset>
+
</div>
<tmpl_if name="connected">
<div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>{tmpl_var name="legend2_txt"}</legend>
- <div class="ctrlHolder">
- <label for="mail_domain">{tmpl_var name='mail_domain_txt'}</label>
- <select name="mail_domain" id="mail_domain" class="selectInput">
+ <legend>{tmpl_var name="legend2_txt"}</legend>
+ <div class="form-group">
+ <label for="mail_domain" class="col-sm-3 control-label">{tmpl_var name='mail_domain_txt'}</label>
+ <div class="col-sm-9"><select name="mail_domain" id="mail_domain" class="form-control">
{tmpl_var name='mail_domain'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
- <select name="client_group_id" id="client_group_id" class="selectInput">
+ </div></div>
+ <div class="form-group">
+ <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_group_id_txt'}</label>
+ <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
{tmpl_var name='client_group_id'}
</select>
+ </div></div>
+ <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></div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name="import_mailbox_txt"}</p>
- <div class="multiField">
- <input id="import_mailbox" type="checkbox" value="1" name="import_mailbox" checked="checked" />
- </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></div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name="import_user_filter_txt"}</p>
- <div class="multiField">
- <input id="import_user_filter" type="checkbox" value="1" name="import_user_filter" checked="checked" />
- </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></div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name="import_spamfilter_txt"}</p>
- <div class="multiField">
- <input id="import_spamfilter" type="checkbox" value="1" name="import_spamfilter" checked="checked" />
- </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></div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name="import_alias_txt"}</p>
- <div class="multiField">
- <input id="import_alias" type="checkbox" value="1" name="import_alias" checked="checked" />
- </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></div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name="import_forward_txt"}</p>
- <div class="multiField">
- <input id="import_forward" type="checkbox" value="1" name="import_forward" checked="checked" />
- </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></div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name="import_aliasdomain_txt"}</p>
- <div class="multiField">
- <input id="import_aliasdomain" type="checkbox" value="1" name="import_aliasdomain" checked="checked" />
- </div>
- </div>
- </fieldset>
+
</div>
</tmpl_if>
@@ -90,14 +92,14 @@
<input type="hidden" name="remote_session_id" value="{tmpl_var name='remote_session_id'}">
<input type="hidden" name="connected" value="{tmpl_var name='connected'}">
<tmpl_if name="connected">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="Import" onClick="submitForm('pageForm','tools/import_ispconfig.php');"><span>{tmpl_var name="btn_start_txt"}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="Cancel" onClick="loadContent('tools/index.php');"><span>{tmpl_var name="btn_cancel_txt"}</span></button>
- </div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="Import" onClick="submitForm('pageForm','tools/import_ispconfig.php');">{tmpl_var name="btn_start_txt"}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="Cancel" data-load-content="tools/index.php"><span>{tmpl_var name="btn_cancel_txt"}</span></button>
+ </div></div>
<tmpl_else>
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="Import" onClick="submitForm('pageForm','tools/import_ispconfig.php');"><span>{tmpl_var name="btn_connect_txt"}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="Cancel" onClick="loadContent('tools/index.php');"><span>{tmpl_var name="btn_cancel_txt"}</span></button>
- </div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="Import" onClick="submitForm('pageForm','tools/import_ispconfig.php');">{tmpl_var name="btn_connect_txt"}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="Cancel" data-load-content="tools/index.php"><span>{tmpl_var name="btn_cancel_txt"}</span></button>
+ </div></div>
</tmpl_if>
</div>
\ No newline at end of file
diff --git a/interface/web/tools/templates/import_plesk.htm b/interface/web/tools/templates/import_plesk.htm
index 363d728..b23c4ed 100644
--- a/interface/web/tools/templates/import_plesk.htm
+++ b/interface/web/tools/templates/import_plesk.htm
@@ -1,60 +1,58 @@
<h2><tmpl_var name="list_head_txt">Import plesk panel data</h2>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_language_import">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>Plesk data import</legend>
- <div class="ctrlHolder">
- <p class="label">Plesk database hostname</p>
- <div class="multiField">
- <input id="dbhost" type="text" value="{tmpl_var name='dbhost'}" name="dbhost" />
- </div>
+
+ <legend>Plesk data import</legend>
+ <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></div>
</div>
- <div class="ctrlHolder">
- <p class="label">Plesk database name</p>
- <div class="multiField">
- <input id="dbname" type="text" value="{tmpl_var name='dbname'}" name="dbname" />
- </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></div>
</div>
- <div class="ctrlHolder">
- <p class="label">Plesk database user</p>
- <div class="multiField">
- <input id="dbuser" type="text" value="{tmpl_var name='dbuser'}" name="dbuser" />
- </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></div>
</div>
- <div class="ctrlHolder">
- <p class="label">Plesk database password</p>
- <div class="multiField">
- <input id="dbpassword" type="text" value="{tmpl_var name='dbpassword'}" name="dbpassword" />
- </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></div>
</div>
- <div class="ctrlHolder">
- <p class="label">Web content backup file (on this server, optional)</p>
- <div class="multiField">
- <input id="webcontent" type="text" value="{tmpl_var name='webcontent'}" name="webcontent" />
- </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></div>
</div>
- <div class="ctrlHolder">
- <p class="label">Maildir content backup file (on this server, optional)</p>
- <div class="multiField">
- <input id="mailcontent" type="text" value="{tmpl_var name='mailcontent'}" name="mailcontent" />
- </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></div>
</div>
- <div class="ctrlHolder">
- <p class="label">Import all data (that can be imported)</p>
- <div class="multiField">
- <input id="start" type="checkbox" value="1" name="start" checked/>
- </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></div>
</div>
- <div class="ctrlHolder">
- <p class="label">Import database contents (make sure the database user has the rights to do so)</p>
- <div class="multiField">
- <input id="dbdata" type="checkbox" value="1" name="dbdata" checked/>
- </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></div>
</div>
- </fieldset>
+
<tmpl_if name="msg">
<div id="OKMsg"><p><tmpl_var name="msg"></p></div>
@@ -65,10 +63,7 @@
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="Import" onClick="submitForm('pageForm','tools/import_plesk.php');"><span>Start</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="Cancel" onClick="loadContent('tools/index.php');"><span>Cancel</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="Import" onClick="submitForm('pageForm','tools/import_plesk.php');">Start</button>
+ <button class="negative iconstxt icoNegative" type="button" value="Cancel" data-load-content="tools/index.php"><span>Cancel</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/tools/templates/import_vpopmail.htm b/interface/web/tools/templates/import_vpopmail.htm
index ade9476..a17344d 100644
--- a/interface/web/tools/templates/import_vpopmail.htm
+++ b/interface/web/tools/templates/import_vpopmail.htm
@@ -1,41 +1,43 @@
-<h2><tmpl_var name="head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
<div class="panel panel_language_import">
<div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>{tmpl_var name="legend_txt"}</legend>
- <div class="ctrlHolder">
- <p class="label">Database Hostname</p>
- <div class="multiField">
- <input id="db_hostname" type="text" value="{tmpl_var name='db_hostname'}" name="db_hostname" />
- </div>
+ <legend>{tmpl_var name="legend_txt"}</legend>
+ <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></div>
</div>
- <div class="ctrlHolder">
- <p class="label">Database Name</p>
- <div class="multiField">
- <input id="db_name" type="text" value="{tmpl_var name='db_name'}" name="db_name" />
- </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></div>
</div>
- <div class="ctrlHolder">
- <p class="label">Database User</p>
- <div class="multiField">
- <input id="db_user" type="text" value="{tmpl_var name='db_user'}" name="db_user" />
- </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></div>
</div>
- <div class="ctrlHolder">
- <p class="label">Database password</p>
- <div class="multiField">
- <input id="db_password" type="text" value="{tmpl_var name='db_password'}" name="db_password" />
- </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></div>
</div>
- <div class="ctrlHolder">
- <p class="label">Server ID of local mailserver</p>
- <div class="multiField">
- <input id="local_server_id" type="text" value="{tmpl_var name='local_server_id'}" name="local_server_id" />
- </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></div>
</div>
- </fieldset>
+
</div>
<tmpl_if name="msg">
@@ -46,8 +48,8 @@
</tmpl_if>
<input type="hidden" name="remote_session_id" value="{tmpl_var name='remote_session_id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="Import" onClick="submitForm('pageForm','tools/import_vpopmail.php');"><span>{tmpl_var name="btn_start_txt"}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="Cancel" onClick="loadContent('tools/index.php');"><span>{tmpl_var name="btn_cancel_txt"}</span></button>
- </div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="Import" onClick="submitForm('pageForm','tools/import_vpopmail.php');">{tmpl_var name="btn_start_txt"}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="Cancel" data-load-content="tools/index.php"><span>{tmpl_var name="btn_cancel_txt"}</span></button>
+ </div></div>
</div>
diff --git a/interface/web/tools/templates/index.htm b/interface/web/tools/templates/index.htm
index 21147c9..951c43b 100644
--- a/interface/web/tools/templates/index.htm
+++ b/interface/web/tools/templates/index.htm
@@ -1,19 +1,21 @@
-<h2><tmpl_var name="page_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="page_head_txt"></h1>
+</div>
<p><tmpl_var name="page_desc_txt"></p>
<div class="panel panel_tools_interface">
<div class="pnl_formsarea">
- <fieldset class="inlineLabels">
+
<h2 class="frmTextHead"></h2><p> </p>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
+ <div class="clear"><div class="right">
- </div>
+ </div></div>
</div>
</div>
\ No newline at end of file
diff --git a/interface/web/tools/templates/interface_settings.htm b/interface/web/tools/templates/interface_settings.htm
index a9057c8..a7cd4f0 100644
--- a/interface/web/tools/templates/interface_settings.htm
+++ b/interface/web/tools/templates/interface_settings.htm
@@ -1,32 +1,29 @@
-<h2><tmpl_var name="page_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="page_head_txt"></h1>
+</div>
<p><tmpl_var name="page_desc_txt"></p>
-<div class="panel panel_tools_interface">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
+
<!-- TODO: If user theme change is activated -->
- <div class="ctrlHolder">
- <label for="app_theme">{tmpl_var name='app_theme_txt'}</label>
- <select name="app_theme" id="app_theme" class="selectInput formLengthHalf">
+ <div class="form-group">
+ <label for="app_theme" class="col-sm-3 control-label">{tmpl_var name='app_theme_txt'}</label>
+ <div class="col-sm-9"><select name="app_theme" id="app_theme" class="form-control">
{tmpl_var name='app_theme'}
</select>
- </div>
+ </div></div>
<!-- TODO: Limit to activated modules -->
- <div class="ctrlHolder">
- <label for="startmodule">{tmpl_var name='startmodule_txt'}</label>
- <select name="startmodule" id="startmodule" class="selectInput formLengthHalf">
+ <div class="form-group">
+ <label for="startmodule" class="col-sm-3 control-label">{tmpl_var name='startmodule_txt'}</label>
+ <div class="col-sm-9"><select name="startmodule" id="startmodule" class="form-control">
{tmpl_var name='startmodule'}
</select>
- </div>
- </fieldset>
+ </div></div>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','tools/interface_settings.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('tools/index.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','tools/interface_settings.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="tools/index.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/tools/templates/resync.htm b/interface/web/tools/templates/resync.htm
index 064dc6f..5a997cf 100644
--- a/interface/web/tools/templates/resync.htm
+++ b/interface/web/tools/templates/resync.htm
@@ -1,137 +1,138 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_mail_domain">
-<div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
+
+
+ <div class="form-group">
<tmpl_if name="web_server_found">
- <input id="resync_sites" type="checkbox" value="1" name="resync_sites">
- <label for="resync_sites">{tmpl_var name='resync_sites_txt'}</label>
- <select name="web_server_id" id="web_server_id" class="selectInput">
+ <div class="col-sm-9"><input 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'}
</select>
- <tmpl_else>
- <label for="resync_sites">{tmpl_var name="resync_sites_txt"}</label>
+ </div><tmpl_else>
+ <label for="resync_sites" class="col-sm-3 control-label">{tmpl_var name="resync_sites_txt"}</label>
<span style="color:red">
<strong>{tmpl_var name="resync_no_server_txt"}</strong>
</span>
</tmpl_if>
</div>
- </fieldset>
+
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
+
+ <div class="form-group">
<tmpl_if name="web_server_found">
- <input id="resync_ftp" type="checkbox" value="1" name="resync_ftp">
- <label for="resync_ftp">{tmpl_var name="resync_ftp_txt"}</label>
- <select name="ftp_server_id" id="ftp_server_id" class="selectInput">
+ <div class="col-sm-9"><input 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'}
</select>
- <tmpl_else>
- <label for="resync_ftp">{tmpl_var name="resync_ftp_txt"}</label>
+ </div><tmpl_else>
+ <label for="resync_ftp" class="col-sm-3 control-label">{tmpl_var name="resync_ftp_txt"}</label>
<span style="color:red">
<strong>{tmpl_var name="resync_no_server_txt"}</strong>
</span>
</tmpl_if>
</div>
- </fieldset>
+
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
+
+ <div class="form-group">
<tmpl_if name="file_server_found">
- <input id="resync_webdav" type="checkbox" value="1" name="resync_webdav">
- <label for="resync_webdav">{tmpl_var name="resync_webdav_txt"}</label>
- <select name="webdav_server_id" id="webdav_server_id" class="selectInput">
+ <div class="col-sm-9"><input 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'}
</select>
- <tmpl_else>
- <label for="resync_webdav">{tmpl_var name="resync_webdav_txt"}</label>
+ </div><tmpl_else>
+ <label for="resync_webdav" class="col-sm-3 control-label">{tmpl_var name="resync_webdav_txt"}</label>
<span style="color:red">
<strong>{tmpl_var name="resync_no_server_txt"}</strong>
</span>
</tmpl_if>
</div>
- </fieldset>
+
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
+
+ <div class="form-group">
<tmpl_if name="web_server_found">
- <input id="resync_shell" type="checkbox" value="1" name="resync_shell">
- <label for="resync_shell">{tmpl_var name="resync_shell_txt"}</label>
- <select name="shell_server_id" id="shell_server_id" class="selectInput">
+ <div class="col-sm-9"><input 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'}
</select>
- <tmpl_else>
- <label for="resync_shell">{tmpl_var name="resync_shell_txt"}</label>
+ </div><tmpl_else>
+ <label for="resync_shell" class="col-sm-3 control-label">{tmpl_var name="resync_shell_txt"}</label>
<span style="color:red">
<strong>{tmpl_var name="resync_no_server_txt"}</strong>
</span>
</tmpl_if>
</div>
- </fieldset>
+
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
+
+ <div class="form-group">
<tmpl_if name="web_server_found">
- <input id="resync_cron" type="checkbox" value="1" name="resync_cron">
- <label for="resync_cron">{tmpl_var name="resync_cron_txt"}</label>
- <select name="cron_server_id" id="cron_server_id" class="selectInput">
+ <div class="col-sm-9"><input 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'}
</select>
- <tmpl_else>
- <label for="resync_cron">{tmpl_var name="resync_cron_txt"}</label>
+ </div><tmpl_else>
+ <label for="resync_cron" class="col-sm-3 control-label">{tmpl_var name="resync_cron_txt"}</label>
<span style="color:red">
<strong>{tmpl_var name="resync_no_server_txt"}</strong>
</span>
</tmpl_if>
</div>
- </fieldset>
+
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
+
+ <div class="form-group">
<tmpl_if name="db_server_found">
- <input id="resync_db" type="checkbox" value="1" name="resync_db">
- <label for="resync_db">{tmpl_var name="resync_db_txt"}</label>
- <select name="db_server_id" id="db_server_id" class="selectInput">
+ <div class="col-sm-9"><input 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'}
</select>
- <tmpl_else>
- <label for="resync_db">{tmpl_var name="resync_db_txt"}</label>
+ </div><tmpl_else>
+ <label for="resync_db" class="col-sm-3 control-label">{tmpl_var name="resync_db_txt"}</label>
<span style="color:red">
<strong>{tmpl_var name="resync_no_server_txt"}</strong>
</span>
</tmpl_if>
</div>
- </fieldset>
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
+
+
+ <div class="form-group">
<tmpl_if name="mail_server_found">
- <input id="resync_mail" type="checkbox" value="1" name="resync_mail">
- <label for="resync_mail">{tmpl_var name="resync_mail_txt"}</label>
- <select name="mail_server_id" id="mail_server_id" class="selectInput">
+ <div class="col-sm-9"><input 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'}
</select>
- <tmpl_else>
- <label for="resync_mail">{tmpl_var name="resync_mail_txt"}</label>
+ </div><tmpl_else>
+ <label for="resync_mail" class="col-sm-3 control-label">{tmpl_var name="resync_mail_txt"}</label>
<span style="color:red">
<strong>{tmpl_var name="resync_no_server_txt"}</strong>
</span>
</tmpl_if>
</div>
- </fieldset>
+
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
+
+ <div class="form-group">
<tmpl_if name="mail_server_found">
- <input id="resync_mailbox" type="checkbox" value="1" name="resync_mailbox">
- <label for="resync_mailbox">{tmpl_var name="resync_mailbox_txt"}</label>
- <select name="mailbox_server_id" id="mailbox_server_id" class="selectInput">
+ <div class="col-sm-9"><input 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'}
</select>
- <tmpl_else>
- <label for="resync_mailbox">{tmpl_var name="resync_mailbox_txt"}</label>
+ </div><tmpl_else>
+ <label for="resync_mailbox" class="col-sm-3 control-label">{tmpl_var name="resync_mailbox_txt"}</label>
<span style="color:red">
<strong>{tmpl_var name="resync_no_server_txt"}</strong>
</span>
@@ -139,73 +140,69 @@
</div>
<fieldset class="inlineLabels">
- <div class="ctrlHolder">
+ <div class="form-group">
<tmpl_if name="dns_server_found">
- <input id="resync_dns" type="checkbox" value="1" name="resync_dns">
- <label for="resync_dns">{tmpl_var name="resync_dns_txt"}</label>
- <select name="dns_server_id" id="dns_server_id" class="selectInput">
+ <div class="col-sm-9"><input 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'}
</select>
- <tmpl_else>
- <label for="resync_dns">{tmpl_var name="resync_dns_txt"}</label>
+ </div><tmpl_else>
+ <label for="resync_dns" class="col-sm-3 control-label">{tmpl_var name="resync_dns_txt"}</label>
<span style="color:red">
<strong>{tmpl_var name="resync_no_server_txt"}</strong>
</span>
</tmpl_if>
</div>
- </fieldset>
+
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
+
+ <div class="form-group">
<tmpl_if name="vserver_server_found">
- <input id="resync_vserver" type="checkbox" value="1" name="resync_vserver">
- <label for="resync_vserver">{tmpl_var name="resync_vserver_txt"}</label>
- <select name="vserver_server_id" id="vserver_server_id" class="selectInput">
+ <div class="col-sm-9"><input 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'}
</select>
- <tmpl_else>
- <label for="resync_vserver">{tmpl_var name="resync_vserver_txt"}</label>
+ </div><tmpl_else>
+ <label for="resync_vserver" class="col-sm-3 control-label">{tmpl_var name="resync_vserver_txt"}</label>
<span style="color:red">
<strong>{tmpl_var name="resync_no_server_txt"}</strong>
</span>
</tmpl_if>
</div>
- </fieldset>
+
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
+
+ <div class="form-group">
<tmpl_if name="firewall_server_found">
- <input id="resync_firewall" type="checkbox" value="1" name="resync_firewall">
- <label for="resync_firewall">{tmpl_var name="resync_firewall_txt"}</label>
- <select name="firewall_server_id" id="firewall_server_id" class="selectInput">
+ <div class="col-sm-9"><input 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'}
</select>
- <tmpl_else>
- <label for="resync_firewall">{tmpl_var name="resync_firewall_txt"}</label>
+ </div><tmpl_else>
+ <label for="resync_firewall" class="col-sm-3 control-label">{tmpl_var name="resync_firewall_txt"}</label>
<span style="color:red">
<strong>{tmpl_var name="resync_no_server_txt"}</strong>
</span>
</tmpl_if>
</div>
- </fieldset>
+
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <input id="resync_client" type="checkbox" value="1" name="resync_client">
- <label for="resync_client">{tmpl_var name="resync_client_txt"}</label>
+
+ <div class="form-group">
+ <div class="col-sm-9"><input 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>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','tools/resync_do.php');">
- <span>{tmpl_var name='btn_save_txt'}</span>
- </button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('tools/resync.php');">
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','tools/resync_do.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="tools/resync.php">
<span>{tmpl_var name='btn_cancel_txt'}</span>
</button>
- </div>
-</div>
-</div>
+ </div></div>
diff --git a/interface/web/tools/templates/tpl_default.htm b/interface/web/tools/templates/tpl_default.htm
index fadcd36..ea12a10 100644
--- a/interface/web/tools/templates/tpl_default.htm
+++ b/interface/web/tools/templates/tpl_default.htm
@@ -1,21 +1,18 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_tools_tpl">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
+
+ <div class="form-group">
<p><tmpl_var name="no_settings_txt"></p>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
-<!-- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','tools/tpl_default.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>-->
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('tools/index.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+<!-- <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','tools/tpl_default.php');">{tmpl_var name='btn_save_txt'}</button>-->
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="tools/index.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/tools/templates/user_settings.htm b/interface/web/tools/templates/user_settings.htm
index d6f57d0..649b6ba 100644
--- a/interface/web/tools/templates/user_settings.htm
+++ b/interface/web/tools/templates/user_settings.htm
@@ -1,39 +1,36 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_usersettings">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <div class="ctrlHolder">
- <label for="passwort">{tmpl_var name='passwort_txt'}</label>
+
+ <div class="form-group">
+ <label for="passwort" class="col-sm-3 control-label">{tmpl_var name='passwort_txt'}</label>
<input name="passwort" id="passwort" value="{tmpl_var name='passwort'}" size="15" maxlength="100" type="password" class="textInput" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('passwort','repeat_password');"/> <a href="javascript:void(0);" onclick="generatePassword('passwort','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='password_strength_txt'}</p>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='password_strength_txt'}</label>
<div id="passBar"></div>
<p class="formHint"><span id="passText"> </span></p>
</div>
- <div class="ctrlHolder">
- <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+ <div class="form-group">
+ <label for="repeat_password" class="col-sm-3 control-label">{tmpl_var name='repeat_password_txt'}</label>
<input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;" autocomplete="off" onkeyup="checkPassMatch('passwort','repeat_password');" />
</div>
<div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
<div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
- <div class="ctrlHolder">
- <label for="language">{tmpl_var name='language_txt'}</label>
- <select name="language" id="language" class="selectInput flags">
+ <div class="form-group">
+ <label for="language" class="col-sm-3 control-label">{tmpl_var name='language_txt'}</label>
+ <div class="col-sm-9"><select name="language" id="language" class="form-control">
{tmpl_var name='language'}
</select>
- </div>
- </fieldset>
+ </div></div>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','tools/user_settings.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('tools/index.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','tools/user_settings.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="tools/index.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/vm/templates/openvz_action.htm b/interface/web/vm/templates/openvz_action.htm
index 00bb65e..d43403d 100644
--- a/interface/web/vm/templates/openvz_action.htm
+++ b/interface/web/vm/templates/openvz_action.htm
@@ -1,10 +1,10 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_language_import">
-
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>{tmpl_var name="head_txt"} {tmpl_var name='veid'}</legend>
+
+ <legend>{tmpl_var name="head_txt"} {tmpl_var name='veid'}</legend>
<tmpl_if name="msg">
<div id="OKMsg"><p><tmpl_var name="msg"></p></div>
@@ -13,41 +13,38 @@
<div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
</tmpl_if>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='start_txt'}</p>
- <div class="multiField">
- <input id="action" type="radio" value="start" name="action" {tmpl_var name='start_option_enabled'}/>
- </div>
+ <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></div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='stop_txt'}</p>
- <div class="multiField">
- <input id="action" type="radio" value="stop" name="action" {tmpl_var name='stop_option_enabled'}/>
- </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></div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='restart_txt'}</p>
- <div class="multiField">
- <input id="action" type="radio" value="restart" name="action" {tmpl_var name='restart_option_enabled'}/>
- </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></div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='ostemplate_txt'}</p>
- <div class="multiField">
- <input style="float:left; margin-right:10px;" id="action" type="radio" value="ostemplate" name="action" {tmpl_var name='ostemplate_option_enabled'}/>
- <input name="ostemplate_name" size="30" maxlength="255" type="text" class="textInput" value="{tmpl_var name='ostemplate_name'}" onclick="$('[name=action]').filter('[value=ostemplate]').attr('checked','checked');" /> {tmpl_var name='ostemplate_desc_txt'}
- </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><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>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','vm/openvz_action.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('vm/openvz_vm_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','vm/openvz_action.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="vm/openvz_vm_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/vm/templates/openvz_ip_edit.htm b/interface/web/vm/templates/openvz_ip_edit.htm
index ef0537d..583ea4a 100644
--- a/interface/web/vm/templates/openvz_ip_edit.htm
+++ b/interface/web/vm/templates/openvz_ip_edit.htm
@@ -1,43 +1,40 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_openvz_ip">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>IP address</legend>
- <div class="ctrlHolder">
- <label for="server_id">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id" id="server_id" class="selectInput">
+ <legend>IP address</legend>
+ <div class="form-group">
+ <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
{tmpl_var name='server_id'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="ip_address">{tmpl_var name='ip_address_txt'}</label>
- <input name="ip_address" id="ip_address" value="{tmpl_var name='ip_address'}" size="15" maxlength="15" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="vm_id">{tmpl_var name='vm_id_txt'}</label>
- <select name="vm_id" id="vm_id" class="selectInput" disabled="disabled">
+ </div></div>
+ <div class="form-group">
+ <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" name="ip_address" id="ip_address" value="{tmpl_var name='ip_address'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="vm_id" class="col-sm-3 control-label">{tmpl_var name='vm_id_txt'}</label>
+ <div class="col-sm-9"><select name="vm_id" id="vm_id" class="form-control" disabled="disabled">
{tmpl_var name='vm_id'}
</select>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='reserved_txt'}</p>
- <div class="multiField">
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='reserved_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='reserved'}
</div>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','vm/openvz_ip_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('vm/openvz_ip_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','vm/openvz_ip_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="vm/openvz_ip_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
<script language="JavaScript" type="text/javascript">
var vm_id = jQuery('#vm_id').val();
jQuery('#vm_id').attr({name: 'vm_id_disabled', id: 'vm_id_disabled'});
diff --git a/interface/web/vm/templates/openvz_ip_list.htm b/interface/web/vm/templates/openvz_ip_list.htm
index 378bd01..0091e0d 100644
--- a/interface/web/vm/templates/openvz_ip_list.htm
+++ b/interface/web/vm/templates/openvz_ip_list.htm
@@ -1,47 +1,47 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
-<div class="panel panel_list_openvz_ip">
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('vm/openvz_ip_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="vm/openvz_ip_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_vm_id" scope="col"><tmpl_var name="vm_id_txt"></th>
- <th class="tbl_col_ip_address" scope="col"><tmpl_var name="ip_address_txt"></th>
- <th class="tbl_col_reserved" scope="col"><tmpl_var name="reserved_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="server_id_txt"></th>
+ <th><tmpl_var name="vm_id_txt"></th>
+ <th><tmpl_var name="ip_address_txt"></th>
+ <th><tmpl_var name="reserved_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_vm_id"><select name="search_vm_id">{tmpl_var name='search_vm_id'}</select></td>
- <td class="tbl_col_ip_address"><input type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" /></td>
- <td class="tbl_col_reserved"><select name="search_reserved">{tmpl_var name='search_reserved'}</select></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','vm/openvz_ip_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><select name="search_vm_id">{tmpl_var name='search_vm_id'}</select></td>
+ <td><div class="col-sm-9"><input type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" /></div></td>
+ <td><select name="search_reserved">{tmpl_var name='search_reserved'}</select></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','vm/openvz_ip_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('vm/openvz_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_vm_id"><a href="#" onclick="loadContent('vm/openvz_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="vm_id"}</a></td>
- <td class="tbl_col_ip_address"><a href="#" onclick="loadContent('vm/openvz_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ip_address"}</a></td>
- <td class="tbl_col_reserved"><a href="#" onclick="loadContent('vm/openvz_ip_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="reserved"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="vm/openvz_ip_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
+ <td><a href="#" data-load-content="vm/openvz_ip_edit.php?id={tmpl_var name='id'}">{tmpl_var name="vm_id"}</a></td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -53,11 +53,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
+ <td colspan="5"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/vm/templates/openvz_ostemplate_edit.htm b/interface/web/vm/templates/openvz_ostemplate_edit.htm
index 8bcba15..580e556 100644
--- a/interface/web/vm/templates/openvz_ostemplate_edit.htm
+++ b/interface/web/vm/templates/openvz_ostemplate_edit.htm
@@ -1,48 +1,45 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_openvz_ostemplate">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>Domain</legend>
- <div class="ctrlHolder">
- <label for="template_name">{tmpl_var name='template_name_txt'}</label>
- <input name="template_name" id="template_name" value="{tmpl_var name='template_name'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="template_file">{tmpl_var name='template_file_txt'}</label>
- <input name="template_file" id="template_file" value="{tmpl_var name='template_file'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="server_id">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id" id="server_id" class="selectInput">
+ <legend>Domain</legend>
+ <div class="form-group">
+ <label for="template_name" class="col-sm-3 control-label">{tmpl_var name='template_name_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="template_name" id="template_name" value="{tmpl_var name='template_name'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="template_file" class="col-sm-3 control-label">{tmpl_var name='template_file_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="template_file" id="template_file" value="{tmpl_var name='template_file'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
{tmpl_var name='server_id'}
</select>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='allservers_txt'}</p>
- <div class="multiField">
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='allservers_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='allservers'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="description">{tmpl_var name='description_txt'}</label>
+ <div class="form-group">
+ <label for="description" class="col-sm-3 control-label">{tmpl_var name='description_txt'}</label>
<textarea name="description" id="description" rows='10' cols='30'>{tmpl_var name='description'}</textarea>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','vm/openvz_ostemplate_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('vm/openvz_ostemplate_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','vm/openvz_ostemplate_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="vm/openvz_ostemplate_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/vm/templates/openvz_ostemplate_list.htm b/interface/web/vm/templates/openvz_ostemplate_list.htm
index a4d0fc3..c64ca8a 100644
--- a/interface/web/vm/templates/openvz_ostemplate_list.htm
+++ b/interface/web/vm/templates/openvz_ostemplate_list.htm
@@ -1,50 +1,50 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
-<div class="panel panel_list_openvz_ostemplate">
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('vm/openvz_ostemplate_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="vm/openvz_ostemplate_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_ostemplate_id" scope="col"><tmpl_var name="ostemplate_id_txt"></th>
- <th class="tbl_col_template_name" scope="col"><tmpl_var name="template_name_txt"></th>
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_allservers" scope="col"><tmpl_var name="allservers_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="active_txt"></th>
+ <th><tmpl_var name="ostemplate_id_txt"></th>
+ <th><tmpl_var name="template_name_txt"></th>
+ <th><tmpl_var name="server_id_txt"></th>
+ <th><tmpl_var name="allservers_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_ostemplate_id"><input type="text" name="search_ostemplate_id" value="{tmpl_var name='search_ostemplate_id'}" /></td>
- <td class="tbl_col_template_name"><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></td>
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_allservers"><select name="search_allservers">{tmpl_var name='search_allservers'}</select></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','vm/openvz_ostemplate_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><select name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><div class="col-sm-9"><input type="text" name="search_ostemplate_id" value="{tmpl_var name='search_ostemplate_id'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></div></td>
+ <td><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>
+ <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>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('vm/openvz_ostemplate_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_ostemplate_id"><a href="#" onclick="loadContent('vm/openvz_ostemplate_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ostemplate_id"}</a></td>
- <td class="tbl_col_template_name"><a href="#" onclick="loadContent('vm/openvz_ostemplate_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_name"}</a></td>
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('vm/openvz_ostemplate_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_allservers"><a href="#" onclick="loadContent('vm/openvz_ostemplate_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="allservers"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="vm/openvz_ostemplate_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
+ <td><a href="#" data-load-content="vm/openvz_ostemplate_edit.php?id={tmpl_var name='id'}">{tmpl_var name="ostemplate_id"}</a></td>
+ <td><a href="#" data-load-content="vm/openvz_ostemplate_edit.php?id={tmpl_var name='id'}">{tmpl_var name="template_name"}</a></td>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -56,11 +56,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+ <td colspan="6"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/vm/templates/openvz_template_advanced_edit.htm b/interface/web/vm/templates/openvz_template_advanced_edit.htm
index 86e2807..92bb88a 100644
--- a/interface/web/vm/templates/openvz_template_advanced_edit.htm
+++ b/interface/web/vm/templates/openvz_template_advanced_edit.htm
@@ -1,110 +1,107 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_openvz_template">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>Advanced</legend>
- <div class="ctrlHolder">
- <label for="numproc">{tmpl_var name='numproc_txt'}</label>
- <input name="numproc" id="numproc" value="{tmpl_var name='numproc'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="numtcpsock">{tmpl_var name='numtcpsock_txt'}</label>
- <input name="numtcpsock" id="numtcpsock" value="{tmpl_var name='numtcpsock'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="numothersock">{tmpl_var name='numothersock_txt'}</label>
- <input name="numothersock" id="numothersock" value="{tmpl_var name='numothersock'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="vmguarpages">{tmpl_var name='vmguarpages_txt'}</label>
- <input name="vmguarpages" id="vmguarpages" value="{tmpl_var name='vmguarpages'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="kmemsize">{tmpl_var name='kmemsize_txt'}</label>
- <input name="kmemsize" id="kmemsize" value="{tmpl_var name='kmemsize'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="tcpsndbuf">{tmpl_var name='tcpsndbuf_txt'}</label>
- <input name="tcpsndbuf" id="tcpsndbuf" value="{tmpl_var name='tcpsndbuf'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="tcprcvbuf">{tmpl_var name='tcprcvbuf_txt'}</label>
- <input name="tcprcvbuf" id="tcprcvbuf" value="{tmpl_var name='tcprcvbuf'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="othersockbuf">{tmpl_var name='othersockbuf_txt'}</label>
- <input name="othersockbuf" id="othersockbuf" value="{tmpl_var name='othersockbuf'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="dgramrcvbuf">{tmpl_var name='dgramrcvbuf_txt'}</label>
- <input name="dgramrcvbuf" id="dgramrcvbuf" value="{tmpl_var name='dgramrcvbuf'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="oomguarpages">{tmpl_var name='oomguarpages_txt'}</label>
- <input name="oomguarpages" id="oomguarpages" value="{tmpl_var name='oomguarpages'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="privvmpages">{tmpl_var name='privvmpages_txt'}</label>
- <input name="privvmpages" id="privvmpages" value="{tmpl_var name='privvmpages'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="lockedpages">{tmpl_var name='lockedpages_txt'}</label>
- <input name="lockedpages" id="lockedpages" value="{tmpl_var name='lockedpages'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="shmpages">{tmpl_var name='shmpages_txt'}</label>
- <input name="shmpages" id="shmpages" value="{tmpl_var name='shmpages'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="physpages">{tmpl_var name='physpages_txt'}</label>
- <input name="physpages" id="physpages" value="{tmpl_var name='physpages'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="numfile">{tmpl_var name='numfile_txt'}</label>
- <input name="numfile" id="numfile" value="{tmpl_var name='numfile'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="avnumproc">{tmpl_var name='avnumproc_txt'}</label>
- <input name="avnumproc" id="avnumproc" value="{tmpl_var name='avnumproc'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="numflock">{tmpl_var name='numflock_txt'}</label>
- <input name="numflock" id="numflock" value="{tmpl_var name='numflock'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="numpty">{tmpl_var name='numpty_txt'}</label>
- <input name="numpty" id="numpty" value="{tmpl_var name='numpty'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="numsiginfo">{tmpl_var name='numsiginfo_txt'}</label>
- <input name="numsiginfo" id="numsiginfo" value="{tmpl_var name='numsiginfo'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="dcachesize">{tmpl_var name='dcachesize_txt'}</label>
- <input name="dcachesize" id="dcachesize" value="{tmpl_var name='dcachesize'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="numiptent">{tmpl_var name='numiptent_txt'}</label>
- <input name="numiptent" id="numiptent" value="{tmpl_var name='numiptent'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="swappages">{tmpl_var name='swappages_txt'}</label>
- <input name="swappages" id="swappages" value="{tmpl_var name='swappages'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="capability">{tmpl_var name='capability_txt'}</label>
- <input name="capability" id="capability" value="{tmpl_var name='capability'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- </fieldset>
+ <legend>Advanced</legend>
+ <div class="form-group">
+ <label for="numproc" class="col-sm-3 control-label">{tmpl_var name='numproc_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="numproc" id="numproc" value="{tmpl_var name='numproc'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="numtcpsock" class="col-sm-3 control-label">{tmpl_var name='numtcpsock_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="numtcpsock" id="numtcpsock" value="{tmpl_var name='numtcpsock'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="numothersock" class="col-sm-3 control-label">{tmpl_var name='numothersock_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="numothersock" id="numothersock" value="{tmpl_var name='numothersock'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="vmguarpages" class="col-sm-3 control-label">{tmpl_var name='vmguarpages_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="vmguarpages" id="vmguarpages" value="{tmpl_var name='vmguarpages'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="kmemsize" class="col-sm-3 control-label">{tmpl_var name='kmemsize_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="kmemsize" id="kmemsize" value="{tmpl_var name='kmemsize'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="tcpsndbuf" class="col-sm-3 control-label">{tmpl_var name='tcpsndbuf_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="tcpsndbuf" id="tcpsndbuf" value="{tmpl_var name='tcpsndbuf'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="tcprcvbuf" class="col-sm-3 control-label">{tmpl_var name='tcprcvbuf_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="tcprcvbuf" id="tcprcvbuf" value="{tmpl_var name='tcprcvbuf'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="othersockbuf" class="col-sm-3 control-label">{tmpl_var name='othersockbuf_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="othersockbuf" id="othersockbuf" value="{tmpl_var name='othersockbuf'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="dgramrcvbuf" class="col-sm-3 control-label">{tmpl_var name='dgramrcvbuf_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="dgramrcvbuf" id="dgramrcvbuf" value="{tmpl_var name='dgramrcvbuf'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="oomguarpages" class="col-sm-3 control-label">{tmpl_var name='oomguarpages_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="oomguarpages" id="oomguarpages" value="{tmpl_var name='oomguarpages'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="privvmpages" class="col-sm-3 control-label">{tmpl_var name='privvmpages_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="privvmpages" id="privvmpages" value="{tmpl_var name='privvmpages'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="lockedpages" class="col-sm-3 control-label">{tmpl_var name='lockedpages_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="lockedpages" id="lockedpages" value="{tmpl_var name='lockedpages'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="shmpages" class="col-sm-3 control-label">{tmpl_var name='shmpages_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="shmpages" id="shmpages" value="{tmpl_var name='shmpages'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="physpages" class="col-sm-3 control-label">{tmpl_var name='physpages_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="physpages" id="physpages" value="{tmpl_var name='physpages'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="numfile" class="col-sm-3 control-label">{tmpl_var name='numfile_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="numfile" id="numfile" value="{tmpl_var name='numfile'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="avnumproc" class="col-sm-3 control-label">{tmpl_var name='avnumproc_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="avnumproc" id="avnumproc" value="{tmpl_var name='avnumproc'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="numflock" class="col-sm-3 control-label">{tmpl_var name='numflock_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="numflock" id="numflock" value="{tmpl_var name='numflock'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="numpty" class="col-sm-3 control-label">{tmpl_var name='numpty_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="numpty" id="numpty" value="{tmpl_var name='numpty'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="numsiginfo" class="col-sm-3 control-label">{tmpl_var name='numsiginfo_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="numsiginfo" id="numsiginfo" value="{tmpl_var name='numsiginfo'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="dcachesize" class="col-sm-3 control-label">{tmpl_var name='dcachesize_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="dcachesize" id="dcachesize" value="{tmpl_var name='dcachesize'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="numiptent" class="col-sm-3 control-label">{tmpl_var name='numiptent_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="numiptent" id="numiptent" value="{tmpl_var name='numiptent'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="swappages" class="col-sm-3 control-label">{tmpl_var name='swappages_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="swappages" id="swappages" value="{tmpl_var name='swappages'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="capability" class="col-sm-3 control-label">{tmpl_var name='capability_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="capability" id="capability" value="{tmpl_var name='capability'}" class="form-control" />
+ </div></div>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','vm/openvz_template_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('vm/openvz_template_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','vm/openvz_template_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="vm/openvz_template_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/vm/templates/openvz_template_edit.htm b/interface/web/vm/templates/openvz_template_edit.htm
index e26bdf9..c602c26 100644
--- a/interface/web/vm/templates/openvz_template_edit.htm
+++ b/interface/web/vm/templates/openvz_template_edit.htm
@@ -1,74 +1,71 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_openvz_template">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>Template</legend>
- <div class="ctrlHolder">
- <label for="template_name">{tmpl_var name='template_name_txt'}</label>
- <input name="template_name" id="template_name" value="{tmpl_var name='template_name'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="diskspace">{tmpl_var name='diskspace_txt'}</label>
- <input name="diskspace" id="diskspace" value="{tmpl_var name='diskspace'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" /> GB
- </div>
- <div class="ctrlHolder">
- <label for="ram">{tmpl_var name='ram_txt'}</label>
- <input name="ram" id="ram" value="{tmpl_var name='ram'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" /> MB
- </div>
- <div class="ctrlHolder">
- <label for="ram_burst">{tmpl_var name='ram_burst_txt'}</label>
- <input name="ram_burst" id="ram_burst" value="{tmpl_var name='ram_burst'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" /> MB
- </div>
- <div class="ctrlHolder">
- <label for="cpu_units">{tmpl_var name='cpu_units_txt'}</label>
- <input name="cpu_units" id="cpu_units" value="{tmpl_var name='cpu_units'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" /> (8 - 500000)
- </div>
- <div class="ctrlHolder">
- <label for="cpu_num">{tmpl_var name='cpu_num_txt'}</label>
- <input name="cpu_num" id="cpu_num" value="{tmpl_var name='cpu_num'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" /> (1 - 64)
- </div>
- <div class="ctrlHolder">
- <label for="cpu_limit">{tmpl_var name='cpu_limit_txt'}</label>
- <input name="cpu_limit" id="cpu_limit" value="{tmpl_var name='cpu_limit'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" /> (10 - 6400)
- </div>
- <div class="ctrlHolder">
- <label for="io_priority">{tmpl_var name='io_priority_txt'}</label>
- <input name="io_priority" id="io_priority" value="{tmpl_var name='io_priority'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" /> (0 - 7)
- </div>
- <div class="ctrlHolder">
- <label for="hostname">{tmpl_var name='hostname_txt'}</label>
- <input name="hostname" id="hostname" value="{tmpl_var name='hostname'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='create_dns_txt'}</p>
- <div class="multiField">
+ <legend>Template</legend>
+ <div class="form-group">
+ <label for="template_name" class="col-sm-3 control-label">{tmpl_var name='template_name_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="template_name" id="template_name" value="{tmpl_var name='template_name'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="diskspace" class="col-sm-3 control-label">{tmpl_var name='diskspace_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="diskspace" id="diskspace" value="{tmpl_var name='diskspace'}" class="form-control" /> GB
+ </div></div>
+ <div class="form-group">
+ <label for="ram" class="col-sm-3 control-label">{tmpl_var name='ram_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="ram" id="ram" value="{tmpl_var name='ram'}" class="form-control" /> MB
+ </div></div>
+ <div class="form-group">
+ <label for="ram_burst" class="col-sm-3 control-label">{tmpl_var name='ram_burst_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="ram_burst" id="ram_burst" value="{tmpl_var name='ram_burst'}" class="form-control" /> MB
+ </div></div>
+ <div class="form-group">
+ <label for="cpu_units" class="col-sm-3 control-label">{tmpl_var name='cpu_units_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="cpu_units" id="cpu_units" value="{tmpl_var name='cpu_units'}" class="form-control" /> (8 - 500000)
+ </div></div>
+ <div class="form-group">
+ <label for="cpu_num" class="col-sm-3 control-label">{tmpl_var name='cpu_num_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="cpu_num" id="cpu_num" value="{tmpl_var name='cpu_num'}" class="form-control" /> (1 - 64)
+ </div></div>
+ <div class="form-group">
+ <label for="cpu_limit" class="col-sm-3 control-label">{tmpl_var name='cpu_limit_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="cpu_limit" id="cpu_limit" value="{tmpl_var name='cpu_limit'}" class="form-control" /> (10 - 6400)
+ </div></div>
+ <div class="form-group">
+ <label for="io_priority" class="col-sm-3 control-label">{tmpl_var name='io_priority_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="io_priority" id="io_priority" value="{tmpl_var name='io_priority'}" class="form-control" /> (0 - 7)
+ </div></div>
+ <div class="form-group">
+ <label for="hostname" class="col-sm-3 control-label">{tmpl_var name='hostname_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="hostname" id="hostname" value="{tmpl_var name='hostname'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='create_dns_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='create_dns'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="nameserver">{tmpl_var name='nameserver_txt'}</label>
- <input name="nameserver" id="nameserver" value="{tmpl_var name='nameserver'}" size="30" maxlength="255" type="text" class="textInput" /> {tmpl_var name='nameserver_desc_txt'}
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label for="nameserver" class="col-sm-3 control-label">{tmpl_var name='nameserver_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="nameserver" id="nameserver" value="{tmpl_var name='nameserver'}" class="form-control" /> {tmpl_var name='nameserver_desc_txt'}
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="description">{tmpl_var name='description_txt'}</label>
+ <div class="form-group">
+ <label for="description" class="col-sm-3 control-label">{tmpl_var name='description_txt'}</label>
<textarea name="description" id="description" rows='10' cols='30'>{tmpl_var name='description'}</textarea>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','vm/openvz_template_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('vm/openvz_template_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','vm/openvz_template_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="vm/openvz_template_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/vm/templates/openvz_template_list.htm b/interface/web/vm/templates/openvz_template_list.htm
index 359af7c..693272d 100644
--- a/interface/web/vm/templates/openvz_template_list.htm
+++ b/interface/web/vm/templates/openvz_template_list.htm
@@ -1,41 +1,41 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
-<div class="panel panel_list_openvz_template">
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('vm/openvz_template_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="vm/openvz_template_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_template_name" scope="col"><tmpl_var name="template_name_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <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 class="filter">
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_template_name"><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','vm/openvz_template_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><select name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><div class="col-sm-9"><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','vm/openvz_template_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_active"><a href="#" onclick="loadContent('vm/openvz_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_template_name"><a href="#" onclick="loadContent('vm/openvz_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_name"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -47,11 +47,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
+ <td colspan="3"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
diff --git a/interface/web/vm/templates/openvz_vm_advanced_edit.htm b/interface/web/vm/templates/openvz_vm_advanced_edit.htm
index 0226eda..2812ceb 100644
--- a/interface/web/vm/templates/openvz_vm_advanced_edit.htm
+++ b/interface/web/vm/templates/openvz_vm_advanced_edit.htm
@@ -1,64 +1,61 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_openvz_vm">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>Advanced</legend>
- <div class="ctrlHolder">
- <label for="veid">{tmpl_var name='veid_txt'}</label>
- <input name="veid" id="veid" value="{tmpl_var name='veid'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='create_dns_txt'}</p>
- <div class="multiField">
+ <legend>Advanced</legend>
+ <div class="form-group">
+ <label for="veid" class="col-sm-3 control-label">{tmpl_var name='veid_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="veid" id="veid" value="{tmpl_var name='veid'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='create_dns_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='create_dns'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="diskspace">{tmpl_var name='diskspace_txt'}</label>
- <input name="diskspace" id="diskspace" value="{tmpl_var name='diskspace'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" /> GB
- </div>
- <div class="ctrlHolder">
- <label for="ram">{tmpl_var name='ram_txt'}</label>
- <input name="ram" id="ram" value="{tmpl_var name='ram'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" /> MB
- </div>
- <div class="ctrlHolder">
- <label for="ram_burst">{tmpl_var name='ram_burst_txt'}</label>
- <input name="ram_burst" id="ram_burst" value="{tmpl_var name='ram_burst'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" /> MB
- </div>
- <div class="ctrlHolder">
- <label for="cpu_units">{tmpl_var name='cpu_units_txt'}</label>
- <input name="cpu_units" id="cpu_units" value="{tmpl_var name='cpu_units'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" /> (8 - 500000)
- </div>
- <div class="ctrlHolder">
- <label for="cpu_num">{tmpl_var name='cpu_num_txt'}</label>
- <input name="cpu_num" id="cpu_num" value="{tmpl_var name='cpu_num'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" /> (1 - 64)
- </div>
- <div class="ctrlHolder">
- <label for="cpu_limit">{tmpl_var name='cpu_limit_txt'}</label>
- <input name="cpu_limit" id="cpu_limit" value="{tmpl_var name='cpu_limit'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" /> (10 - 6400)
- </div>
- <div class="ctrlHolder">
- <label for="io_priority">{tmpl_var name='io_priority_txt'}</label>
- <input name="io_priority" id="io_priority" value="{tmpl_var name='io_priority'}" size="30" maxlength="255" type="text" class="textInput formLengthLimit" /> (0 - 7)
- </div>
- <div class="ctrlHolder">
- <label for="nameserver">{tmpl_var name='nameserver_txt'}</label>
- <input name="nameserver" id="nameserver" value="{tmpl_var name='nameserver'}" size="30" maxlength="255" type="text" class="textInput" /> {tmpl_var name='nameserver_desc_txt'}
- </div>
- <div class="ctrlHolder">
- <label for="capability">{tmpl_var name='capability_txt'}</label>
- <input name="capability" id="capability" value="{tmpl_var name='capability'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- </fieldset>
+ <div class="form-group">
+ <label for="diskspace" class="col-sm-3 control-label">{tmpl_var name='diskspace_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="diskspace" id="diskspace" value="{tmpl_var name='diskspace'}" class="form-control" /> GB
+ </div></div>
+ <div class="form-group">
+ <label for="ram" class="col-sm-3 control-label">{tmpl_var name='ram_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="ram" id="ram" value="{tmpl_var name='ram'}" class="form-control" /> MB
+ </div></div>
+ <div class="form-group">
+ <label for="ram_burst" class="col-sm-3 control-label">{tmpl_var name='ram_burst_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="ram_burst" id="ram_burst" value="{tmpl_var name='ram_burst'}" class="form-control" /> MB
+ </div></div>
+ <div class="form-group">
+ <label for="cpu_units" class="col-sm-3 control-label">{tmpl_var name='cpu_units_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="cpu_units" id="cpu_units" value="{tmpl_var name='cpu_units'}" class="form-control" /> (8 - 500000)
+ </div></div>
+ <div class="form-group">
+ <label for="cpu_num" class="col-sm-3 control-label">{tmpl_var name='cpu_num_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="cpu_num" id="cpu_num" value="{tmpl_var name='cpu_num'}" class="form-control" /> (1 - 64)
+ </div></div>
+ <div class="form-group">
+ <label for="cpu_limit" class="col-sm-3 control-label">{tmpl_var name='cpu_limit_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="cpu_limit" id="cpu_limit" value="{tmpl_var name='cpu_limit'}" class="form-control" /> (10 - 6400)
+ </div></div>
+ <div class="form-group">
+ <label for="io_priority" class="col-sm-3 control-label">{tmpl_var name='io_priority_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="io_priority" id="io_priority" value="{tmpl_var name='io_priority'}" class="form-control" /> (0 - 7)
+ </div></div>
+ <div class="form-group">
+ <label for="nameserver" class="col-sm-3 control-label">{tmpl_var name='nameserver_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="nameserver" id="nameserver" value="{tmpl_var name='nameserver'}" class="form-control" /> {tmpl_var name='nameserver_desc_txt'}
+ </div></div>
+ <div class="form-group">
+ <label for="capability" class="col-sm-3 control-label">{tmpl_var name='capability_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="capability" id="capability" value="{tmpl_var name='capability'}" class="form-control" />
+ </div></div>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','vm/openvz_vm_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('vm/openvz_vm_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','vm/openvz_vm_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="vm/openvz_vm_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
\ No newline at end of file
diff --git a/interface/web/vm/templates/openvz_vm_edit.htm b/interface/web/vm/templates/openvz_vm_edit.htm
index 446cd1e..98e5ce4 100644
--- a/interface/web/vm/templates/openvz_vm_edit.htm
+++ b/interface/web/vm/templates/openvz_vm_edit.htm
@@ -1,107 +1,104 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_openvz_vm">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>Settings</legend>
+ <legend>Settings</legend>
<tmpl_if name="is_admin">
- <div class="ctrlHolder">
+ <div class="form-group">
<tmpl_if name="edit_disabled">
- <label for="server_id_disabled">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id_disabled" id="server_id_disabled" class="selectInput" disabled="disabled">
+ <label for="server_id_disabled" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id_disabled" id="server_id_disabled" class="form-control" disabled="disabled">
{tmpl_var name='server_id'}
</select>
- <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+ </div><input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
<tmpl_else>
- <label for="server_id">{tmpl_var name='server_id_txt'}</label>
- <select name="server_id" id="server_id" class="selectInput" onChange="loadOptionInto('ip_address','vm/ajax_get_ip.php?server_id='+document.getElementById('server_id').value)">
+ <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
+ <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control" onChange="loadOptionInto('ip_address','vm/ajax_get_ip.php?server_id='+document.getElementById('server_id').value)">
{tmpl_var name='server_id'}
</select>
- </tmpl_if>
+ </div></tmpl_if>
</div>
- <div class="ctrlHolder">
- <label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
- <select name="client_group_id" id="client_group_id" class="selectInput">
+ <div class="form-group">
+ <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_group_id_txt'}</label>
+ <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
{tmpl_var name='client_group_id'}
</select>
- </div>
+ </div></div>
</tmpl_if>
<tmpl_if name="is_reseller">
- <div class="ctrlHolder">
- <label for="client_group_id">{tmpl_var name='client_group_id_txt'}</label>
- <select name="client_group_id" id="client_group_id" class="selectInput">
+ <div class="form-group">
+ <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_group_id_txt'}</label>
+ <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
{tmpl_var name='client_group_id'}
</select>
- </div>
+ </div></div>
</tmpl_if>
<tmpl_if name="edit_disabled">
- <div class="ctrlHolder">
- <label for="ostemplate_id_disabled">{tmpl_var name='ostemplate_id_txt'}</label>
- <select name="ostemplate_id_disabled" id="ostemplate_id_disabled" class="selectInput" disabled="disabled">
+ <div class="form-group">
+ <label for="ostemplate_id_disabled" class="col-sm-3 control-label">{tmpl_var name='ostemplate_id_txt'}</label>
+ <div class="col-sm-9"><select name="ostemplate_id_disabled" id="ostemplate_id_disabled" class="form-control" disabled="disabled">
{tmpl_var name='ostemplate_id'}
</select>
- </div>
+ </div></div>
<input type="hidden" name="ostemplate_id" value="{tmpl_var name='ostemplate_id_value'}">
<tmpl_else>
- <div class="ctrlHolder">
- <label for="ostemplate_id">{tmpl_var name='ostemplate_id_txt'}</label>
- <select name="ostemplate_id" id="ostemplate_id" class="selectInput">
+ <div class="form-group">
+ <label for="ostemplate_id" class="col-sm-3 control-label">{tmpl_var name='ostemplate_id_txt'}</label>
+ <div class="col-sm-9"><select name="ostemplate_id" id="ostemplate_id" class="form-control">
{tmpl_var name='ostemplate_id'}
</select>
- </div>
+ </div></div>
</tmpl_if>
- <div class="ctrlHolder">
- <label for="template_id">{tmpl_var name='template_id_txt'}</label>
- <select name="template_id" id="template_id" class="selectInput">
+ <div class="form-group">
+ <label for="template_id" class="col-sm-3 control-label">{tmpl_var name='template_id_txt'}</label>
+ <div class="col-sm-9"><select name="template_id" id="template_id" class="form-control">
{tmpl_var name='template_id_select'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="ip_address">{tmpl_var name='ip_address_txt'}</label>
- <select name="ip_address" id="ip_address" class="selectInput">
+ </div></div>
+ <div class="form-group">
+ <label for="ip_address" class="col-sm-3 control-label">{tmpl_var name='ip_address_txt'}</label>
+ <div class="col-sm-9"><select name="ip_address" id="ip_address" class="form-control">
{tmpl_var name='ip_address'}
</select>
- </div>
- <div class="ctrlHolder">
- <label for="hostname">{tmpl_var name='hostname_txt'}</label>
- <input name="hostname" id="hostname" value="{tmpl_var name='hostname'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <label for="vm_password">{tmpl_var name='vm_password_txt'}</label>
- <input name="vm_password" id="vm_password" value="{tmpl_var name='vm_password'}" size="30" maxlength="255" type="text" class="textInput" />
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='start_boot_txt'}</p>
- <div class="multiField">
+ </div></div>
+ <div class="form-group">
+ <label for="hostname" class="col-sm-3 control-label">{tmpl_var name='hostname_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="hostname" id="hostname" value="{tmpl_var name='hostname'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="vm_password" class="col-sm-3 control-label">{tmpl_var name='vm_password_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="vm_password" id="vm_password" value="{tmpl_var name='vm_password'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='start_boot_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='start_boot'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='active'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="active_until_date">{tmpl_var name='active_until_date_txt'}</label>
- <input name="active_until_date" id="active_until_date" value="{tmpl_var name='active_until_date'}" size="30" maxlength="255" type="text" class="textInput formLengthDate" />
- </div>
- <div class="ctrlHolder">
- <label for="description">{tmpl_var name='description_txt'}</label>
+ <div class="form-group">
+ <label for="active_until_date" class="col-sm-3 control-label">{tmpl_var name='active_until_date_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="active_until_date" id="active_until_date" value="{tmpl_var name='active_until_date'}" class="form-control" />
+ </div></div>
+ <div class="form-group">
+ <label for="description" class="col-sm-3 control-label">{tmpl_var name='description_txt'}</label>
<textarea name="description" id="description" rows='5' cols='30' style='height:60px;'>{tmpl_var name='description'}</textarea>
</div>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','vm/openvz_vm_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('vm/openvz_vm_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','vm/openvz_vm_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="vm/openvz_vm_list.php"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div></div>
<script language="JavaScript" type="text/javascript">
jQuery( "#active_until_date" ).datepicker({ dateFormat: '<tmpl_var name="date_format">', changeMonth: true, changeYear: true, yearRange: '-100:+100', dayNamesMin: ['<tmpl_var name="daynamesmin_su">','<tmpl_var name="daynamesmin_mo">','<tmpl_var name="daynamesmin_tu">','<tmpl_var name="daynamesmin_we">','<tmpl_var name="daynamesmin_th">','<tmpl_var name="daynamesmin_fr">','<tmpl_var name="daynamesmin_sa">'], dayNames: ['<tmpl_var name="daynames_sunday">','<tmpl_var name="daynames_monday">','<tmpl_var name="daynames_tuesday">','<tmpl_var name="daynames_wednesday">','<tmpl_var name="daynames_thursday">','<tmpl_var name="daynames_friday">','<tmpl_var name="daynames_saturday">'], monthNamesShort: ['<tmpl_var name="monthnamesshort_jan">','<tmpl_var name="monthnamesshort_feb">','<tmpl_var name="monthnamesshort_mar">','<tmpl_var name="monthnamesshort_apr">','<tmpl_var name="monthnamesshort_may">','<tmpl_var name="monthnamesshort_jun">','<tmpl_var name="monthnamesshort_jul">','<tmpl_var name="monthnamesshort_aug">','<tmpl_var name="monthnamesshort_sep">','<tmpl_var name="monthnamesshort_oct">','<tmpl_var name="monthnamesshort_nov">','<tmpl_var name="monthnamesshort_dec">'], nextText: '<tmpl_var name="datepicker_nextText">', prevText: '<tmpl_var name="datepicker_prevText">', firstDay: 1 });
</script>
\ No newline at end of file
diff --git a/interface/web/vm/templates/openvz_vm_list.htm b/interface/web/vm/templates/openvz_vm_list.htm
index d525f38..73fdc01 100644
--- a/interface/web/vm/templates/openvz_vm_list.htm
+++ b/interface/web/vm/templates/openvz_vm_list.htm
@@ -1,57 +1,57 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
-<div class="panel panel_list_openvz_vm">
- <div class="pnl_toolsarea">
- <fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
- <div class="buttons">
- <button class="button iconstxt icoAdd" type="button" onclick="loadContent('vm/openvz_vm_edit.php');">
+ <p>{tmpl_var name="toolsarea_head_txt"}</p>
+
+ <button class="button iconstxt icoAdd" type="button" data-load-content="vm/openvz_vm_edit.php">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
- </div>
- </fieldset>
- </div>
+
+
- <div class="pnl_listarea">
- <fieldset><legend><tmpl_var name="list_head_txt"></legend>
- <table class="list">
- <thead>
- <tr class="caption">
- <th class="tbl_col_veid" scope="col"><tmpl_var name="veid_txt"></th>
- <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
- <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
- <th class="tbl_col_ostemplate_id" scope="col"><tmpl_var name="ostemplate_id_txt"></th>
- <th class="tbl_col_template_id" scope="col"><tmpl_var name="template_id_txt"></th>
- <th class="tbl_col_hostname" scope="col"><tmpl_var name="hostname_txt"></th>
- <th class="tbl_col_ip_address" scope="col"><tmpl_var name="ip_address_txt"></th>
- <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th>
+
+ <p><tmpl_var name="list_head_txt"></p>
+ <div class="table-wrapper marginTop15">
+<table class="table">
+ <thead class="dark">
+ <tr>
+ <th><tmpl_var name="veid_txt"></th>
+ <th><tmpl_var name="active_txt"></th>
+ <th><tmpl_var name="server_id_txt"></th>
+ <th><tmpl_var name="ostemplate_id_txt"></th>
+ <th><tmpl_var name="template_id_txt"></th>
+ <th><tmpl_var name="hostname_txt"></th>
+ <th><tmpl_var name="ip_address_txt"></th>
+ <th>{tmpl_var name='search_limit'}</th>
</tr>
- <tr class="filter">
- <td class="tbl_col_veid"><input type="text" name="search_veid" value="{tmpl_var name='search_veid'}" /></td>
- <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_ostemplate_id"><select name="search_ostemplate_id">{tmpl_var name='search_ostemplate_id'}</select></td>
- <td class="tbl_col_template_id"><select name="search_template_id">{tmpl_var name='search_template_id'}</select></td>
- <td class="tbl_col_hostname"><input type="text" name="search_hostname" value="{tmpl_var name='search_hostname'}" /></td>
- <td class="tbl_col_ip_address"><input type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" /></td>
- <td class="tbl_col_buttons">
- <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','vm/openvz_vm_list.php');"><span>{tmpl_var name="filter_txt"}</span></button>
+ <tr>
+ <td><div class="col-sm-9"><input type="text" name="search_veid" value="{tmpl_var name='search_veid'}" /></div></td>
+ <td><select name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><select name="search_ostemplate_id">{tmpl_var name='search_ostemplate_id'}</select></td>
+ <td><select name="search_template_id">{tmpl_var name='search_template_id'}</select></td>
+ <td><div class="col-sm-9"><input type="text" name="search_hostname" value="{tmpl_var name='search_hostname'}" /></div></td>
+ <td><div class="col-sm-9"><input type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" /></div></td>
+ <td>
+ <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','vm/openvz_vm_list.php');">{tmpl_var name="filter_txt"}</button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td class="tbl_col_veid"><a href="#" onclick="loadContent('vm/openvz_vm_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="veid"}</a></td>
- <td class="tbl_col_active"><a href="#" onclick="loadContent('vm/openvz_vm_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td>
- <td class="tbl_col_server_id"><a href="#" onclick="loadContent('vm/openvz_vm_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td>
- <td class="tbl_col_ostemplate_id"><a href="#" onclick="loadContent('vm/openvz_vm_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ostemplate_id"}</a></td>
- <td class="tbl_col_template_id"><a href="#" onclick="loadContent('vm/openvz_vm_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_id"}</a></td>
- <td class="tbl_col_hostname"><a href="#" onclick="loadContent('vm/openvz_vm_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="hostname"}</a></td>
- <td class="tbl_col_ip_address"><a href="#" onclick="loadContent('vm/openvz_vm_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ip_address"}</a></td>
- <td class="tbl_col_buttons">
- <a class="button icons16 icoAction" href="javascript: loadContent('vm/openvz_action.php?id={tmpl_var name='id'}');"><span>Action</span></a>
- <a class="button icons16 icoDelete" 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>{tmpl_var name='delete_txt'}</span></a>
+ <td><a href="#" data-load-content="vm/openvz_vm_edit.php?id={tmpl_var name='id'}">{tmpl_var name="veid"}</a></td>
+ <td><a href="#" data-load-content="vm/openvz_vm_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
+ <td><a href="#" data-load-content="vm/openvz_vm_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
+ <td><a href="#" data-load-content="vm/openvz_vm_edit.php?id={tmpl_var name='id'}">{tmpl_var name="ostemplate_id"}</a></td>
+ <td><a href="#" data-load-content="vm/openvz_vm_edit.php?id={tmpl_var name='id'}">{tmpl_var name="template_id"}</a></td>
+ <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="button icons16 icoAction" data-load-content="vm/openvz_action.php?id={tmpl_var name='id'}"><span>Action</span></a>
+ <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>
</td>
</tr>
</tmpl_loop>
@@ -63,11 +63,10 @@
</tbody>
<tfoot>
<tr>
- <td class="tbl_footer tbl_paging" colspan="8"><tmpl_var name="paging"></td>
+ <td colspan="8"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
- </fieldset>
- </div>
-
-</div>
\ No newline at end of file
+</div>
+
+
\ No newline at end of file
--
Gitblit v1.9.1