Merge pull request #136 from opentechinstitute/usability

1.0 Release

.gitignore

@@ -0,0 +1 @@
+\#*

files/etc/config/nodogsplash

@@ -0,0 +1,7 @@
+config settings settings
+    option enable '1'
+	option splashtime '1'
+	option splashunit 'hours'
+
+config interfaces interfaces
+	option interface 'br-lan'

files/etc/config/serval

@@ -0,0 +1,7 @@
+config settings settings
+	option enabled 'true'
+	option primary_keyring '/etc/serval'
+	option olsrd_mdp_keyring '/etc/commotion/keys.d/mdp'
+	option update_primary_keyring 'false'
+	option update_mdp_keyring 'false'
+	option new_mdp_keyring 'false'

files/etc/config/setup_wizard

@@ -0,0 +1,5 @@
+config settings settings
+	   option enabled '1'
+
+config uci passwords
+	   option admin_pass 'false'

files/etc/init.d/ucidog

@@ -0,0 +1,44 @@
+#!/bin/sh /etc/rc.common
+
+#simple barely functional nodogsplash uci-track script to set nodogsplash uci values that were set.
+
+. /lib/functions/commotion.sh
+. /lib/config/uci.sh
+
+START=19
+STOP=91
+
+reload() {
+	#nodogsplash configuration file.
+	local conffile=/etc/nodogsplash/nodogsplash.conf
+
+	#convert splash page time into minues
+	local splash_time=$(uci_get nodogsplash settings splashtime)
+	local splash_unit=$(uci_get nodogsplash settings splashunit)
+	if [ "$splash_unit" == "days" ]; then
+		splash_time=$(($splash_time*60))
+	elif [ "$splash_unit" == "hours" ]; then
+		splash_time=$(($splash_time*24*60))
+	elif [ "$splash_unit" == "seconds" ]; then
+		splash_time=$(($splash_time/60))
+	fi
+	#set splashpage time
+	sed -i "s/^\(ClientIdleTimeout \).*/\1  $splash_time/" $conffile ||  return 0
+	sed -i "s/^\(ClientForceTimeout \).*/\1 $splash_time/" $conffile || return 0
+
+	#get and set interface name
+	local interface=$(uci_get nodogsplash interfaces interface)
+	local network=$(uci_get wireless $interface network)
+	sed -i "s/^\(GatewayInterface \).*/\1 $interface/" $conffile || return 0
+	/etc/init.d/nodogsplash stop && sleep 1
+
+	#disable/enable nodogsplash
+	local enable=$(uci_get nodogsplash settings enable)
+	echo "$enable"
+	if [ "$enable" == '1' ]; then #this might come back as a string and not as a intiger. Check and fix that.
+		/etc/init.d/nodogsplash enable  || return 0
+		/etc/init.d/nodogsplash start || return 0
+	else
+		/etc/init.d/nodogsplash disable  || return 0
+	fi
+}

files/etc/uci-defaults/luci-setup-wizard

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+. /etc/functions.sh
+
+#setup ucitrack
+uci add ucitrack nodogsplash
+uci set ucitrack.@nodogsplash[0].init=ucidog
+uci add_list ucitrack.@system[0].affects=avahi_daemon
+uci add ucitrack avahi_daemon
+uci set ucitrack.@avahi_daemon[0].init=avahi-daemon
+uci add_list ucitrack.@setup_wizard[0].affects=nodogsplash
+uci commit ucitrack
+
+#setup sysupgrade saves
+echo /etc/config/setup_wizard >> /etc/sysupgrade.conf
+
+exit 0

luasrc/controller/commotion/basic_config.lua

@@ -0,0 +1,174 @@
+--[[
+Copyright (C) 2013 Seamus Tuohy 
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+HUGE Thanks to the niu suite!!!
+]]--
+--[[
+   Copyright (C) 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+module ("luci.controller.commotion.basic_config", package.seeall)
+local db = require "luci.commotion.debugger"
+
+function index()
+   local SW = require "luci.commotion.setup_wizard"
+
+   entry({"admin", "commotion"}, alias("admin", "commotion", "status"), translate("Commotion"), 20)
+
+   local page  = node()
+   page.lock   = true
+   page.target = alias("commotion")
+   page.subindex = true
+   page.index = false
+
+   local root = node()
+   if not root.lock then
+	  root.target = alias("commotion")
+	  root.index = true
+   end
+
+   local redir = luci.http.formvalue("redir", true) or
+	  luci.dispatcher.build_url(unpack(luci.dispatcher.context.request))
+
+   cnfm = entry({"admin", "commotion", "confirm"}, call("action_changes"), translate("Confirm"), 40)
+   cnfm.query = {redir=redir}
+   cnfm.hidden = true
+
+   rvt = entry({"admin", "commotion", "revert"}, call("action_revert"))
+   rvt.query = {redir=redir}
+   rvt.hidden = true
+
+   sva = entry({"admin", "commotion", "saveapply"}, call("action_apply"))
+   sva.query = {redir=redir}
+   sva.hidden = true
+
+   --IF Setup Wizard is Active
+   if SW.status() then
+	  local sw_page = luci.http.formvalue("sw_page") or nil
+
+	  entry({"commotion"}, alias("commotion", "welcome"))
+	  entry({"commotion", "welcome"}, template("commotion/welcome"), translate("Welcome to Commotion")).hidden = true
+	  entry({"commotion", "advanced"}, call("advanced")).hidden = true
+	  entry({"commotion", "setup_wizard", "start"}, call("start_setup")).hidden = true
+
+	  local confirm = {on_success_to={"commotion", "confirm"}}
+	  --Setup Wizard Delegator
+	  entry({"commotion", "setup_wizard"}, cbi("commotion/setup_wizard", {on_success_to={"commotion", "confirm"},  sw_page=sw_page}), translate("Setup Wizard"), 15).hidden = true
+
+	  --Confirmation Pages
+	  sw_cnfm = entry({"commotion", "confirm"}, call("action_changes"), translate("Confirm"), 40)
+	  sw_cnfm.query = {redir=redir}
+	  sw_cnfm.hidden = true
+
+	  sw_rvt = entry({"commotion", "revert"}, call("action_revert"))
+	  sw_rvt.query = {redir=redir}
+	  sw_rvt.hidden = true
+
+	  sw_sva = entry({"commotion", "saveapply"}, call("action_apply"))
+	  sw_sva.query = {redir=redir}
+	  sw_sva.hidden = true
+   else
+	  entry({"commotion"}, alias("apps"))
+	  --Create regular "Basic Config" menu.
+	  entry({"admin", "commotion", "basic"}, alias("admin", "commotion", "basic", "node_settings"), translate("Basic Configuration"), 25).index = true
+
+	  --No Subsection for Node Settings?
+	  entry({"admin", "commotion", "basic", "node_settings"}, cbi("commotion/basic_ns", {hideapplybtn=true, hideresetbtn=true}), translate("Node Settings"), 25).subsection=true
+
+	  --Subsection Network Settings
+	  entry({"admin", "commotion", "basic", "network_settings"}, alias("admin", "commotion", "basic", "mesh_network"), translate("Network Settings"), 30).subsection=true
+	  entry({"admin", "commotion", "basic", "mesh_network"}, cbi("commotion/basic_mn", {hideapplybtn=true, hideresetbtn=true}), translate("Mesh Network"), 40)
+	  entry({"admin", "commotion", "basic", "wireless_network"}, cbi("commotion/basic_wn", {hideapplybtn=true, hideresetbtn=true}), translate("Wireless Network"), 50)
+	  entry({"admin", "commotion", "basic", "addtl_net_ifaces"}, cbi("commotion/basic_ani", {hideapplybtn=true, hideresetbtn=true}), translate("Additional Network Interfaces"), 60)
+   end
+end
+
+function advanced()
+   local uci = require "luci.model.uci".cursor()
+   local disp = require "luci.dispatcher"
+   local http = require "luci.http"
+
+   uci:set("setup_wizard", "settings", "enabled", "0")
+   uci:save("setup_wizard")
+   uci:commit("setup_wizard")
+   adv = disp.build_url("admin", "commotion")
+   http.redirect(adv)
+end
+
+function start_setup()
+   local uci = require "luci.model.uci".cursor()
+   local disp = require "luci.dispatcher"
+   local http = require "luci.http"
+   uci:section("wireless", "wifi-iface", "commotionAP", {mode="ap", network="lan"})
+   uci:section("wireless", "wifi-iface", "commotionMesh", {mode="adhoc"})
+   uci:save("wireless")
+   uci:commit("wireless")
+   setup = disp.build_url("commotion", "setup_wizard")
+   http.redirect(setup)
+end
+
+
+function action_changes()
+   local uci = require "luci.model.uci".cursor()
+   local changes = uci:changes()
+
+   luci.template.render("commotion/confirm", {
+						   changes = next(changes) and changes
+   })
+end
+
+function action_apply()
+	local path = luci.dispatcher.context.path
+	local uci = luci.model.uci.cursor()
+	local changes = uci:changes()
+	local reload = {}
+
+	-- Collect files to be applied and commit changes
+	for r, tbl in pairs(changes) do
+		table.insert(reload, r)
+		if path[#path] ~= "apply" then
+			uci:load(r)
+			uci:commit(r)
+			uci:unload(r)
+		end
+	end
+
+	luci.template.render("commotion/apply", {
+		changes = next(changes) and changes,
+		configs = reload})
+end
+
+function action_revert()
+	local uci = luci.model.uci.cursor()
+	local changes = uci:changes()
+
+	-- Collect files to be reverted
+	for r, tbl in pairs(changes) do
+		uci:load(r)
+		uci:revert(r)
+		uci:unload(r)
+	end
+
+	luci.template.render("commotion/revert", {
+		changes = next(changes) and changes
+	})
+end

luasrc/controller/commotion/client_config.lua

@@ -0,0 +1,20 @@
+--[[
+LuCI - Lua Development Framework
+
+Copyright 2013 - Seamus Tuohy <s2e@opentechinstitute.org>
+
+With Thanks to the niu suite built by Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+module "luci.controller.commotion.client_config"
+
+function index()
+   entry({"admin", "commotion", "client"}, alias("admin", "commotion", "client", "welcome_page"), translate("Client Controls"), 30)
+   entry({"admin", "commotion", "client", "welcome_page"}, cbi("commotion/client_wp", {hideapplybtn=true, hideresetbtn=true}), translate("Welcome Page"), 40).index = true
+end

luasrc/controller/commotion/info.lua

@@ -0,0 +1,21 @@
+--[[
+LuCI - Lua Development Framework
+
+Copyright 2013 - Seamus Tuohy <s2e@opentechinstitute.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+]]--
+module "luci.controller.commotion.info"
+
+function index()
+   entry({"admin", "commotion", "client"}, alias("admin", "commotion", "client", "welcome_page"), translate("Client Controls"), 30)
+
+   entry({"commotion", "about"}, template("commotion/about"), translate("About")).hidden = true
+   entry({"commotion", "help"}, template("commotion/help"), translate("Help")).hidden = true
+   entry({"commotion", "license"}, template("commotion/license"), translate("License")).hidden = true
+end