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

Merge pull request #111 from BNoiZe/master

Browse Source 
Sparkle fixes/updates and lng/english.lng.php update
This commit is contained in:
Michael Kaufmann
2013-10-01 12:17:09 -07:00
parent b19e226609 993814edd5
commit 2e503302a8
6 changed files with 46 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lng/english.lng.php
View File

@@ -1318,7 +1318,7 @@ $lng['admin']['cronjob_edit'] = 'Edit cronjob';
$lng['cronjob']['cronjobsettings'] = 'Cronjob settings';
$lng['cronjob']['cronjobintervalv'] = 'Runtime interval value';
$lng['cronjob']['cronjobinterval'] = 'Runtime interval';
$lng['panel']['options'] = 'options';
$lng['panel']['options'] = 'Options';
$lng['admin']['warning'] = 'WARNING - Please note!';
$lng['cron']['changewarning'] = 'Changing these values can have a negative cause to the behavior of Froxlor and its automated tasks.<br /><br />Please only change values here, if you are sure you know what you are doing.';

8
templates/Sparkle/admin/templates/templates_add_2.tpl vendored
View File

@@ -191,8 +191,8 @@ $header
</td>
</tr>
<tr>
<td><em>{CUST_NAME}</em></td>
<td>{$lng['admin']['templates']['CUST_NAME']}</td>
<td><em>{SALUTATION}</em></td>
<td>{$lng['admin']['templates']['SALUTATION']}</td>
</tr>
<tr>
<td><em>{DB_NAME}</em></td>
@@ -220,8 +220,8 @@ $header
</td>
</tr>
<tr>
<td><em>{CUST_NAME}</em></td>
<td>{$lng['admin']['templates']['CUST_NAME']}</td>
<td><em>{SALUTATION}</em></td>
<td>{$lng['admin']['templates']['SALUTATION']}</td>
</tr>
<tr>
<td><em>{USR_NAME}</em></td>

8
templates/Sparkle/admin/templates/templates_edit.tpl vendored
View File

@@ -191,8 +191,8 @@ $header
</td>
</tr>
<tr>
<td><em>{CUST_NAME}</em></td>
<td>{$lng['admin']['templates']['CUST_NAME']}</td>
<td><em>{SALUTATION}</em></td>
<td>{$lng['admin']['templates']['SALUTATION']}</td>
</tr>
<tr>
<td><em>{DB_NAME}</em></td>
@@ -220,8 +220,8 @@ $header
</td>
</tr>
<tr>
<td><em>{CUST_NAME}</em></td>
<td>{$lng['admin']['templates']['CUST_NAME']}</td>
<td><em>{SALUTATION}</em></td>
<td>{$lng['admin']['templates']['SALUTATION']}</td>
</tr>
<tr>
<td><em>{USR_NAME}</em></td>

16
templates/Sparkle/assets/css/main.css vendored
View File

@@ -694,17 +694,17 @@ input[type="button"]:hover,input[type="submit"]:hover,input[type="reset"]:hover
}
input[type="submit"],input[class="yesbutton"] {
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #77d42a), color-stop(1, #5cb811) );
background:-moz-linear-gradient( center top, #77d42a 5%, #5cb811 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#77d42a', endColorstr='#5cb811');
background-color:#77d42a;
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #9dce2c), color-stop(1, #8cb82b) );
background:-moz-linear-gradient( center top, #9dce2c 5%, #8cb82b 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#9dce2c', endColorstr='#8cb82b');
background-color:#9dce2c;
text-shadow:1px 1px 0px #aade7c;
}
input[type="submit"]:hover,input[class="yesbutton"]:hover {
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #5cb811), color-stop(1, #77d42a) );
background:-moz-linear-gradient( center top, #5cb811 5%, #77d42a 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5cb811', endColorstr='#77d42a');
background-color:#5cb811;
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #8cb82b), color-stop(1, #9dce2c) );
background:-moz-linear-gradient( center top, #8cb82b 5%, #9dce2c 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#8cb82b', endColorstr='#9dce2c');
background-color:#8cb82b;
}
input[class="nobutton"],input[type="reset"] {

19
templates/Sparkle/customer/email/emails_add.tpl vendored
View File

@@ -1,14 +1,6 @@
$header
<article>
<if $domains == ''>
<div class="messagewrapperfull">
<div class="warningcontainer bradius">
<div class="warningtitle">{$lng['admin']['warning']}</div>
<div class="warning"><br /><strong>{$lng['emails']['noemaildomainaddedyet']}</strong></div>
</div>
</div>
</if>
<else>
<header>
<h2>
<img src="templates/{$theme}/assets/img/icons/email_add_big.png" alt="{$title}" />&nbsp;
@@ -16,6 +8,14 @@ $header
</h2>
</header>
<if $domains == ''>
<div class="messagewrapperfull">
<div class="warningcontainer bradius">
<div class="warningtitle">{$lng['admin']['warning']}</div>
<div class="warning"><br /><strong>{$lng['emails']['noemaildomainaddedyet']}</strong></div>
</div>
</div>
<else>
<section class="fullform bradiusodd">
<form action="{$linker->getLink(array('section' => 'email'))}" method="post" enctype="application/x-www-form-urlencoded">
@@ -35,5 +35,6 @@ $header
</fieldset>
</form>
</section>
</if>
</article>
$footer

4
templates/Sparkle/header.tpl vendored
View File

@@ -46,7 +46,7 @@
<ul class="topheadernav">
<if $userinfo['adminsession'] == 1 >
<li><a href="admin_index.php?s={$userinfo['hash']}">{$lng['admin']['overview']}</a></li>
<li><a href="#">Options</a>
<li><a href="#">{$lng['panel']['options']}</a>
<ul>
<li><a href="admin_index.php?page=change_password&s={$userinfo['hash']}">{$lng['login']['password']}</a></li>
<li><a href="admin_index.php?page=change_language&s={$userinfo['hash']}">{$lng['login']['language']}</a></li>
@@ -58,7 +58,7 @@
<li><a href="admin_index.php?action=logout&s={$userinfo['hash']}">{$lng['login']['logout']} {$userinfo['name']} ({$userinfo['loginname']})</a></li>
<else>
<li><a href="customer_index.php?s={$userinfo['hash']}">{$lng['admin']['overview']}</a></li>
<li><a href="#">Options</a>
<li><a href="#">{$lng['panel']['options']}</a>
<ul>
<li><a href="customer_index.php?page=change_password&s={$userinfo['hash']}">{$lng['login']['password']}</a></li>
<li><a href="customer_index.php?page=change_language&s={$userinfo['hash']}">{$lng['login']['language']}</a></li>