nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge cc312e67d1 into 9223639ffe

Browse Source
This commit is contained in:
Flip 2016-11-29 22:11:59 +00:00 committed by GitHub
commit 0f114dc27e
6 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/releases/v2016.1.rst
View File

@ -240,6 +240,12 @@ Site changes
"<%= pubkey %>" "<%= pubkey %>"
"</div>" "</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 Internals
~~~~~~~~~ ~~~~~~~~~

3
docs/site-example/i18n/de.po
View File

@ -30,6 +30,9 @@ msgstr ""
" <br/>" " <br/>"
"<%= pubkey %>" "<%= pubkey %>"
"</div>" "</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" msgid "gluon-config-mode:reboot"
msgstr "" msgstr ""

4
docs/site-example/i18n/en.po
View File

@ -28,7 +28,9 @@ msgstr ""
" <br/>" " <br/>"
"<%= pubkey %>" "<%= pubkey %>"
"</div>" "</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" msgid "gluon-config-mode:reboot"
msgstr "" msgstr ""

3
docs/site-example/i18n/fr.po
View File

@ -30,6 +30,9 @@ msgstr ""
" <br/>" " <br/>"
"<%= pubkey %>" "<%= pubkey %>"
"</div>" "</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" msgid "gluon-config-mode:reboot"
msgstr "" msgstr ""

2
package/gluon-config-mode-core/files/usr/lib/lua/luci/view/gluon/config-mode/reboot.htm
View File

@ -5,6 +5,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title><%=escape(hostname)%> is rebooting</title> <title><%=escape(hostname)%> is rebooting</title>
<link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/cascade.css" /> <link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/cascade.css" />
<script src="<%=media%>/qrcode.js"></script>
</head> </head>
<body> <body>
<div id="maincontainer"> <div id="maincontainer">
@ -14,4 +15,5 @@
</div> </div>
</div> </div>
</body> </body>
<script> if(document.getElementById("qrdiv")) {doqr();}</script>
</html> </html>

2
package/gluon-luci-theme/files/www/luci-static/gluon/qrcode.js Normal file
View File

File diff suppressed because one or more lines are too long