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

added new indicator whether services/system has been configured (on new installations); show alternative configuration possibility via config-services.php script

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2018-12-10 20:34:43 +01:00
parent d381528c06
commit 4988600881
10 changed files with 103 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
templates/Sparkle/admin/configfiles/wizard.tpl vendored
View File

@@ -8,6 +8,13 @@ $header
</h2>
</header>
<div class="messagewrapperfull">
<div class="warningcontainer bradius">
<div class="warningtitle">{$lng['admin']['warning']}</div>
<div class="warning">{$lng['panel']['settings_before_configuration']}</div>
</div>
</div>
<section>
<form action="$filename" method="get" enctype="application/x-www-form-urlencoded">
<fieldset>
@@ -51,10 +58,25 @@ $header
<tr>
<td colspan="2" align="center"><input class="bottom" type="submit" value="{$lng['panel']['next']}" /></td>
</tr>
<tr>
<if Settings::Get('panel.is_configured') == '0'>
<td colspan="2" align="center">{$lng['panel']['done_configuring']}:<br><br><a href="{$linker->getLink(array('section' => 'configfiles', 'page' => 'overview', 'action' => 'setconfigured'))}" class="btnlink">{$lng['panel']['ihave_configured']}</a><br><br></td>
<else>
<td colspan="2" align="center">{$lng['panel']['system_is_configured']}</td>
</if>
</tr>
</tfoot>
</table>
</fieldset>
</form>
</section>
<br><br><br>
<section>
<p><strong>{$lng['panel']['alternative_cmdline_config']}:</strong></p>
<div class="pushbot">
<textarea class="shell" rows="2" readonly>php {$basedir}/install/scripts/config-services.php --froxlor-dir={$basedir} --create</textarea>
</div>
</section>
</article>
$footer

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

@@ -662,13 +662,13 @@ input[type="button"], input[type="submit"], input[type="reset"], input[type="fil
margin: 0 1px;
}
input[type="button"]:hover, input[type="submit"]:hover, input[type="reset"]:hover
input[type="button"]:hover, input[type="submit"]:hover, input[type="reset"]:hover, .btnlink:hover
{
color: #333;
background-color: #dcdcdc;
}
input[type="button"]:active, input[type="submit"]:active, input[type="reset"]:active
input[type="button"]:active, input[type="submit"]:active, input[type="reset"]:active, .btnlink:active
{
-webkit-box-shadow: inset 0 1px 8px rgba(0, 0, 0, 0.25);
-moz-box-shadow: inset 0 1px 8px rgba(0, 0, 0, 0.25);
@@ -676,17 +676,17 @@ input[type="button"]:active, input[type="submit"]:active, input[type="reset"]:ac
color: #fff !important;
}
input[type="submit"], input[class="yesbutton"] {
input[type="submit"], input[class="yesbutton"], .btnlink {
color: #fff;
background-color: #35aa47;
}
input[type="submit"]:hover, input[class="yesbutton"]:hover {
input[type="submit"]:hover, input[class="yesbutton"]:hover, .btnlink:hover {
color: #fff;
background-color: #1d943b;
}
input[class="submit"]:active, input[class="yesbutton"]:active {
input[class="submit"]:active, input[class="yesbutton"]:active, .btnlink:active {
background-color: #35aa47;
}
@@ -1725,3 +1725,14 @@ td.size-50 {
.label[class*="span"][class*="arrow"] {
min-height: 0
}
.liwarn {
background-color: #ff3333;
margin-top: -6px;
}
.liwarn a {
font-weight: 700;
padding: 5px 10px;
color: #ffe !important;
}

5
templates/Sparkle/header.tpl vendored
View File

@@ -43,6 +43,11 @@
</a>
<div class="topheader_navigation">
<ul class="topheadernav">
<if Settings::Get('panel.is_configured') == 0 && $userinfo['adminsession'] == 1 && $userinfo['change_serversettings'] == 1>
<li class="liwarn">
<a href="{$linker->getLink(array('section' => 'configfiles', 'page' => 'configfiles'))}">{$lng['panel']['not_configured']}</a>
</li>
</if>
<if Settings::Get('ticket.enabled') == 1>
<li>
<a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets'))}">