oweals/luci.git
9 years agoMerge pull request #494 from ollie27/strings
Hannu Nyman [Wed, 28 Oct 2015 10:40:16 +0000 (12:40 +0200)]
Merge pull request #494 from ollie27/strings

fix string "UPNP" -> "UPnP"

9 years agofix string "UPNP" -> "UPnP" 494/head
Oliver Middleton [Sun, 27 Sep 2015 23:50:37 +0000 (00:50 +0100)]
fix string "UPNP" -> "UPnP"

Signed-off-by: Oliver Middleton <olliemail27@gmail.com>
9 years agoMerge pull request #509 from neheb/master
Hannu Nyman [Tue, 27 Oct 2015 15:30:24 +0000 (17:30 +0200)]
Merge pull request #509 from neheb/master

resources/icons: Use gifsicle to save a few bytes.

9 years agoluci-base: eliminiate use of uci state vars in luci.sys
Jo-Philipp Wich [Tue, 27 Oct 2015 13:11:11 +0000 (14:11 +0100)]
luci-base: eliminiate use of uci state vars in luci.sys

Rewrite `luci.sys.wifi.getiwinfo()` to use the ubus wireless state instead of
depreacated uci state vars in order to map abstract network notation to
wireless ifnames.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoAdd link to API reference
Jo-Philipp Wich [Tue, 27 Oct 2015 12:24:09 +0000 (13:24 +0100)]
Add link to API reference

9 years agoMove libubus-lua dependency to luci-base
Jo-Philipp Wich [Tue, 27 Oct 2015 12:09:03 +0000 (13:09 +0100)]
Move libubus-lua dependency to luci-base

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-app-diag-devinfo: mark broken due to dependencies
Hannu Nyman [Tue, 27 Oct 2015 07:57:57 +0000 (09:57 +0200)]
luci-app-diag-devinfo: mark broken due to dependencies

Mark luci-app-diag-devinfo @BROKEN as it has several failing dependencies:

Four dependencies from "oldpackages":
 httping, mac-to-devinfo, smap-to-devinfo, netdiscover-to-devinfo

One dependency from "abandoned":
 smap

(netdiscover is currently ok in trunk, but not in 15.05.)

Reference to Luci issue #523.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
9 years agoluci-app-statistics: Adjust ping graphs to show target hosts separately
Hannu Nyman [Sun, 25 Oct 2015 08:19:26 +0000 (10:19 +0200)]
luci-app-statistics: Adjust ping graphs to show target hosts separately

Ping statistics plugin allows the user to define multiple ping targets.
The graphs have so far shown multiple hosts in a stacked way.
Adjust graphs to show the target hosts separately (overlay=true).

Clarify the plugin definition with some additional line spacing.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
9 years agoluci-app-statistics: improve scaling of the associated stations graph
Hannu Nyman [Sun, 25 Oct 2015 08:11:35 +0000 (10:11 +0200)]
luci-app-statistics: improve scaling of the associated stations graph

Improve scaling of the associated stations graph on the wireless page.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
9 years agoMerge pull request #522 from LuttyYang/master
Hannu Nyman [Sat, 24 Oct 2015 06:33:42 +0000 (09:33 +0300)]
Merge pull request #522 from LuttyYang/master

luci-theme-material: fix some style bugs

9 years agoluci-theme-material: fix some style bugs 522/head
Lutty Yang [Sat, 24 Oct 2015 02:14:11 +0000 (10:14 +0800)]
luci-theme-material: fix some style bugs

Signed-off-by: Lutty Yang <lutty@wcan.in>
9 years agoMerge pull request #521 from LuttyYang/master
Hannu Nyman [Fri, 23 Oct 2015 17:21:01 +0000 (20:21 +0300)]
Merge pull request #521 from LuttyYang/master

luci-theme-material: Synchronized to the LUCI version f9e590a

9 years agoRevert "luci-theme-material: do not infer login state from url (#520)"
Hannu Nyman [Fri, 23 Oct 2015 17:16:04 +0000 (20:16 +0300)]
Revert "luci-theme-material: do not infer login state from url (#520)"

This reverts commit f9e590aa4741bf337029be3f374a33543cc3f37b
in order to enable a clean merge of the PR #521 from the theme author.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
9 years agoluci-theme-material: try find current position by using lua code 521/head
Lutty Yang [Fri, 23 Oct 2015 12:51:12 +0000 (20:51 +0800)]
luci-theme-material: try find current position by using lua code

thanks for jow

Signed-off-by: Lutty Yang <lutty@wcan.in>
9 years agoluci-theme-material: Synchronized to the LUCI version f9e590a
Lutty Yang [Fri, 23 Oct 2015 04:51:07 +0000 (12:51 +0800)]
luci-theme-material: Synchronized to the LUCI version f9e590a

Signed-off-by: Lutty Yang <lutty@wcan.in>
9 years agoluci-theme-material: do not infer login state from url (#520)
Jo-Philipp Wich [Thu, 22 Oct 2015 19:07:40 +0000 (21:07 +0200)]
luci-theme-material: do not infer login state from url (#520)

Checking for `;` in the url is no good indicator whether a user is logged in,
instead query the dispatcher and set a `logged-in` CSS class on the `<body>`
element if a session exists.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-mod-admin-full: fix invalid markup in packages.htm (#518)
Jo-Philipp Wich [Thu, 22 Oct 2015 10:20:09 +0000 (12:20 +0200)]
luci-mod-admin-full: fix invalid markup in packages.htm (#518)

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-mod-admin-full: restructure and fix backup, restore and sysuprade (#517)
Jo-Philipp Wich [Thu, 22 Oct 2015 06:35:34 +0000 (08:35 +0200)]
luci-mod-admin-full: restructure and fix backup, restore and sysuprade (#517)

Do not use standard post security checking for actions that require file upload
since reading the token value will trigger parsing of the http message body
before the file upload handler has been set, which causes LuCI to buffer the
entire request body in memory.

In order to simplify the code and logic flow, split action_flashops() into
separate handlers for reset, backup, restore and sysupgrade.

Let the backup restore and sysupgrade handlers use the new test_post_security()
method in luci.dispatcher to perform token checking *after* setting the upload
handler.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-base: dispatcher expose test_post_security()
Jo-Philipp Wich [Thu, 22 Oct 2015 06:30:29 +0000 (08:30 +0200)]
luci-base: dispatcher expose test_post_security()

Allows external code to perform POST and token checking manually.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-base: ensure that base url is emitted with trailing slash
Jo-Philipp Wich [Wed, 21 Oct 2015 14:45:48 +0000 (16:45 +0200)]
luci-base: ensure that base url is emitted with trailing slash

Now that we don't have an url token anymore, '/cgi-bin/luci' becomes a valid
url while cookies are restricted to only '/cgi-bin/luci/' and below.

In order to ensure that the first request after login refers to a path
covered by the authentication cookie, change build_url() to always append
a trailing slash if we're referring to the base url.

This should fix the login problems mentioned in #516.

While we're touching the dispatcher, also remove remaining url token code.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-mod-admin-full: do not access dispatcher.context.urltoken in logout
Jo-Philipp Wich [Wed, 21 Oct 2015 14:42:39 +0000 (16:42 +0200)]
luci-mod-admin-full: do not access dispatcher.context.urltoken in logout

The urltoken table is going to be removed.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-base: remove security token from urls
Jo-Philipp Wich [Tue, 20 Oct 2015 22:31:27 +0000 (00:31 +0200)]
luci-base: remove security token from urls

Now that sensitive urls require post requests and only accept them if a valid
security token is sent along the request, we can drop the global random url
token to improve LuCI usability.

The main improvement is the ability to use multiple tabs with the same login
session, but also deep linking to specific urls without the need for another
login becomes feasible, e.g. for documentation purposes.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-app-upnp: protect lease delete call with csrf token
Jo-Philipp Wich [Tue, 20 Oct 2015 22:11:28 +0000 (00:11 +0200)]
luci-app-upnp: protect lease delete call with csrf token

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-app-splash: protect admin status call with csrf token
Jo-Philipp Wich [Tue, 20 Oct 2015 22:09:55 +0000 (00:09 +0200)]
luci-app-splash: protect admin status call with csrf token

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-app-radicale: protect start/stop actions with csrf token
Jo-Philipp Wich [Tue, 20 Oct 2015 22:03:56 +0000 (00:03 +0200)]
luci-app-radicale: protect start/stop actions with csrf token

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-app-privoxy: protect start/stop actions with csrf token
Jo-Philipp Wich [Tue, 20 Oct 2015 22:03:03 +0000 (00:03 +0200)]
luci-app-privoxy: protect start/stop actions with csrf token

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-app-ocserv: protect disconnect action with csrf token
Jo-Philipp Wich [Tue, 20 Oct 2015 22:00:55 +0000 (00:00 +0200)]
luci-app-ocserv: protect disconnect action with csrf token

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-app-ddns: protect start/stop actions with csrf token
Jo-Philipp Wich [Tue, 20 Oct 2015 21:58:01 +0000 (23:58 +0200)]
luci-app-ddns: protect start/stop actions with csrf token

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-mod-admin-full: protect iptables counter reset and restart with token
Jo-Philipp Wich [Tue, 20 Oct 2015 20:27:39 +0000 (22:27 +0200)]
luci-mod-admin-full: protect iptables counter reset and restart with token

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-mod-admin-full: protect network post actions with csrf tokens
Jo-Philipp Wich [Tue, 20 Oct 2015 20:17:23 +0000 (22:17 +0200)]
luci-mod-admin-full: protect network post actions with csrf tokens

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-base: filter invalid opkg status lines
Jo-Philipp Wich [Tue, 20 Oct 2015 19:04:38 +0000 (21:04 +0200)]
luci-base: filter invalid opkg status lines

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-mod-admin-full: protect clock, flash and opkg ops with submit token
Jo-Philipp Wich [Tue, 20 Oct 2015 19:01:41 +0000 (21:01 +0200)]
luci-mod-admin-full: protect clock, flash and opkg ops with submit token

* Use post_on() target to require csrf token verification for modifying actions
* Ensure that package and flash operation handlers guard modifying operations
  with parameter check

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-base: generalize post security token handling
Jo-Philipp Wich [Tue, 20 Oct 2015 18:58:30 +0000 (20:58 +0200)]
luci-base: generalize post security token handling

* Add a generic helper function to check need for post / csrf token validation
* Remove custom token verification in cbi targets
* Support requiring post security depending on specific submit parameters,
  usable through post_on() action

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoMerge pull request #513 from LuttyYang/master
Hannu Nyman [Tue, 13 Oct 2015 15:15:05 +0000 (18:15 +0300)]
Merge pull request #513 from LuttyYang/master

luci-theme-material: PR from Version 0.2.11

9 years agoluci-theme-material: PR from Version 0.2.11 513/head
Lutty Yang [Tue, 13 Oct 2015 15:07:16 +0000 (23:07 +0800)]
luci-theme-material: PR from Version 0.2.11

Signed-off-by: Lutty Yang <lutty@wcan.in>
9 years agoi18n: Sync translations
Hannu Nyman [Tue, 13 Oct 2015 09:35:57 +0000 (12:35 +0300)]
i18n: Sync translations

Sync translations to the current strings.

Changes in luci-app-ddns, luci-app-mjpg-streamer, luci-app-qos,
luci-app-shadowsocks-libev, luci-app-statistics and luci-base

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
9 years agoluci-base: update i18n base template
Hannu Nyman [Tue, 13 Oct 2015 09:25:58 +0000 (12:25 +0300)]
luci-base: update i18n base template

Update i18n base template to match the current strings.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
9 years agoluci.mk: correct SK language name to Slovak
Hannu Nyman [Tue, 13 Oct 2015 07:13:50 +0000 (10:13 +0300)]
luci.mk: correct SK language name to Slovak

SK language code refers to Slovak, not Slovene.
Native language name is correct.

References:
https://forum.openwrt.org/viewtopic.php?id=60235
https://en.wikipedia.org/wiki/Slovak_language

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
9 years agoluci-app-ddns: fix typo in previous commit
Jo-Philipp Wich [Mon, 12 Oct 2015 09:13:26 +0000 (11:13 +0200)]
luci-app-ddns: fix typo in previous commit

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoTimezone information: update to 2015g
Hannu Nyman [Mon, 12 Oct 2015 07:58:09 +0000 (10:58 +0300)]
Timezone information: update to 2015g

Changes in 2015g:
http://mm.icann.org/pipermail/tz-announce/2015-October/000034.html

     Norfolk moves from +1130 to +1100 on 2015-10-04 at 02:00 local time.

     Fiji's 2016 fall-back transition is scheduled for January 17, not 24.

     Fort Nelson, British Columbia will not fall back on 2015-11-01. It has
     effectively been on MST (-0700) since it advanced its clocks on 2015-03-08.
     New zone America/Fort_Nelson.

Note: the Turkey-related one-time rule change is not apparently catched by
the zoneinfo2lua script, so that change is not included in this commit.
(Turkey's 2015 fall-back transition is scheduled for Nov. 8, not Oct. 25.)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
9 years agoluci-app-ddns: remove title <a> hacks
Jo-Philipp Wich [Mon, 12 Oct 2015 07:14:49 +0000 (09:14 +0200)]
luci-app-ddns: remove title <a> hacks

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoresources/icons: Use gifsicle to save a few bytes. 509/head
Mangix [Fri, 9 Oct 2015 23:00:57 +0000 (16:00 -0700)]
resources/icons: Use gifsicle to save a few bytes.
Signed-off by: Rosen Penev <rosenp@gmail.com>

9 years agoMerge pull request #505 from roger-/dump1090-latlon
Jo-Philipp Wich [Thu, 8 Oct 2015 00:06:08 +0000 (02:06 +0200)]
Merge pull request #505 from roger-/dump1090-latlon

dump1090: lat/lon should be floats

9 years agodump1090: lat/lon should be floats 505/head
Roger [Wed, 7 Oct 2015 23:16:03 +0000 (18:16 -0500)]
dump1090: lat/lon should be floats

Signed-off-by: Roger D <rogerdammit@gmail.com>
9 years agoluci-base: prevent UCI changes in CBI if form is not in submit state
Jo-Philipp Wich [Wed, 7 Oct 2015 19:44:46 +0000 (21:44 +0200)]
luci-base: prevent UCI changes in CBI if form is not in submit state

Only process submitted data if the "cbi.submit" parameter is present as the
dispatcher will verify the integrity of the CSRF token in this case.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoGlobally replace luci.dispatcher.build_url(...) with url(...) invocations
Jo-Philipp Wich [Wed, 7 Oct 2015 17:07:36 +0000 (19:07 +0200)]
Globally replace luci.dispatcher.build_url(...) with url(...) invocations

Also concat multiple string arguments into one while we're at it.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-base: expose luci.dispatcher.build_url() as url() in templates
Jo-Philipp Wich [Wed, 7 Oct 2015 11:03:42 +0000 (13:03 +0200)]
luci-base: expose luci.dispatcher.build_url() as url() in templates

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-base: protect simpleforms with CSRF tokens
Jo-Philipp Wich [Wed, 7 Oct 2015 10:24:51 +0000 (12:24 +0200)]
luci-base: protect simpleforms with CSRF tokens

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-mod-admin-full: switch to POST action for reboot
Jo-Philipp Wich [Tue, 6 Oct 2015 23:54:56 +0000 (01:54 +0200)]
luci-mod-admin-full: switch to POST action for reboot

Also rework the reboot tmeplate a little bit.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-base: switch to POST action for service reload
Jo-Philipp Wich [Tue, 6 Oct 2015 20:37:23 +0000 (22:37 +0200)]
luci-base: switch to POST action for service reload

Switches the service reload calls to CSRF token protected POST action.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-mod-admin-full: switch to POST actions for UCI changes
Jo-Philipp Wich [Tue, 6 Oct 2015 20:29:07 +0000 (22:29 +0200)]
luci-mod-admin-full: switch to POST actions for UCI changes

Switches UCI apply/revert/save to CSRF token protected POST actions.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-theme-bootstrap: add redir parameter to uci change menu
Jo-Philipp Wich [Tue, 6 Oct 2015 20:21:48 +0000 (22:21 +0200)]
luci-theme-bootstrap: add redir parameter to uci change menu

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-theme-material: add redir parameter to uci change menu
Jo-Philipp Wich [Tue, 6 Oct 2015 20:21:36 +0000 (22:21 +0200)]
luci-theme-material: add redir parameter to uci change menu

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-base: protect CBI forms with CSRF tokens
Jo-Philipp Wich [Tue, 6 Oct 2015 16:54:35 +0000 (18:54 +0200)]
luci-base: protect CBI forms with CSRF tokens

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-base: add support for POST-only actions with CSRF token check
Jo-Philipp Wich [Tue, 6 Oct 2015 13:53:35 +0000 (15:53 +0200)]
luci-base: add support for POST-only actions with CSRF token check

Add the dispatcher infrastructure to restrict certain routes to POST
requests only in conjunction with verification of CSRF tokens.

This is the first step to get rid of the CSRF token in the url in favor
to tokens embedded in forms.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoMerge pull request #503 from LuttyYang/master
Hannu Nyman [Tue, 6 Oct 2015 12:18:41 +0000 (15:18 +0300)]
Merge pull request #503 from LuttyYang/master

luci-theme-material: fix some style bug in LUCI newest version

9 years agoluci-theme-material: fix some style bug in LUCI newest version 503/head
Lutty Yang [Tue, 6 Oct 2015 12:14:27 +0000 (20:14 +0800)]
luci-theme-material: fix some style bug in LUCI newest version

Signed-off-by: Lutty Yang <lutty@wcan.in>
9 years agoGlobally convert headline anchors into name attributes.
Jo-Philipp Wich [Tue, 6 Oct 2015 11:29:43 +0000 (13:29 +0200)]
Globally convert headline anchors into name attributes.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoMerge pull request #501 from LuttyYang/master
Jo-Philipp Wich [Mon, 5 Oct 2015 18:29:41 +0000 (20:29 +0200)]
Merge pull request #501 from LuttyYang/master

luci-theme-material: PR from version 0.2.6

9 years agoluci-app-statistics: reorder interface, netlink and openvpn datasources
Jo-Philipp Wich [Mon, 5 Oct 2015 17:11:51 +0000 (19:11 +0200)]
luci-app-statistics: reorder interface, netlink and openvpn datasources

This aligns the order and grouping of RX and TX network datasources.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-app-statistics: add support for sorting RRD data sources
Jo-Philipp Wich [Mon, 5 Oct 2015 17:11:13 +0000 (19:11 +0200)]
luci-app-statistics: add support for sorting RRD data sources

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-app-statistics: add initial support for collectd-mod-openvpn
Jo-Philipp Wich [Mon, 5 Oct 2015 16:55:28 +0000 (18:55 +0200)]
luci-app-statistics: add initial support for collectd-mod-openvpn

This changeset covers compression and traffic stats, not every combination has
been tested yet.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-theme-material: PR from version 0.2.6 501/head
Lutty Yang [Mon, 5 Oct 2015 14:01:42 +0000 (22:01 +0800)]
luci-theme-material: PR from version 0.2.6

PR from version 0.2.6

Signed-off-by: Lutty Yang <lutty@wcan.in>
9 years agoluci-app-statistics: add initial support for collect-mod-sensors
Jo-Philipp Wich [Mon, 5 Oct 2015 13:13:44 +0000 (15:13 +0200)]
luci-app-statistics: add initial support for collect-mod-sensors

Due to a lack of a test environment this support only covers thermal graphs
so far. Please send the output of "rrdtool info /tmp/rrd/*/sensors-*/*.rrd"
if your system happens to support voltage, power or fanspeed sensors.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoMerge pull request #488 from hnyman/black-flash
Hannu Nyman [Sun, 4 Oct 2015 15:57:59 +0000 (18:57 +0300)]
Merge pull request #488 from hnyman/black-flash

luci-base: change index.html to be more like current themes

9 years agoMerge pull request #489 from hnyman/remove-bno-theme
Hannu Nyman [Sun, 4 Oct 2015 15:57:45 +0000 (18:57 +0300)]
Merge pull request #489 from hnyman/remove-bno-theme

themes: remove freifunk-bno theme

9 years agoluci-mod-admin-full: status: survive broken DSL status output
Jo-Philipp Wich [Sat, 3 Oct 2015 14:11:11 +0000 (16:11 +0200)]
luci-mod-admin-full: status: survive broken DSL status output

Only attempt to call "dsl_func" if the dsl_control lucistat output could be
successfully evaluated.

Works around https://dev.openwrt.org/ticket/20607

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-app-statistics: improve diagram generation, add missing title
Jo-Philipp Wich [Sat, 3 Oct 2015 13:30:59 +0000 (15:30 +0200)]
luci-app-statistics: improve diagram generation, add missing title

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-app-statistics: rework graph label handling
Jo-Philipp Wich [Sat, 3 Oct 2015 13:29:25 +0000 (15:29 +0200)]
luci-app-statistics: rework graph label handling

Remove leftover unused translation code and properly escape colons in line
labels.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoluci-app-statistics: only render index view for more than one instance
Jo-Philipp Wich [Sat, 3 Oct 2015 09:40:09 +0000 (11:40 +0200)]
luci-app-statistics: only render index view for more than one instance

If a plugin produces only one instance, e.g. netlink with just one interface
configured, then the controller will register no detail views which would
normally show all graphs but the index pacage of a given plugin will still
display the collapsed view without any possibility to reach the full listing.

Fix the problem by only rendering a linked index view when more than one
instance is present.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
9 years agoproto_map: fix ealen range
Steven Barth [Fri, 2 Oct 2015 09:34:12 +0000 (11:34 +0200)]
proto_map: fix ealen range

Signed-off-by: Steven Barth <steven@midlink.org>
9 years agoMerge pull request #496 from neheb/master
Hannu Nyman [Tue, 29 Sep 2015 18:10:43 +0000 (21:10 +0300)]
Merge pull request #496 from neheb/master

Use ZopfliPNG to save 5.4 KB

9 years agoresources/icons: Use ZopfliPNG to save 5.4 KB 496/head
Mangix [Tue, 29 Sep 2015 01:12:07 +0000 (18:12 -0700)]
resources/icons: Use ZopfliPNG to save 5.4 KB

Signed-off by: Rosen Penev <rosenp@gmail.com>

9 years agoluci-base: change index.html to be more like current themes 488/head
Hannu Nyman [Tue, 29 Sep 2015 08:44:53 +0000 (11:44 +0300)]
luci-base: change index.html to be more like current themes

Change index.html that is visible for a second when entering Luci:
* Black text on white background (instead of white on black)
* Specify font as Arial/Helvetica

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
9 years agothemes: remove freifunk-bno theme 489/head
Hannu Nyman [Tue, 29 Sep 2015 08:44:16 +0000 (11:44 +0300)]
themes: remove freifunk-bno theme

Remove the freifunk-bno theme as the bno profile itself was removed.
Discussion in https://github.com/openwrt/luci/pull/471

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
9 years agoMerge pull request #497 from cshore/asterisk-update
Hannu Nyman [Tue, 29 Sep 2015 08:31:42 +0000 (11:31 +0300)]
Merge pull request #497 from cshore/asterisk-update

applications/asterisk: Remove incorrect dependency

9 years agoCONTRIBUTING.md: Add advice on pull requests
Hannu Nyman [Tue, 29 Sep 2015 07:38:58 +0000 (10:38 +0300)]
CONTRIBUTING.md: Add advice on pull requests

Add advice on pull requests and best practices in working with Github.
Minor corrections & updates.
Adjust to Github 'markdown' syntax.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
9 years agoapplications/asterisk: Remove incorrect dependency 497/head
Daniel Dickinson [Tue, 29 Sep 2015 07:47:31 +0000 (03:47 -0400)]
applications/asterisk: Remove incorrect dependency

ahcpd dependency appears to have come from a cut-n-paste from
luci-app-ahcpd.

9 years agoMerge pull request #495 from openwrt-es/dump1090-next
Hannu Nyman [Tue, 29 Sep 2015 06:53:04 +0000 (09:53 +0300)]
Merge pull request #495 from openwrt-es/dump1090-next

applications/luci-dump1090: update config to latest version

9 years agoapplications/luci-dump1090: update config to latest version 495/head
Álvaro Fernández Rojas [Mon, 28 Sep 2015 22:07:22 +0000 (00:07 +0200)]
applications/luci-dump1090: update config to latest version

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
9 years agoMerge pull request #491 from hnyman/reorganise-stats-menu
Hannu Nyman [Mon, 28 Sep 2015 15:29:58 +0000 (18:29 +0300)]
Merge pull request #491 from hnyman/reorganise-stats-menu

luci-app-statistics: reorganise menu items

9 years agoMerge pull request #492 from ollie27/nohosts
Hannu Nyman [Mon, 28 Sep 2015 09:01:56 +0000 (12:01 +0300)]
Merge pull request #492 from ollie27/nohosts

luci-mod-admin-full: fix dnsmasq no-hosts/addn-hosts options

9 years agoluci-mod-admin-full: fix dnsmasq no-hosts/addn-hosts options 492/head
Oliver Middleton [Sun, 27 Sep 2015 23:49:47 +0000 (00:49 +0100)]
luci-mod-admin-full: fix dnsmasq no-hosts/addn-hosts options

no-hosts does not disable addn-hosts.

Signed-off-by: Oliver Middleton <olliemail27@gmail.com>
9 years agoluci-app-statistics: reorganise menu items 491/head
Hannu Nyman [Sun, 27 Sep 2015 13:41:53 +0000 (16:41 +0300)]
luci-app-statistics: reorganise menu items

Reorganise the menu items of the Luci statistics module:

* Re-label "Collectd" to "Setup" and place it after the "Graphs" items.
  - "Graphs" is used much more frequently so it should be first.
  - Change "Collectd" menu item to "Setup" to clarify things.

* Re-label "System plugins" to "General plugins" to change sorting.
  "Network / Output / System" changes to "General / Network / Output"
  that is more logical order for the items.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
9 years agoMerge pull request #487 from jorgifumi/patch-1
Hannu Nyman [Sat, 26 Sep 2015 16:37:30 +0000 (19:37 +0300)]
Merge pull request #487 from jorgifumi/patch-1

Update multiwan.po

9 years agoUpdate multiwan.po 487/head
Jorge Lucena [Fri, 25 Sep 2015 08:36:05 +0000 (10:36 +0200)]
Update multiwan.po

Little fix in translation msgid "WAN Uplink"

Signed-off-by: Jorge Lucena <jorgifumi@gmail.com>
9 years agoMerge pull request #484 from LuttyYang/master
Hannu Nyman [Sat, 26 Sep 2015 15:29:12 +0000 (18:29 +0300)]
Merge pull request #484 from LuttyYang/master

luci-theme-material: add button select and input theme

9 years agoMerge pull request #485 from dwmw2/master
Jo-Philipp Wich [Tue, 22 Sep 2015 20:18:16 +0000 (22:18 +0200)]
Merge pull request #485 from dwmw2/master

luci/statistics: Fix nut UPS graphs

9 years agoluci/statistics: Fix nut UPS graphs 485/head
David Woodhouse [Thu, 17 Sep 2015 10:35:38 +0000 (11:35 +0100)]
luci/statistics: Fix nut UPS graphs

At some point since I last checked, the nut plugin for collectd changed the
names of the timeleft and percent datasets. Update the luci module to match
so that those graphs are generated correctly again.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
9 years agoluci-theme-material: add button select input theme 484/head
Lutty Yang [Sun, 20 Sep 2015 04:08:44 +0000 (12:08 +0800)]
luci-theme-material: add button select input theme

add button select input theme

Signed-off-by: Lutty Yang <lutty@wcan.in>
9 years agoMerge pull request #482 from LuttyYang/master
Christian Schoenebeck [Sat, 19 Sep 2015 11:17:24 +0000 (13:17 +0200)]
Merge pull request #482 from LuttyYang/master

luci-theme-material: add some new features and fix some bugs

9 years agoluci-theme-material: add some new features and fix some bugs 482/head
Lutty Yang [Sat, 19 Sep 2015 09:22:54 +0000 (17:22 +0800)]
luci-theme-material: add some new features and fix some bugs

add footer and loading animation and auto focus switches
compact Fonts

Signed-off-by: Lutty Yang <lutty@wcan.in>
9 years agoluci-base: set default mediaurlbase to bootstrap (current default theme)
Hannu Nyman [Fri, 18 Sep 2015 13:00:06 +0000 (16:00 +0300)]
luci-base: set default mediaurlbase to bootstrap (current default theme)

The mediaurlbase option in the default /etc/config/luci still points
to the old openwrt.org theme that is not installed by default.
The discrepancy was noted in the commit message for 55ab4e4ce22

After 55ab4e4ce22 the installed theme's uci-defaults script will correct
the setting at first boot, but we should not have a deprecated theme as
the default value. Set the default value to the default theme 'bootstrap'.

Related old discussion at #302

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
9 years agoMerge pull request #481 from LuttyYang/master
Hannu Nyman [Fri, 18 Sep 2015 08:52:32 +0000 (11:52 +0300)]
Merge pull request #481 from LuttyYang/master

luci-theme-material: fix some bug

9 years agoluci-theme-material: fix font size bug 481/head
Lutty Yang [Fri, 18 Sep 2015 08:22:39 +0000 (16:22 +0800)]
luci-theme-material: fix font size bug

fix "textarea font-size too big in firefox"

Signed-off-by: Lutty Yang <lutty@wcan.in>
9 years agoluci-mod-admin-full: opkg config / prevent word-wrap
Hannu Nyman [Fri, 18 Sep 2015 07:24:58 +0000 (10:24 +0300)]
luci-mod-admin-full: opkg config / prevent word-wrap

Prevent word-wrap on the config input areas. Especially the feed
definition lines can be long, and automatic word-wrap can decrease
clarity.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
9 years agoluci-theme-material: fix Polish text longer bug
Lutty Yang [Fri, 18 Sep 2015 05:51:15 +0000 (13:51 +0800)]
luci-theme-material: fix Polish text longer bug

Signed-off-by: Lutty Yang <lutty@wcan.in>
9 years agoluci-theme-material: fix some bug
Lutty Yang [Fri, 18 Sep 2015 03:32:44 +0000 (11:32 +0800)]
luci-theme-material: fix some bug

fixed "logout" text theme error and "unsaved changes" page dislocation.

Signed-off-by: Lutty Yang <lutty@wcan.in>
9 years agoMerge pull request #480 from obsy/master
Hannu Nyman [Thu, 17 Sep 2015 16:31:00 +0000 (19:31 +0300)]
Merge pull request #480 from obsy/master

Cosmetic changes for the Polish language

9 years agoi18n/polish/base: changing form of the word 480/head
Cezary Jackiewicz [Thu, 17 Sep 2015 16:23:26 +0000 (18:23 +0200)]
i18n/polish/base: changing form of the word