Commit Graph

66 Commits

Author SHA1 Message Date
Matthias Schiffer
5c121c1608 gluon-config-mode: allow using templates for texts again 2014-05-17 13:43:08 +02:00
Matthias Schiffer
41dbaed19e gluon-config-mode: fix reboot.htm validity 2014-05-14 13:48:47 +02:00
Matthias Schiffer
24ac1dc1bc gluon-config-mode: convert templates to use the new site config 2014-05-14 13:23:15 +02:00
Matthias Schiffer
99e74b1004 gluon-config-mode: fix unsetting of the contact info 2014-03-17 14:41:03 +01:00
Nils Schneider
020169f292 gluon-config-mode: fix coordinates when disabled 2014-03-02 19:28:59 +01:00
Nils Schneider
59a28c6721 gluon-config-mode: allow contact field to be empty 2014-03-02 19:28:40 +01:00
Nils Schneider
db11e29df1 gluon-config-mode: show coordinates only when enabled 2014-03-02 18:59:20 +01:00
Nils Schneider
cd8e21739c gluon-config-mode: add contact field
Closes #20
2014-03-02 18:39:56 +01:00
Nils Schneider
a4ca5a9f7d gluon-config-mode: replace foreach with get_first 2014-03-02 18:14:36 +01:00
Matthias Schiffer
cd30517ec1 gluon-config-mode: add sysconfig option for config interface(s), default to WAN on nanostation-m 2014-03-02 17:56:50 +01:00
Nils Schneider
a2f699cafd gluon-config-mode: avoid string.format("%f", ...
An undocumented feature of uci:get_first() is to cast the returned value
to the same type as the default argument. Thus, supplying a default
value ot type number makes string.format superfluous.
2014-03-02 14:05:14 +01:00
Matthias Schiffer
c2cda254ae Rename gluon-location to gluon-node-info, add owner section 2014-02-24 05:12:01 +01:00
Matthias Schiffer
2454c8abb7 Add gluon-legacy package with legacy upgrade scripts 2014-02-22 08:27:51 +01:00
Nils Schneider
3e7e4b43af Merge pull request #16 from rubo77/master
gluon-config-mode: Corrected grammar
2014-02-19 15:03:37 +01:00
Matthias Schiffer
c2adf36e20 gluon-config-mode: don't let UCI_CONFIG_DIR leak to the telnet environment etc. 2014-02-13 19:40:36 +01:00
Matthias Schiffer
39eed2b913 gluon-config-mode: simplify dnsmasq command, remove sleep after network setup 2014-02-13 16:27:40 +01:00
Matthias Schiffer
24fd45d424 gluon-config-mode: remove bind mounts 2014-02-13 15:55:52 +01:00
Nils Schneider
a365d626c2 gluon-luci-core: replacing luci-mod-admin-core
This commit adds gluon-luci-core, a package both gluon-config-mode and
gluon-luci-admin will depend on. gluon-luci-core itself will depends on
gluon-luci-theme, gluon-core and most importantly luci-lib-web. It also
copies a few files from luci-mod-admin-core but leaves out everyting we
do not use.

At a later point I plan to move functionality from luci-lib-web into
this package, too. luci-lib-web contains most parts of luci including
hardcoded templates for CBI, which I intend to replace.
2014-02-09 23:20:38 +01:00
ruben
732727dde5 gluon-config-mode: Corrected grammar 2014-02-07 13:11:55 +01:00
Nils Schneider
b4ce341601 gluon-config-mode: fix type (gluon-locaton -> gluon-location) 2014-02-06 20:23:17 +01:00
Matthias Schiffer
ebceae82ad gluon-config-mode: don't include sysconfig before the start function is called
Otherwise the enable during image create will throw a few error messages
2014-02-06 00:05:10 +01:00
Nils Schneider
1097fadc92 gluon-config-mode: correct hostname on reboot.html
Display the correct hostname on the final page of configmode.
Previously, this page used to simply call luci.sys.hostname() which
would return the current hostname. However, when the configmode changes
the hostname luci.sys.hostname() will not reflect this. This patch
fetches the hostname directly from the UCI system config.

This adds a variable called 'hostname' which may be used in site.conf at
config_mode.msg_reboot and .msg_pubkey.
2014-01-28 03:16:56 +01:00
Nils Schneider
5486cf2c4e gluon-config-mode: new helptexts 2014-01-23 02:24:02 +01:00
Nils Schneider
68a0da5daa gluon-config-mode: label submit button "Fertig" 2014-01-23 01:34:25 +01:00
Nils Schneider
ad2d413f23 gluon-config-mode: use welcome text from site.conf 2014-01-23 01:21:43 +01:00
Nils Schneider
1e348ddd45 gluon-config-mode: delay reboot a little
The reboot page should be delayed a little to give the browser time for
fetching assets (like the stylesheet). This adds a two second delay.
Unfortunately, I couldn't think of a sane way to do this within a luci
controller.

This patch forks the process. The parent will continue rendering the
page for the browser while the child will sleep and then reboot the
device. For this to work reliable the child needs to close stdout before
sleeping so the webserver closes the connection to the browser. This,
again, required a hack as lua does not allow closing std filehandles,
when prevented using luci.reboot() which was calling os.execute() and
that function will not work with stdout closed.
2014-01-23 00:04:14 +01:00
Nils Schneider
a299a150b6 gluon-config-mode: fix indentation 2014-01-22 23:18:46 +01:00
Nils Schneider
528d04cb67 Merge pull request #10 from freifunk-gluon/luci-theme
add new luci-theme
2014-01-22 12:02:48 -08:00
Matthias Schiffer
6d5e47eeec gluon-config-mode: respect switch configuration 2014-01-22 19:45:07 +01:00
Nils Schneider
de22275c60 gluon-config-mode: remove subsection headings
Those headings do not convey much information make the wizard less
compact. The help texts will be rewritten to guide the user instead.
2014-01-22 17:01:27 +01:00
Nils Schneider
57f65acaf2 gluon-config-mode: replace inline style with class
Replace the inline stylesheet for the public key box on the reboot page
with a CSS class so it can be styled using the theme.
2014-01-22 17:00:58 +01:00
Nils Schneider
b1cc62b680 gluon-config-mode,luci-admin: use gluon-luci-theme
This makes gluon-config-mode and gluon-luci-admin depend on
gluon-luci-theme instead of luci-theme-openwrt.
2014-01-22 16:56:54 +01:00
Nils Schneider
5e0048ae84 gluon-config-mode: remove 'reset' button
The reset button resets the form. I don't think this is needed in a
wizard that simple and might confuse users so I removed it.
2014-01-21 23:42:03 +01:00
Nils Schneider
5b8e044893 gluon-config-mode: fix wizard
Due to my previous two commits configmode was broken when either meshvpn
or bandwidth limit was disabled. This fixes it but there may be a
cleaner solution provided by luci.
2014-01-21 22:19:25 +01:00
Nils Schneider
566faeb6ca gluon-config-mode: bwlimit hidden when not meshvpn
Hide the bandwidth limit checkbox when meshvpn is disabled.
2014-01-21 20:02:17 +01:00
Nils Schneider
bb3e93b55d gluon-config-mode: more compact tc form
Hide the downstream/upstream input fields when bandwitdh limiting is
disabled.
2014-01-21 19:50:07 +01:00
Matthias Schiffer
59c1900e9a gluon-location: move information to /etc/config/gluon-location 2014-01-20 00:06:55 +01:00
Matthias Schiffer
1cf4d41cba gluon-config-mode: use different document root 2014-01-13 20:17:29 +01:00
Matthias Schiffer
f2c8be9c48 gluon-config-mode: don't depend on haveged
Now that haveged starts before the config mode, there is no need to explicity
depend on it; instead it is just used when specified in the site configuration.
2014-01-12 00:50:43 +01:00
Matthias Schiffer
9015c01c34 Allow telnet login in config mode again 2014-01-09 10:06:36 +01:00
Matthias Schiffer
6c952a513a Add gluon-lock-password package and make config mode depend on it 2014-01-09 09:58:59 +01:00
Matthias Schiffer
1be0a7667f Make package version depend on the site config version where necessary 2014-01-04 09:19:13 +01:00
Nils Schneider
be79b874c5 gluon-config-mode: show hostname on reboot page. fixes #8 2013-11-28 19:16:39 +01:00
Nils Schneider
15aafe47c8 gluon-config-mode: texts from mkm 2013-10-09 21:13:48 +02:00
Nils Schneider
75ac64ca20 gluon-config-mode: simple-tc ifname must be mesh-vpn, not mesh_vpn 2013-10-03 23:26:00 +02:00
Nils Schneider
0d1e3e144b gluon-config-mode: site.conf: configmode -> config_mode 2013-10-03 23:04:41 +02:00
Nils Schneider
2468154ad1 gluon-config-mode: add simple-tc settings for mesh_vpn 2013-10-03 23:00:47 +02:00
Nils Schneider
05633089c4 gluon-config-mode: forgot to rename uci config in button script 2013-10-03 22:48:54 +02:00
Nils Schneider
0a6c21e167 gluon-config-mode: forgot to rename uci config in button script 2013-10-03 22:12:47 +02:00
Nils Schneider
c73d52d77f gluon-config-mode: fix upgrade script /lib/gluon/ugprade/config-mode/ 2013-10-03 13:10:18 +02:00