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

Merge branch 'master' of git.froxlor.org:froxlor

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2011-03-02 07:27:24 +01:00
parent d66d32066d 00edba1d0d
commit 687b28016e
9 changed files with 66 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
actions/admin/settings/100.panel.php
View File

@@ -39,8 +39,7 @@ return array(
'type' => 'option',
'default' => 'Froxlor',
'option_mode' => 'one',
'option_options' => array('Classic' => 'Classic', 'Froxlor' => 'Froxlor'),
/* 'option_options_method' => 'getThemes', // iterate through templates/ and dynamically display all folders found */
'option_options_method' => 'getThemes',
'save_method' => 'storeSettingField',
),
'panel_natsorting' => array(

8
install/install.php
View File

@@ -931,8 +931,12 @@ else
<input type="radio" name="webserver" id="apache" value="apache2" <?php echo $webserver == "apache2" ? 'checked="checked"' : "" ?>/>Apache2
</p>
<p>
<label for="lighty"<?php echo ((!empty($_POST['installstep']) && $webserver == '') ? ' style="color:red;"' : ''); ?>><?php echo $lng['install']['webserver']; ?> ligHTTPd:</label>&nbsp;
<input type="radio" name="webserver" id="lighty" value="lighttpd" <?php echo $webserver == "lighttpd" ? 'checked="checked"' : "" ?>/>ligHTTPd
<label for="lighty"<?php echo ((!empty($_POST['installstep']) && $webserver == '') ? ' style="color:red;"' : ''); ?>><?php echo $lng['install']['webserver']; ?> LigHTTPd:</label>&nbsp;
<input type="radio" name="webserver" id="lighty" value="lighttpd" <?php echo $webserver == "lighttpd" ? 'checked="checked"' : "" ?>/>LigHTTPd
</p>
<p>
<label for="nginx"<?php echo ((!empty($_POST['installstep']) && $webserver == '') ? ' style="color:red;"' : ''); ?>><?php echo $lng['install']['webserver']; ?> Nginx:</label>&nbsp;
<input type="radio" name="webserver" id="nginx" value="nginx" <?php echo $webserver == "nginx" ? 'checked="checked"' : "" ?>/>Nginx
</p>
<p>
<label for="httpuser"<?php echo ((!empty($_POST['installstep']) && $httpuser == '') ? ' style="color:red;"' : ''); ?>><?php echo $lng['install']['httpuser']; ?>:</label>&nbsp;

2
lib/functions/froxlor/function.getThemes.php
View File

@@ -37,7 +37,7 @@ function getThemes()
&& $it->getFilename() != '.svn'
&& $it->getFilename() != 'misc'
) {
$themes_available[] = $it->getFilename();
$themes_available[$it->getFilename()] = $it->getFilename();
}
}
}

1
templates/Classic/customer/email/forwarder_add.tpl
View File

@@ -4,6 +4,7 @@ $header
<input type="hidden" name="page" value="$page" />
<input type="hidden" name="action" value="$action" />
<input type="hidden" name="id" value="$id" />
<input type="hidden" name="send" value="send" />
<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
<tr>
<td class="maintitle" colspan="2"><b><img src="images/Classic/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>

14
templates/Classic/main.css
View File

@@ -5,7 +5,7 @@ body {
}
.header {
background-image : url( '/images/Classic/header_r.gif' );
background-image : url( '../../images/Classic/header_r.gif' );
background-repeat : repeat-x;
}
@@ -16,7 +16,7 @@ body {
border-width : 1px;
border-right : none;
border-left : none;
background : url('/images/Classic/footer.gif') repeat-y #FFFFFF;
background : url('../../images/Classic/footer.gif') repeat-y #FFFFFF;
}
a,a:visited,a:active {
@@ -97,24 +97,24 @@ ul {
}
.line_shadow {
background-image : url( '/images/Classic/shadow.gif' );
background-image : url( '../../images/Classic/shadow.gif' );
background-repeat : repeat-y;
background-position : top left;
}
.section {
height : 25px;
background-image : url( '/images/Classic/section.gif' );
background-image : url( '../../images/Classic/section.gif' );
}
.subsection {
padding-top : 8px;
background-image : url( '/images/Classic/subsection.gif' );
background-image : url( '../../images/Classic/subsection.gif' );
}
.endsection {
height : 10px;
background-image : url( '/images/Classic/endsection.gif' );
background-image : url( '../../images/Classic/endsection.gif' );
background-position : bottom;
}
@@ -420,7 +420,7 @@ TR.RowOverSelected {
padding: 20px 20px 20px 60px;
background-color: #f1baba;
border: 1px solid #ce1d1d;
background-image: url('/images/Classic/error.png');
background-image: url('../../images/Classic/error.png');
background-repeat: no-repeat;
background-position: 15px 50%;
}

38
templates/Froxlor/admin/customers/customers_customer.tpl
View File

@@ -9,21 +9,8 @@
</if>
&nbsp;(<a href="$filename?s=$s&amp;page=$page&amp;action=su&amp;id={$row['customerid']}" rel="external">{$row['loginname']}</a> | {$row['adminname']})
</strong>
</td>
<td rowspan="2">
<a href="$filename?s=$s&amp;page=$page&amp;action=edit&amp;id={$row['customerid']}" style="text-decoration:none;">
<img src="images/Froxlor/icons/edit.png" alt="{$lng['panel']['edit']}" />
</a>&nbsp;
<a href="$filename?s=$s&amp;page=$page&amp;action=delete&amp;id={$row['customerid']}" style="text-decoration:none;">
<img src="images/Froxlor/icons/delete.png" alt="{$lng['panel']['delete']}" />
</a>
</td>
</tr>
<tr>
<td>
<table class="overviewcustomerextras">
<tr>
<td style="width: 300px;">
<div>
<span class="overviewcustomerextras">
Webspace:&nbsp;
<if $row['diskspace'] != 'UL'>
<span class="progressBar" title="{$row['diskspace_used']} / {$row['diskspace']} MB">
@@ -39,8 +26,8 @@
<span class="greybar"><em style="left: 200px;">100%</em></span>
</span>
</if>
</td>
<td style="width: 300px;">
</span>
<span class="overviewcustomerextras">
Traffic:&nbsp;
<if $row['traffic'] != 'UL'>
<span class="progressBar" title="{$row['traffic_used']} / {$row['traffic']} GB">
@@ -56,11 +43,18 @@
<span class="greybar"><em style="left: 200px;">100%</em></span>
</span>
</if>
</td>
<td>
</span>
<span style="clear: both !important;">
{$last_login}
</td>
</tr>
</table>
</span>
</div>
</td>
<td>
<a href="$filename?s=$s&amp;page=$page&amp;action=edit&amp;id={$row['customerid']}" style="text-decoration:none;">
<img src="images/Froxlor/icons/edit.png" alt="{$lng['panel']['edit']}" />
</a>&nbsp;
<a href="$filename?s=$s&amp;page=$page&amp;action=delete&amp;id={$row['customerid']}" style="text-decoration:none;">
<img src="images/Froxlor/icons/delete.png" alt="{$lng['panel']['delete']}" />
</a>
</td>
</tr>

1
templates/Froxlor/customer/email/forwarder_add.tpl
View File

@@ -21,6 +21,7 @@ $header
<input type="hidden" name="s" value="$s" />
<input type="hidden" name="page" value="$page" />
<input type="hidden" name="action" value="$action" />
<input type="hidden" name="id" value="$id" />
<input type="hidden" name="send" value="send" />
</p>
</fieldset>

41
templates/Froxlor/froxlor.css
View File

@@ -78,7 +78,7 @@ td a {
}
.topheader {
background: #cccccc url('/images/Froxlor/header_g.png') 0 bottom repeat-x;
background: #cccccc url('../../images/Froxlor/header_g.png') 0 bottom repeat-x;
padding-left: 5px;
padding-top: 2px;
margin-bottom: 12px;
@@ -290,7 +290,7 @@ p.submit {
* error message display
*/
.errorcontainer {
background: url('/images/Froxlor/icons/bad.png') 10px center no-repeat #ffedef;
background: url('../../images/Froxlor/icons/bad.png') 10px center no-repeat #ffedef;
border: 1px solid #ffc2ca;
padding: 10px 10px 10px 68px !important;
margin: .75em !important;
@@ -312,7 +312,7 @@ p.submit {
* warning message display
*/
.warningcontainer {
background: url('/images/Froxlor/icons/warning.png') 10px center no-repeat #fffecc;
background: url('../../images/Froxlor/icons/warning.png') 10px center no-repeat #fffecc;
border: 1px solid #f3c37e;
padding: 10px 10px 10px 68px !important;
margin: .75em !important;
@@ -333,7 +333,7 @@ p.submit {
* success message display
*/
.successcontainer {
background: url('/images/Froxlor/icons/ok.png') 10px center no-repeat #E2F9E3;
background: url('../../images/Froxlor/icons/ok.png') 10px center no-repeat #E2F9E3;
border: 1px solid #9C9;
padding: 10px 10px 10px 68px !important;
margin: .75em !important;
@@ -354,7 +354,7 @@ p.submit {
* neutral/info message display
*/
.neutralcontainer {
background: url('/images/Froxlor/icons/info.png') 10px center no-repeat #d2eaf6;
background: url('../../images/Froxlor/icons/info.png') 10px center no-repeat #d2eaf6;
border: 1px solid #b7d8ed;
padding: 10px 10px 10px 68px !important;
margin: .75em !important;
@@ -398,7 +398,7 @@ a:hover {
}
.menuelement h4 {
background: transparent url('/images/Froxlor/icons/tag_blue.png') no-repeat center left;
background: transparent url('../../images/Froxlor/icons/tag_blue.png') no-repeat center left;
margin: 0;
padding: 0 0 0 20px;
}
@@ -502,10 +502,13 @@ table tbody td {
text-align: left;
}
.overviewcustomerextras,.overviewcustomerextras tbody td {
line-height: 11px;
.overviewcustomerextras {
line-height: 15px;
font-size: 10px;
border: 0;
width: 300px;
float: left;
padding-top: 8px;
padding-bottom: 12px;
}
td {
@@ -528,7 +531,7 @@ table tfoot td {
/* input elements */
input {
background: #dae7ee url('/images/Froxlor/icons/text_align_left.png') no-repeat 5px 4px;
background: #dae7ee url('../../images/Froxlor/icons/text_align_left.png') no-repeat 5px 4px;
padding: 2px 4px 2px 22px;
border: 1px solid #666666;
height: 22px;
@@ -539,7 +542,7 @@ input {
}
textarea {
background: #dae7ee url('/images/Froxlor/icons/text_align_left.png') no-repeat 5px 4px;
background: #dae7ee url('../../images/Froxlor/icons/text_align_left.png') no-repeat 5px 4px;
padding: 4px 4px 2px 22px;
border: 1px solid #666666;
-moz-border-radius: 5px;
@@ -549,7 +552,7 @@ textarea {
}
input[type="password"] {
background: #dae7ee url('/images/Froxlor/icons/password.png') no-repeat 4px 4px;
background: #dae7ee url('../../images/Froxlor/icons/password.png') no-repeat 4px 4px;
}
input[type="button"],input[type="submit"],input[type="reset"] {
@@ -566,14 +569,14 @@ input[type="button"],input[type="submit"],input[type="reset"] {
input[type="submit"] {
color: green;
background: #ccc url('/images/Froxlor/icons/button_ok.png') no-repeat 4px 8px;
background: #ccc url('../../images/Froxlor/icons/button_ok.png') no-repeat 4px 8px;
padding-left: 20px;
}
input[class="nobutton"],
input[type="reset"] {
color: red;
background: #ccc url('/images/Froxlor/icons/cancel.png') no-repeat 4px 8px;
background: #ccc url('../../images/Froxlor/icons/cancel.png') no-repeat 4px 8px;
padding-left: 20px;
}
@@ -630,7 +633,7 @@ select {
}
.cronjobtask {
list-style: url('/images/Froxlor/icons/clock.png') inside;
list-style: url('../../images/Froxlor/icons/clock.png') inside;
margin: 0;
padding: 0;
}
@@ -658,7 +661,7 @@ select {
display:block;
width:200px;
height:15px;
background:url('/images/Froxlor/bar.gif') no-repeat 0 0;
background:url('../../images/Froxlor/bar.gif') no-repeat 0 0;
top:8px;
left:8px;
overflow:hidden;
@@ -666,11 +669,11 @@ select {
}
.progressBar span.redbar {
background:url('/images/Froxlor/barred.gif') no-repeat 0 0;
background:url('../../images/Froxlor/barred.gif') no-repeat 0 0;
}
.progressBar span.greybar {
background:url('/images/Froxlor/bargrey.gif') no-repeat 0 0;
background:url('../../images/Froxlor/bargrey.gif') no-repeat 0 0;
}
.progressBar em {
@@ -678,7 +681,7 @@ select {
display:block;
width:200px;
height:15px;
background:url('/images/Froxlor/bg_cover.gif') repeat-x 0 0;
background:url('../../images/Froxlor/bg_cover.gif') repeat-x 0 0;
top:0;
}

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

@@ -14,7 +14,16 @@ $(document).ready(function(){
$(this).css("background-color", "#fff");
},
function() {
$(this).css("background-color", "#f8f8f8");
$(this).css("background-color", "#f5f5f5");
}
);
}
if($("table.bradiusodd").length != 0) {
$("table.bradiusodd tr").hover(function() {
$(this).css("background-color", "#fff");
},
function() {
$(this).css("background-color", "#f5f5f5");
}
);
}
@@ -24,7 +33,7 @@ $(document).ready(function(){
$(this).css("background-color", "#fff");
},
function() {
$(this).css("background-color", "#f8f8f8");
$(this).css("background-color", "#f5f5f5");
}
);
}