diff --git a/usr/lib/lua/luci/controller/QS/QS.lua b/usr/lib/lua/luci/controller/QS/QS.lua index 7ca43c2..a1aaacd 100644 --- a/usr/lib/lua/luci/controller/QS/QS.lua +++ b/usr/lib/lua/luci/controller/QS/QS.lua @@ -8,9 +8,9 @@ function index() local uci = luci.model.uci.cursor() if uci:get('quickstart', 'options', 'complete') ~= 'true' then entry({"QuickStart"}, call("main"), "Quick Start").dependent=false + entry({"QuickStart", "CertificateHelp"}, template("QS/module/cert")) end entry({"admin", "commotion", "quickstart"}, call("resetQS"), "Restart Quickstart", 50) - end function resetQS() diff --git a/usr/lib/lua/luci/view/QS/module/applyreboot.htm b/usr/lib/lua/luci/view/QS/module/applyreboot.htm index 31f9e00..d32d6a9 100644 --- a/usr/lib/lua/luci/view/QS/module/applyreboot.htm +++ b/usr/lib/lua/luci/view/QS/module/applyreboot.htm @@ -1,6 +1,9 @@ +<%+header%> + - <%=luci.sys.hostname()%> - <% if title then %><%=title%><% else %><%:Redirecting...%><% end %> + <%=luci.sys.hostname()%> - <% if title then %><%=title%><% else %><%:Redirecting...%><% end %> + <%- if luci.fs.isfile("/etc/commotion/profiles.d/quickstartSettings") then for line in io.lines("/etc/commotion/profiles.d/quickstartSettings") do @@ -29,23 +32,27 @@ local meshName = netName local nodeName = hostname -%> + + + -
@@ -61,24 +68,23 @@

<%:System%> - <% if title then %><%=title%><% <%:Waiting for changes to be applied...%>
-

The name of your mesh network is:

+

<%:The name of your mesh network is:%>

<%=meshName%>

-

Your node name is:

+

<%:Your node name is:%>

<%=nodeName%>

-

When people connect to your node wirelessly, they will connect using this name:

+

<%:When people connect to your node wirelessly, they will connect using this name:%>

<%=apName%>

-

After configuring your node, you can change the node name on the node administration page.

+

<%:After configuring your node, you can change the node name on the node administration page.%>

-
- -

+ +<%+footer%> diff --git a/usr/lib/lua/luci/view/QS/module/cert.htm b/usr/lib/lua/luci/view/QS/module/cert.htm new file mode 100644 index 0000000..ebf8da8 --- /dev/null +++ b/usr/lib/lua/luci/view/QS/module/cert.htm @@ -0,0 +1,50 @@ +<%+header%> + + + + + + + +

<%:Device "fingerprints" and HTTPS%>

+ + +

<%:We are about to open a secure connection to your device. Because this wireless device is not registered with a online certificate provider your web browser cannot verify that it is who it says it is. You can use the fingerprints below to verify this device yourself.%>

+
+

<%:This device's fingerprints are:%>

+ +
+
+ <%:How do I use these fingerprints?%> +
+ + +
+

<%:We are about to open a secure connection to your device. You WILL receive a warning from your browser.%> <%=REQUEST_URI%>/CertificateHelp", target="_blank"><%:Click here to learn what this warning means.%> +

+ diff --git a/www/luci-static/commotion/QS/css/applyreboot.js b/www/luci-static/commotion/QS/css/applyreboot.js new file mode 100644 index 0000000..54efa6c --- /dev/null +++ b/www/luci-static/commotion/QS/css/applyreboot.js @@ -0,0 +1,57 @@ +var classType = "iecert"; +var pageNum = 1; + +function internetExplorer() { + if (document.getElementById('certWrapper').className == "hidden") { + document.getElementById("certWrapper").className = "certWrapper"; + } + classType = "iecert"; + pageNum = 1; + document.getElementById("certTut").className="sprite " + classType + pageNum; +}; + +function firefoxFunc() { + if (document.getElementById('certWrapper').className == "hidden") { + document.getElementById("certWrapper").className = "certWrapper"; + } + classType = "chcert"; + pageNum = 1; + document.getElementById("certTut").className="sprite " + classType + pageNum; +}; + +function chromeFunc() { + if (document.getElementById('certWrapper').className == "hidden") { + document.getElementById("certWrapper").className = "certWrapper"; + } + classType = "ffcert"; + pageNum = 1; + document.getElementById("certTut").className="sprite " + classType + pageNum; +}; + +function next() { + if (classType == 'ffcert' || classType == 'iecert') { + if (pageNum <= 3) { + pageNum += 1; + } + else { + pageNum = 1; + } + } + else if (classType == 'chcert') { + if (pageNum <= 2) { + pageNum += 1; + } + else { + pageNum = 1; + } + } + document.getElementById("certTut").className="sprite " + classType + pageNum; +}; + +function toggleVisibility(x) +{ + if (document.getElementById(x).className === "hidden") { + document.getElementById(x).className = "visible"; + } + else {document.getElementById(x).className = "hidden";} +} diff --git a/www/luci-static/commotion/QS/css/certWarn.css b/www/luci-static/commotion/QS/css/certWarn.css new file mode 100644 index 0000000..7f7fd99 --- /dev/null +++ b/www/luci-static/commotion/QS/css/certWarn.css @@ -0,0 +1,34 @@ +.certWrapper {height:600px;} +.hidden {display:none;} +.visible {display:true;} +.sprite {background:url(/luci-static/commotion/QS/images/certSpriteWindow.jpg);} +#firefoxButton {background: url(/luci-static/commotion/QS/images/ff_icon001.png) no-repeat; border:none; height:85px; width:85px; margin:20px;} +#internetexplorerButton {background: url(/luci-static/commotion/QS/images/ie_icon001.png) no-repeat; border:none; height:85px; width:85px; margin:20px;} +#chromeButton {background: url(/luci-static/commotion/QS/images/chrome_icon001.png) no-repeat; border:none; height:85px; width:85px; margin:20px;} + +/* Firefox */ +.ffcert0 {height:510px; width:900px; background-position:-64px -133px;} +.ffcert1 {height:460px; width:855px; background-position:-15px 0px;} +.ffcert2 {height:567px; width:853px; background-position:-15px -480px;} +.ffcert3 {height:520px; width:540px; background-position:-15px -1065px;} +.ffcert4 {height:550px; width:489px; background-position:-15px -1605px;} + + +/* Chrome */ +.chcert1 {height:320px; width:890px; background-position:-900px -14px;} +.chcert2 {height:600px; width:440px; background-position:-870px -340px;} +.chcert3 {height:600px; width:575px; background-position:-1320px -375px;} + + +/* IE */ +.iecert1 {height:350px; width:800px; background-position:-600px -1080px;} +.iecert2 {height:360px; width:380px; background-position:-1470px -1075px;} +.iecert3 {height:535px; width:440px; background-position:-640px -1525px;} +.iecert4 {height:550px; width:480px; background-position:-1150px -1530px;} + +noscript p { + margin: 1em; + padding: .5em; + background: #eee; + border: 1px #999 solid; +} diff --git a/www/luci-static/commotion/QS/images/alerts.png b/www/luci-static/commotion/QS/images/alerts.png new file mode 100644 index 0000000..641fd3f Binary files /dev/null and b/www/luci-static/commotion/QS/images/alerts.png differ diff --git a/www/luci-static/commotion/QS/images/certSpriteWindow.jpg b/www/luci-static/commotion/QS/images/certSpriteWindow.jpg new file mode 100644 index 0000000..2038c29 Binary files /dev/null and b/www/luci-static/commotion/QS/images/certSpriteWindow.jpg differ diff --git a/www/luci-static/commotion/QS/images/chrome_icon001.png b/www/luci-static/commotion/QS/images/chrome_icon001.png new file mode 100644 index 0000000..17eed8a Binary files /dev/null and b/www/luci-static/commotion/QS/images/chrome_icon001.png differ diff --git a/www/luci-static/commotion/QS/images/ff_icon001.png b/www/luci-static/commotion/QS/images/ff_icon001.png new file mode 100644 index 0000000..7c33800 Binary files /dev/null and b/www/luci-static/commotion/QS/images/ff_icon001.png differ diff --git a/www/luci-static/commotion/QS/images/ie_icon001.png b/www/luci-static/commotion/QS/images/ie_icon001.png new file mode 100644 index 0000000..3e631a0 Binary files /dev/null and b/www/luci-static/commotion/QS/images/ie_icon001.png differ