maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Provide setting and log rotation for special logfiles after creating domains, fixes #1010

Browse Source
This commit is contained in:
Arnold Bechtoldt
2012-03-08 15:11:25 +01:00
parent 8f9a323e0b
commit 454b48f9a8
10 changed files with 1083 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
templates/Froxlor/admin/domains/domains_edit.tpl
View File

@@ -13,11 +13,25 @@ $header
<fieldset>
<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
<div id="speciallogwarningpopup" name="speciallogwarningpopup" align="center">
<div class="warningtitle">{$lng['admin']['delete_statistics']}</div>
</p>{$lng['admin']['speciallogwarning']}</p>
<input type="text" name="delete_stats" id="delete_stats"></p>
<div style="margin-top:10px;">
<input type="button" class="yesbutton" name="verifybutton" value="{$lng['panel']['delete']}" id="speciallogyesbutton" />&nbsp;
<input type="button" class="nobutton" value="{$lng['panel']['cancel']}" id="speciallognobutton" />
</div>
</div>
<table class="formtable">
{$domain_edit_form}
</table>
<p style="display: none;">
<p style="display:none;">
<input type="hidden" name="delete_statistics_str" id="delete_statistics_str" value="{$lng['admin']['delete_statistics']}">
<input type="hidden" name="speciallogverified" id="speciallogverified" value="0" />
<input type="hidden" name="s" value="$s" />
<input type="hidden" name="page" value="$page" />
<input type="hidden" name="action" value="$action" />

10
templates/Froxlor/froxlor.css
View File

@@ -59,7 +59,7 @@ td a {
text-decoration: none;
}
.bradius {
.bradius,.ui-corner-all {
-webkit-border-top-left-radius: 20px;
-webkit-border-bottom-right-radius: 20px;
-moz-border-radius-topleft: 20px;
@@ -323,7 +323,7 @@ p.submit {
/*
* warning message display
*/
.warningcontainer {
.warningcontainer,.ui-dialog {
background: url('../../images/Froxlor/icons/warning.png') 10px center no-repeat #fffecc;
border: 1px solid #f3c37e;
padding: 10px 10px 10px 68px !important;
@@ -332,12 +332,12 @@ p.submit {
overflow: hidden;
}
.warningtitle {
+.warningtitle,.ui-dialog-titlebar {
font-weight: bold;
color: #D57D00;
}
.warning {
.warning,.ui-dialog-content {
color: #D57D00 !important;
}
@@ -579,7 +579,7 @@ input[type="button"],input[type="submit"],input[type="reset"] {
border-radius: 5px;
}
input[type="submit"] {
input[type="submit"],input[class="yesbutton"] {
color: green;
background: #ccc url('../../images/Froxlor/icons/button_ok.png') no-repeat 4px 8px;
padding-left: 20px;

10
templates/Froxlor/header.tpl
View File

@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title><if isset($userinfo['loginname']) && $userinfo['loginname'] != ''>{$userinfo['loginname']} - </if>Froxlor Server Management Panel</title>
<meta charset="iso-8859-1" />
<meta http-equiv="Default-Style" content="text/css" />
<if $settings['panel']['no_robots'] == '0'>
@@ -8,6 +9,7 @@
<meta name="GOOGLEBOT" content="nosnippet" />
</if>
<script type="text/javascript" src="js/jquery.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.8.13.min.js"></script>
<!--[if lt IE 9]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
<if isset($intrafficpage)>
<!--[if lt IE 9]><script language="javascript" type="text/javascript" src="js/excanvas.js"></script><![endif]-->
@@ -18,11 +20,11 @@
<link rel="stylesheet" type="text/css" href="css/jquery.jqplot.css" />
<script language="javascript" type="text/javascript" src="js/traffic.js"></script>
</if>
<link rel="stylesheet" href="templates/Froxlor/froxlor.css" />
<!--[if IE]><link rel="stylesheet" href="templates/Froxlor/froxlor_ie.css" /><![endif]-->
<link href="templates/Froxlor/froxlor.css" rel="stylesheet" type="text/css" />
<!--[if IE]><link rel="stylesheet" href="templates/Froxlor/froxlor_ie.css" type="text/css" /><![endif]-->
<link href="css/jquery-ui.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="templates/Froxlor/js/froxlor.js"></script>
<link rel="icon" href="images/favicon.ico" type="image/x-icon" />
<title><if isset($userinfo['loginname']) && $userinfo['loginname'] != ''>{$userinfo['loginname']} - </if>Froxlor Server Management Panel</title>
<link href="images/favicon.ico" rel="icon" type="image/x-icon" />
</head>
<body>

54
templates/Froxlor/js/froxlor.js
View File

@@ -1,4 +1,27 @@
$(document).ready(function() {
//TODO COMMENT!
$.getQueryVariable = function(key) {
var urlParams = decodeURI( window.location.search.substring(1) );
if(urlParams == false | urlParams == '') return null;
var vars = urlParams.split("&");
for (var i=0;i<vars.length;i++) {
var pair = vars[i].split("=");
if (pair[0] == key) {
return pair[1];
}
}
return null;
}
var $speciallogdialog = $('#speciallogwarningpopup')
.dialog({
autoOpen: false,
closeOnEscape: false,
draggable: false,
modal: true,
resizable: false,
});
// make rel="external" links open in a new window
$("a[rel='external']").attr('target', '_blank');
$(".main").css('min-height', $("nav").height() - 34);
@@ -50,4 +73,35 @@ $(document).ready(function() {
$('#yesnobutton').click(function() {
history.back();
});
$('input[name=speciallogfile]').click(function () {
if($.getQueryVariable("page") == "domains" && $.getQueryVariable("action") == "edit") {
$speciallogdialog.dialog("open");
$(".ui-dialog-titlebar").hide();
}
});
$('#speciallogyesbutton').click(function () {
$speciallogdialog.dialog("close");
if($('#delete_stats').val().toLowerCase() != $('#delete_statistics_str').val().toLowerCase()) {
$("#speciallogverified").val("0");
if($('input[name=speciallogfile]').prop("checked") != false) {
$('input[name=speciallogfile]').attr("checked", false);
} else {
$('input[name=speciallogfile]').attr("checked", true);
}
} else {
$("#speciallogverified").val("1");
}
});
$('input[id=speciallognobutton]').click(function () {
$speciallogdialog.dialog("close");
$("#speciallogverified").val("0");
if($('input[name=speciallogfile]').prop("checked") != false) {
$('input[name=speciallogfile]').attr("checked", false);
} else {
$('input[name=speciallogfile]').attr("checked", true);
}
});
});