From 3b3836ff1d8fd6cb2993156197effaf93a840a2b Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Fri, 6 Jul 2012 10:55:35 +0300 Subject: [PATCH] fixes from dalaylama for 0.9.7 --- web/add/web/index.php | 6 +++--- web/templates/admin/add_web.html | 2 +- web/templates/admin/list_rrd.html | 3 +-- web/templates/header.html | 29 +++++++++++++++++++++++++++-- 4 files changed, 32 insertions(+), 8 deletions(-) diff --git a/web/add/web/index.php b/web/add/web/index.php index 4de85be2..6cb03aa2 100644 --- a/web/add/web/index.php +++ b/web/add/web/index.php @@ -21,7 +21,7 @@ top_panel($user,$TAB); if (empty($_POST['v_template'])) $errors[] = 'template'; if ((!empty($_POST['v_ssl'])) && (empty($_POST['v_ssl_crt']))) $errors[] = 'ssl certificate'; if ((!empty($_POST['v_ssl'])) && (empty($_POST['v_ssl_key']))) $errors[] = 'ssl key'; - if ((!empty($_POST['v_aliases'])) || (!empty($_POST['v_elog'])) || (!empty($_POST['v_ssl'])) || (!empty($_POST['v_ssl_crt'])) || (!empty($_POST['v_ssl_key'])) || (!empty($_POST['v_ssl_ca'])) || ($_POST['v_stats'] != 'none')) $v_adv = 'yes'; + if ((!empty($_POST['v_aliases'])) || (!empty($_POST['v_elog'])) || (!empty($_POST['v_ssl'])) || (!empty($_POST['v_ssl_crt'])) || (!empty($_POST['v_ssl_key'])) || (!empty($_POST['v_ssl_ca'])) || ($_POST['v_stats'] != 'none') || (empty($_POST['v_nginx']))) $v_adv = 'yes'; // Protect input $v_domain = preg_replace("/^www./i", "", $_POST['v_domain']); @@ -30,9 +30,9 @@ top_panel($user,$TAB); $v_template = escapeshellarg($_POST['v_template']); if (empty($_POST['v_dns'])) $v_dns = 'off'; if (empty($_POST['v_mail'])) $v_mail = 'off'; + if (empty($_POST['v_nginx'])) $v_nginx = 'off'; $v_aliases = $_POST['v_aliases']; $v_elog = $_POST['v_elog']; - $v_nginx = $_POST['v_nginx']; $v_ssl = $_POST['v_ssl']; $v_ssl_crt = $_POST['v_ssl_crt']; $v_ssl_key = $_POST['v_ssl_key']; @@ -123,7 +123,7 @@ top_panel($user,$TAB); } // Add Nginx - if ((!empty($_POST['v_nginx'])) && (empty($_SESSION['error_msg']))) { + if (($_POST['v_nginx'] == 'on') && (empty($_SESSION['error_msg']))) { $nginx_ext = "'jpg,jpeg,gif,png,ico,css,zip,tgz,gz,rar,bz2,doc,xls,exe,pdf,ppt,txt,tar,wav,bmp,rtf,js,mp3,avi,mpeg,html,htm'"; exec (VESTA_CMD."v_add_web_domain_nginx ".$user." ".$v_domain." 'default' ".$nginx_ext." 'no'", $output, $return_var); if ($return_var != 0) { diff --git a/web/templates/admin/add_web.html b/web/templates/admin/add_web.html index 0f8f0a53..96d7dfe6 100644 --- a/web/templates/admin/add_web.html +++ b/web/templates/admin/add_web.html @@ -64,7 +64,7 @@ Error Logging > Nginx Support - > + > SSL Support > SSL Certificate diff --git a/web/templates/admin/list_rrd.html b/web/templates/admin/list_rrd.html index 16e0a595..de4e99ac 100644 --- a/web/templates/admin/list_rrd.html +++ b/web/templates/admin/list_rrd.html @@ -21,8 +21,7 @@ foreach ($data as $key => $value) { - - +
download update" target="_blank"> download
diff --git a/web/templates/header.html b/web/templates/header.html index 2f7d83df..e73027cd 100644 --- a/web/templates/header.html +++ b/web/templates/header.html @@ -169,11 +169,16 @@ if (!empty($_SESSION['look'])) { .nav-slink { letter-spacing: -1.2px; font-size: 16pt; - color: #8B99A2; + color: #7ba1aa; font-family: Arial, sans-serif; text-decoration: none; } + .nav-slink:active { + color: #68797d; + text-decoration: underline; + } + .sub-menu { margin-left: auto; margin-right: auto; @@ -519,9 +524,29 @@ if (!empty($_SESSION['look'])) { } .add-button { + cursor: pointer; + background-color: #F1F1F1; + border: 1px solid #ACACAC; + border-radius: 3px 3px 3px 3px; + color: #555555; + font-size: 12px; + font-weight: bold; + padding: 3px 16px; + width: 105px; padding: 4px; margin: 0 6px 0 0; - font-size: 12pt; + } + + button { + cursor: pointer; + background-color: #F1F1F1; + border: 1px solid #ACACAC; + border-radius: 3px 3px 3px 3px; + color: #555555; + font-size: 12px; + font-weight: bold; + padding: 3px 16px; + width: 105px; } .genpass {