summaryrefslogtreecommitdiffhomepage
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/contrib/uci/freifunk12
-rw-r--r--core/contrib/uci/luci1
-rw-r--r--core/src/ffluci/view/cbi/map.htm1
-rw-r--r--core/src/ffluci/view/cbi/nsection.htm2
-rw-r--r--core/src/ffluci/view/cbi/ucisection.htm4
-rw-r--r--core/src/ffluci/view/cbi/valuefooter.htm2
-rw-r--r--core/src/ffluci/view/cbi/valueheader.htm4
7 files changed, 18 insertions, 8 deletions
diff --git a/core/contrib/uci/freifunk b/core/contrib/uci/freifunk
index 128267d045..aba12e6367 100644
--- a/core/contrib/uci/freifunk
+++ b/core/contrib/uci/freifunk
@@ -13,4 +13,14 @@ config public community
option essid halle.freifunk.net
option bssid 02:CA:FF:EE:BA:BE
option realm netz.freifunk-halle.net
- option pool 104.62.0.0/16 \ No newline at end of file
+ option channel 1
+ option net 104.0.0.0
+ option mask 255.0.0.0
+ option dhcp 10.0.0.0
+ option dhcpmask 255.255.255.0
+ option dns "88.198.178.18 141.54.1.1 212.204.49.83 208.67.220.220 208.67.222.222"
+
+config settings routing
+ option internal 0
+ option internet 0
+ \ No newline at end of file
diff --git a/core/contrib/uci/luci b/core/contrib/uci/luci
index 292e8f2b28..3e8dcc89aa 100644
--- a/core/contrib/uci/luci
+++ b/core/contrib/uci/luci
@@ -25,6 +25,7 @@ config event uci_oncommit
option fstab "/etc/init.d/fstab restart"
option qos "/etc/init.d/qos restart"
option luci_splash "/etc/init.d/luci_splash restart"
+ option freifunk "/etc/init.d/luci_freifunk restart"
config internal languages
option de "Deutsch"
diff --git a/core/src/ffluci/view/cbi/map.htm b/core/src/ffluci/view/cbi/map.htm
index 83c377fb86..835393c1c5 100644
--- a/core/src/ffluci/view/cbi/map.htm
+++ b/core/src/ffluci/view/cbi/map.htm
@@ -1,7 +1,6 @@
<div class="cbi-map" id="cbi-<%=self.config%>">
<h1><%=self.title%></h1>
<div class="cbi-map-descr"><%=self.description%></div>
- <br />
<% self:render_children() %>
<br />
</div>
diff --git a/core/src/ffluci/view/cbi/nsection.htm b/core/src/ffluci/view/cbi/nsection.htm
index 0f7601a941..bbc87f1858 100644
--- a/core/src/ffluci/view/cbi/nsection.htm
+++ b/core/src/ffluci/view/cbi/nsection.htm
@@ -3,7 +3,7 @@ section = self.section %>
<div class="cbi-section" id="cbi-<%=self.config%>-<%=section%>">
<h2><%=self.title%></h2>
<div class="cbi-section-descr"><%=self.description%></div>
- <% if self.addremove then %><div class="cbi-section-remove">
+ <% if self.addremove then %><div class="cbi-section-remove right">
<input type="submit" name="cbi.rns.<%=self.config%>.<%=section%>" value="<%:cbi_del Eintrag entfernen%>" />
</div><% end %>
<%+cbi/ucisection%>
diff --git a/core/src/ffluci/view/cbi/ucisection.htm b/core/src/ffluci/view/cbi/ucisection.htm
index ef1b6cb0e1..a1fb39cf45 100644
--- a/core/src/ffluci/view/cbi/ucisection.htm
+++ b/core/src/ffluci/view/cbi/ucisection.htm
@@ -1,4 +1,4 @@
- <fieldset class="cbi-section-node" id="cbi-<%=self.config%>-<%=section%>">
+ <div class="cbi-section-node" id="cbi-<%=self.config%>-<%=section%>">
<% self:render_children(section) %>
<% if #self.optionals[section] > 0 or self.dynamic then %>
<div class="cbi-optionals">
@@ -19,5 +19,5 @@
<input type="submit" value="<%:add hinzufügen%>" />
</div>
<% end %>
- </fieldset>
+ </div>
<br /> \ No newline at end of file
diff --git a/core/src/ffluci/view/cbi/valuefooter.htm b/core/src/ffluci/view/cbi/valuefooter.htm
index 3f92f09e26..6151a3a66a 100644
--- a/core/src/ffluci/view/cbi/valuefooter.htm
+++ b/core/src/ffluci/view/cbi/valuefooter.htm
@@ -1,4 +1,4 @@
- <div class="cbi-value-description inline"><%=self.description%></div>
+ <div class="cbi-value-description"><%=self.description%>&nbsp;</div>
</div>
<% if self.tag_invalid[section] then %><div class="cbi-error"><%:cbi_invalid Fehler: Ungültige Eingabe%></div><% end %>
</div>
diff --git a/core/src/ffluci/view/cbi/valueheader.htm b/core/src/ffluci/view/cbi/valueheader.htm
index 86c782d711..062efa2ddd 100644
--- a/core/src/ffluci/view/cbi/valueheader.htm
+++ b/core/src/ffluci/view/cbi/valueheader.htm
@@ -1,3 +1,3 @@
- <div class="cbi-value clear" id="cbi-<%=self.config.."-"..section.."-"..self.option%>">
- <div class="cbi-value-title left"><%=self.title%></div>
+ <div class="cbi-value" id="cbi-<%=self.config.."-"..section.."-"..self.option%>">
+ <div class="cbi-value-title"><%=self.title%></div>
<div class="cbi-value-field"> \ No newline at end of file