Merge cc312e67d1 into 9223639ffe

2016-11-29 22:11:59 +00:00 · 2016-11-29 22:11:59 +00:00 · 0f114dc27e
commit 0f114dc27e
parent 9223639ffe cc312e67d1
6 changed files with 19 additions and 1 deletions
--- a/docs/releases/v2016.1.rst
+++ b/docs/releases/v2016.1.rst
@ -240,6 +240,12 @@ Site changes
    "<%= pubkey %>"
    "</div>"

+  - There are often problems when you have to send the pubkey via Email to the community and have no internet connection. Now you can display a QR-Code to register the Node via you phone::
+
+    "<div id=\"qrdiv\" value=\"mailto:keys@entenhausen.freifunk.net?&amp;subject=<%=hostname%>&amp;body=Hostname%3A%20<%=hostname%>%0D%0AKey%3A%20<%=pubkey%>\">"
+    "<canvas id=\"qrcanv\" }=\"\"></canvas>"
+    "</div>"
+
 Internals
 ~~~~~~~~~

--- a/docs/site-example/i18n/de.po
+++ b/docs/site-example/i18n/de.po
@ -30,6 +30,9 @@ msgstr ""
 " <br/>"
 "<%= pubkey %>"
 "</div>"
+"<div id=\"qrdiv\" value=\"mailto:keys@entenhausen.freifunk.net?&amp;subject=<%=hostname%>&amp;body=Hostname%3A%20<%=hostname%>%0D%0AKey%3A%20<%=pubkey%>\">"
+"<canvas id=\"qrcanv\" }=\"\"></canvas>"
+"</div>"

 msgid "gluon-config-mode:reboot"
 msgstr ""
--- a/docs/site-example/i18n/en.po
+++ b/docs/site-example/i18n/en.po
@ -28,7 +28,9 @@ msgstr ""
 " <br/>"
 "<%= pubkey %>"
 "</div>"
-
+"<div id=\"qrdiv\" value=\"mailto:keys@entenhausen.freifunk.net?&amp;subject=<%=hostname%>&amp;body=Hostname%3A%20<%=hostname%>%0D%0AKey%3A%20<%=pubkey%>\">"
+"<canvas id=\"qrcanv\" }=\"\"></canvas>"
+"</div>"

 msgid "gluon-config-mode:reboot"
 msgstr ""
--- a/docs/site-example/i18n/fr.po
+++ b/docs/site-example/i18n/fr.po
@ -30,6 +30,9 @@ msgstr ""
 " <br/>"
 "<%= pubkey %>"
 "</div>"
+"<div id=\"qrdiv\" value=\"mailto:keys@entenhausen.freifunk.net?&amp;subject=<%=hostname%>&amp;body=Hostname%3A%20<%=hostname%>%0D%0AKey%3A%20<%=pubkey%>\">"
+"<canvas id=\"qrcanv\" }=\"\"></canvas>"
+"</div>"

 msgid "gluon-config-mode:reboot"
 msgstr ""
--- a/package/gluon-config-mode-core/files/usr/lib/lua/luci/view/gluon/config-mode/reboot.htm
+++ b/package/gluon-config-mode-core/files/usr/lib/lua/luci/view/gluon/config-mode/reboot.htm
@ -5,6 +5,7 @@
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title><%=escape(hostname)%> is rebooting</title>
    <link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/cascade.css" />
+    <script src="<%=media%>/qrcode.js"></script>
  </head>
  <body>
    <div id="maincontainer">
@ -14,4 +15,5 @@
      </div>
    </div>
  </body>
+  <script> if(document.getElementById("qrdiv")) {doqr();}</script>
 </html>
--- a/package/gluon-luci-theme/files/www/luci-static/gluon/qrcode.js
+++ b/package/gluon-luci-theme/files/www/luci-static/gluon/qrcode.js