Merge branch 'master' of github.com:digimer/anvil

Signed-off-by: Digimer <digimer@alteeve.ca>

cgi-bin/home

@@ -69,18 +69,31 @@ my $header = $anvil->Template->get({file => "main.html", name => "header", varia
 my $body   = "";
 
 # If any jobs are pending/running, show the "unavailable" option.
+<<<<<<< HEAD
 my $available = check_availability($anvil);
 $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, 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,
+}});
+>>>>>>> a6a5df2496cbe4474d34585a2d41207dd6d5e005
 if (not $available)
 {
 	# Set the body to 'say::maintenance'.
 	$body = $anvil->data->{say}{maintenance};
 }
+<<<<<<< HEAD
 
 # 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 => 3, list => { configured => $configured }});
 if (not $configured)
+=======
+elsif (not $configured)
+>>>>>>> a6a5df2496cbe4474d34585a2d41207dd6d5e005
 {
 	$body = configure_striker($anvil);
 }

html/skins/alteeve/main.css

@@ -10,6 +10,7 @@ Colours;
 - Footer text:       #515151
 */
 
+<<<<<<< HEAD
 .login {
     width:       600px;
     height:      50px;
@@ -18,6 +19,40 @@ Colours;
     margin-top:  -25px;  /* half of height */
     top:         50%;
     left:        50%;
+=======
+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;
+>>>>>>> a6a5df2496cbe4474d34585a2d41207dd6d5e005
 }
 
 .error_message {

html/skins/alteeve/main.html

@@ -330,6 +330,9 @@
 					<td>
 						<span name="#!variable!title_id!#" id="#!variable!title_id!#" class="config_header1">#!variable!title!#</span><br />
 						<span name="#!variable!message_id!#" id="#!variable!message_id!#" class="config_header2">#!variable!description!#</span>
+						<br />
+						<hr>
+						<a href="/" class="button">Reload</a>
 					</td>
 				</tr>
 				</div>
@@ -343,11 +346,9 @@
 					<td>
 						<span name="#!variable!title_id!#" id="#!variable!title_id!#" class="config_header1">#!variable!title!#</span><br />
 						<span name="#!variable!message_id!#" id="#!variable!message_id!#" class="config_header2">#!variable!description!#</span>
-					</td>
-				</tr>
-				<tr>
-					<td>
-						<a href="/">Reload</a>
+						<br />
+						<hr>
+						<a href="/" class="button">Reload</a>
 					</td>
 				</tr>
 				</div>

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});