diff --git a/cgi-bin/home b/cgi-bin/home index 4dfc2a13..69fd5633 100755 --- a/cgi-bin/home +++ b/cgi-bin/home @@ -69,18 +69,18 @@ my $header = $anvil->Template->get({file => "main.html", name => "header", varia my $body = ""; # If any jobs are pending/running, show the "unavailable" option. -my $available = check_availability($anvil); -$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { available => $available }}); +my $available = check_availability($anvil); +my $configured = check_if_configured($anvil); +$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { + available => $available, + configured => $configured, +}}); if (not $available) { # Set the body to 'say::maintenance'. $body = $anvil->data->{say}{maintenance}; } - -# If there is no user account yet, then the system is new and needs to be reconfigured. -my $configured = check_if_configured($anvil); -$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { configured => $configured }}); -if (not $configured) +elsif (not $configured) { $body = configure_striker($anvil); } @@ -241,7 +241,7 @@ sub check_availability title => "#!string!striker_0046!#", description => $anvil->Words->string({key => "striker_0047", variables => { percent => $percent, timestamp => $timestamp, seconds_ago => $seconds_ago }}), }}); - $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { 'say::maintenance' => $anvil->data->{say}{maintenance} }}); + $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { 'say::maintenance' => $anvil->data->{say}{maintenance} }}); } $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { available => $available }}); diff --git a/html/skins/alteeve/main.css b/html/skins/alteeve/main.css index 681a5540..77deefa6 100644 --- a/html/skins/alteeve/main.css +++ b/html/skins/alteeve/main.css @@ -10,6 +10,40 @@ Colours; - Footer text: #515151 */ +input[type=submit]:hover { + border: 1px solid #f7f7f7; +} + +input[type=submit] { + padding: 3px 10px; + background: #f7f7f7; + border: 1px solid #343434; + cursor: pointer; + -webkit-border-radius: 2px; + border-radius: 3px; + font-family: 'Dejavu Sans', Arial, Helvetica, Verdana, Sans-Serif; + text-decoration: none; + color: #343434; + font-size: 1.0em; +} + +.button:hover { + border: 1px solid #f7f7f7; +} + +.button { + padding: 3px 10px; + background: #f7f7f7; + border: 1px solid #343434; + cursor: pointer; + -webkit-border-radius: 2px; + border-radius: 3px; + font-family: 'Dejavu Sans', Arial, Helvetica, Verdana, Sans-Serif; + text-decoration: none; + color: #343434; + font-size: 1.0em; +} + .error_message { border-left: 3px solid #d02724; border-right: 3px solid #d02724; @@ -55,8 +89,8 @@ select { } body { - font-family: 'Dejavu Sans', Arial, Helvetica, Verdana, Sans-Serif; - background-image: url("/skins/alteeve/images/Texture.jpg"); + font-family: 'Dejavu Sans', Arial, Helvetica, Verdana, Sans-Serif; + background-image: url("/skins/alteeve/images/Texture.jpg"); background-repeat: repeat; color: #f2f2f2; } diff --git a/html/skins/alteeve/main.html b/html/skins/alteeve/main.html index af8b9443..6ada50e5 100644 --- a/html/skins/alteeve/main.html +++ b/html/skins/alteeve/main.html @@ -306,6 +306,9 @@ #!variable!title!#
#!variable!description!# +
+
+ Reload @@ -319,11 +322,9 @@ #!variable!title!#
#!variable!description!# - - - - - Reload +
+
+ Reload diff --git a/tools/anvil-configure-striker b/tools/anvil-configure-striker index 92f56e88..e0478098 100755 --- a/tools/anvil-configure-striker +++ b/tools/anvil-configure-striker @@ -88,7 +88,7 @@ $anvil->Database->insert_or_update_variables({ variable_source_table => "hosts", }); -#$anvil->System->call({shell_call => $anvil->data->{path}{exe}{'shutdown'}." --reboot now"}); +$anvil->System->call({shell_call => $anvil->data->{path}{exe}{'shutdown'}." --reboot now"}); $anvil->nice_exit({code => 0});