* Added reboot page

* Added SSH-Keys page
* ffluci.template: Removed a debugging statement

4 files changed, 54 insertions, 8 deletions

diff --git a/src/ffluci/view/admin_system/editor.htm b/src/ffluci/view/admin_system/editor.htm
index d4b3302ef..0215c91df 100644
--- a/src/ffluci/view/admin_system/editor.htm
+++ b/src/ffluci/view/admin_system/editor.htm
@@ -1,7 +1,7 @@
 <%+header%>
 <h1><%:texteditor Texteditor%></h1>
 <form method="post" action="<%=controller%>/admin/system/editor">
-<div><%:file Datei%>: <input type="text" name="file" size="30" value="<%=fn%>" />
+<div><%:file Datei%>: <input type="text" name="file" size="30" value="<%=(fn or '')%>" />
 <% if msg then %><span class="error"><%:error Fehler%>: <%=msg%></span><% end %></div>
 <br />
 <div><textarea style="width: 100%" rows="20" name="data"><%=(cnt or '')%></textarea></div>
diff --git a/src/ffluci/view/admin_system/passwd.htm b/src/ffluci/view/admin_system/passwd.htm
index 3458fef92..441753d83 100644
--- a/src/ffluci/view/admin_system/passwd.htm
+++ b/src/ffluci/view/admin_system/passwd.htm
@@ -1,14 +1,33 @@
 <%+header%>
 <h1><%:system System%></h1>
-<h2><%:changepw Passwort ändern%></h2>
+<h2><%:passwd Passwort ändern%></h2>
 <div><br />
-<% if msg then %>
-	<code><%=msg%></code>
-<% else %>
+<% if stat then %>
+	<% if stat == 0 then %>
+		<code><%:password_changed Passwort erfolgreich geändert!%></code>
+	<% elseif stat == 10 then %>
+		<code class="error"><%:password_nomatch Passwörter stimmen nicht überein! %></code>
+	<% else %>
+		<code class="error"><%:unknown_error Unbekannter Fehler!%></code>
+	<% end %>
+<% end %>
+<% if not stat or stat == 10 then %>
 	<form method="post" action="<%=controller%>/admin/system/passwd">
-		<input type="password" name="pwd1" /> <%:password Passwort%><br />
-		<input type="password" name="pwd2" /> <%:confirmation Bestätigung%><br />
-		<input type="submit" value="<%:save Speichern%>" />
+		<fieldset class="cbi-section-node">
+			<div class="cbi-value clear">
+				<div class="cbi-value-title left"><%:password Passwort%></div>
+				<div class="cbi-value-field"><input type="password" name="pwd1" /></div>
+			</div>
+			<div class="cbi-value clear">
+				<div class="cbi-value-title left"><%:confirmation Bestätigung%></div>
+				<div class="cbi-value-field"><input type="password" name="pwd2" /></div>
+			</div>
+			<br />
+			<div>
+				<input type="submit" value="<%:save Speichern%>" />
+				<input type="reset" value="<%:reset Zurücksetzen%>" />
+			</div>
+		</fieldset>
 	</form>
 <% end %>
 </div>
diff --git a/src/ffluci/view/admin_system/reboot.htm b/src/ffluci/view/admin_system/reboot.htm
new file mode 100644
index 000000000..a81464409
--- /dev/null
+++ b/src/ffluci/view/admin_system/reboot.htm
@@ -0,0 +1,4 @@
+<%+header%>
+<h1><%:system System%></h1>
+<h2><%:reboot Neu starten%></h2>
+<%+footer%>
\ No newline at end of file
diff --git a/src/ffluci/view/admin_system/sshkeys.htm b/src/ffluci/view/admin_system/sshkeys.htm
new file mode 100644
index 000000000..1e1cc24ce
--- /dev/null
+++ b/src/ffluci/view/admin_system/sshkeys.htm
@@ -0,0 +1,23 @@
+<%+header%>
+<h1><%:system System%></h1>
+<h2><%:sshkeys SSH-Schlüssel%></h2>
+
+<br />
+
+<div><%:sshkeys_descr Hier können öffentliche SSH-Schlüssel (einer pro Zeile)
+ zur Authentifizierung abgelegt werden.%></div>
+
+<br />
+
+<form method="post" action="<%=controller%>/admin/system/sshkeys">
+	<fieldset class="cbi-section-node">
+		<div><textarea style="width: 100%" rows="10" name="data"><%=(cnt or '')%></textarea></div>
+		<br />
+		<div>
+			<input type="submit" value="<%:save Speichern%>" />
+			<input type="reset" value="<%:reset Zurücksetzen%>" />
+		</div>
+		<% if msg then %><br /><div class="error"><%:error Fehler%>: <%=msg%></div><% end %>
+	</fieldset>
+</form>
+<%+footer%>
\ No newline at end of file