summaryrefslogtreecommitdiffhomepage
path: root/module/admin-core
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-04-16 09:32:43 +0000
committerSteven Barth <steven@midlink.org>2008-04-16 09:32:43 +0000
commit69bc3fad1f0a49427a06cec47fe6a2b8b07969b8 (patch)
tree02e3130eb46aa7bc171638455b7bb62132e7ccd5 /module/admin-core
parent5ae7b3ee9a6928238f4cd424701b9e969dd68ee8 (diff)
* Reintroduced public pages
* Automatically replace nil template values with ''
Diffstat (limited to 'module/admin-core')
-rw-r--r--module/admin-core/src/model/cbi/admin_index/contact.lua2
-rw-r--r--module/admin-core/src/view/admin_system/editor.htm4
-rw-r--r--module/admin-core/src/view/admin_system/ipkg.htm2
-rw-r--r--module/admin-core/src/view/admin_system/packages.htm6
-rw-r--r--module/admin-core/src/view/admin_system/sshkeys.htm2
5 files changed, 8 insertions, 8 deletions
diff --git a/module/admin-core/src/model/cbi/admin_index/contact.lua b/module/admin-core/src/model/cbi/admin_index/contact.lua
index 187db9f3c8..ecb4bedd78 100644
--- a/module/admin-core/src/model/cbi/admin_index/contact.lua
+++ b/module/admin-core/src/model/cbi/admin_index/contact.lua
@@ -1,5 +1,5 @@
-- Todo: Translate
-m = Map("luci", translate("contact", "Kontakt"), translate("contact1", [[Diese Daten sind
+m = Map("freifunk", translate("contact", "Kontakt"), translate("contact1", [[Diese Daten sind
auf der öffentlichen Kontaktseite sichtbar. Bitte gib an, wie man dich am besten kontaktieren kann.
Diese Informationen sollten nach der Picopeering Vereinbarung mindestens deine E-Mail-Adresse enthalten.
Damit dein Knoten durch Topographieprogramme erfasst werden kann, gib bitte deine Geokoordinaten oder
diff --git a/module/admin-core/src/view/admin_system/editor.htm b/module/admin-core/src/view/admin_system/editor.htm
index 0215c91dff..ef3e0d8abd 100644
--- a/module/admin-core/src/view/admin_system/editor.htm
+++ b/module/admin-core/src/view/admin_system/editor.htm
@@ -1,10 +1,10 @@
<%+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 or '')%>" />
+<div><%:file Datei%>: <input type="text" name="file" size="30" value="<%=fn%>" />
<% 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>
+<div><textarea style="width: 100%" rows="20" name="data"><%=cnt%></textarea></div>
<br />
<div>
<input type="submit" value="<%:save Speichern%>" />
diff --git a/module/admin-core/src/view/admin_system/ipkg.htm b/module/admin-core/src/view/admin_system/ipkg.htm
index bbe7f3bc6e..c1f6ad0be9 100644
--- a/module/admin-core/src/view/admin_system/ipkg.htm
+++ b/module/admin-core/src/view/admin_system/ipkg.htm
@@ -11,7 +11,7 @@
<form method="post" action="<%=controller%>/admin/system/ipkg">
<fieldset class="cbi-section-node">
- <div><textarea style="width: 100%" rows="10" name="data"><%=(cnt or '')%></textarea></div>
+ <div><textarea style="width: 100%" rows="10" name="data"><%=cnt%></textarea></div>
<br />
<div>
<input type="submit" value="<%:save Speichern%>" />
diff --git a/module/admin-core/src/view/admin_system/packages.htm b/module/admin-core/src/view/admin_system/packages.htm
index d9cdb4dd0e..52da370403 100644
--- a/module/admin-core/src/view/admin_system/packages.htm
+++ b/module/admin-core/src/view/admin_system/packages.htm
@@ -43,7 +43,7 @@
<div>
<span class="bold"><%:filter Filter%>:</span>
- <input type="text" name="query" size="20" value="<%=(query or '')%>" />
+ <input type="text" name="query" size="20" value="<%=query%>" />
<input type="submit" name="search" value="<%:packages_search Paket suchen%>" />
<input type="submit" name="submit" value="<%:packages_do Aktionen ausführen%>" />
</div>
@@ -63,10 +63,10 @@
<% for k, pkg in pairs(pkgs) do %>
<tr>
<td><%=pkg.Package%></td>
- <td><%=(pkg.Version or '')%></td>
+ <td><%=pkg.Version%></td>
<td><% if not pkg.Status or not pkg.Status.installed then %><input type="checkbox" name="install.<%=pkg.Package%>" value="1" /><% else %><%:installed installiert%><% end %></td>
<td><% if pkg.Status and pkg.Status.installed then %><input type="checkbox" name="remove.<%=pkg.Package%>" value="1" /><% else %><%:notinstalled nicht installiert%><% end %></td>
- <td><%=(pkg.Description or '')%></td>
+ <td><%=pkg.Description%></td>
</tr>
<% end %>
</table>
diff --git a/module/admin-core/src/view/admin_system/sshkeys.htm b/module/admin-core/src/view/admin_system/sshkeys.htm
index 1e1cc24ce1..9cf91f998c 100644
--- a/module/admin-core/src/view/admin_system/sshkeys.htm
+++ b/module/admin-core/src/view/admin_system/sshkeys.htm
@@ -11,7 +11,7 @@
<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>
+ <div><textarea style="width: 100%" rows="10" name="data"><%=cnt%></textarea></div>
<br />
<div>
<input type="submit" value="<%:save Speichern%>" />