diff options
| -rw-r--r-- | htroot/Status.html | 4 | ||||
| -rw-r--r-- | htroot/Status.java | 4 | ||||
| -rw-r--r-- | htroot/ViewProfile.html | 2 | ||||
| -rw-r--r-- | htroot/env/base.css | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/htroot/Status.html b/htroot/Status.html index 6b7b15b1e..9caef839f 100644 --- a/htroot/Status.html +++ b/htroot/Status.html @@ -12,8 +12,8 @@ <p>Welcome to YaCy!</p>
<form action="Steering.html" method="get" class="PeerControl">
- <fieldset>
- <input type="submit" name="restart" value="Restart (only Windows)" />
+ <fieldset>#(restartEnabled)#::
+ <input type="submit" name="restart" value="Restart" />#(/restartEnabled)#
<input type="submit" name="shutdown" value="Shutdown" />
</fieldset>
</form>
diff --git a/htroot/Status.java b/htroot/Status.java index 3c68e1232..8b7cfd985 100644 --- a/htroot/Status.java +++ b/htroot/Status.java @@ -143,6 +143,10 @@ public class Status { prop.put("protection", 1); // protected
}
+ // if running on Windows, enable restart button
+ // (remove from servlet when Linux start-script is capable, too)
+ prop.put("restartEnabled", (System.getProperty("os.name").toLowerCase().startsWith("win")) ? 1 : 0);
+
// version information
prop.put("versionpp", yacy.combined2prettyVersion(env.getConfig("version","0.1")));
double thisVersion = Double.parseDouble(env.getConfig("version","0.1"));
diff --git a/htroot/ViewProfile.html b/htroot/ViewProfile.html index 96e41efba..11f669717 100644 --- a/htroot/ViewProfile.html +++ b/htroot/ViewProfile.html @@ -23,7 +23,7 @@ ::
<p class="error">The peer #[peername]# is not online.</p>
::
- <h3>This is #[peername]#'s Profile:</h3>
+ <h3>This is the Profile of #[peername]#:</h3>
<dl class="pairs">
<dt>Name</dt>
diff --git a/htroot/env/base.css b/htroot/env/base.css index e37b47b23..60056c5e3 100644 --- a/htroot/env/base.css +++ b/htroot/env/base.css @@ -350,7 +350,7 @@ form dt, dl.pairs dt { float:left; clear:left; width:17em; - margin:0 2px; + margin:0 2px 0.5em 2px; padding:0.2em 0.5em; text-align:right; } |