Skip to content

Commit

Permalink
Merge branch 'rkokkelk-http_to_https'
Browse files Browse the repository at this point in the history
  • Loading branch information
qistoph committed May 20, 2017
2 parents 3ec9e4a + 58044b3 commit c43cc59
Showing 1 changed file with 50 additions and 50 deletions.
100 changes: 50 additions & 50 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,27 @@
<title>WiFi QR-code - Javascript</title>

<!-- Facebook Meta Tags -->
<meta property="og:url" content="http://qistoph.github.io/WiFiQR/" />
<meta property="og:url" content="https://qistoph.github.io/WiFiQR/" />
<meta property="og:title" content="WiFi QR-code" />
<meta property="og:description" content="Share your WiFi easily with a QR-code" />
<meta property="og:image" content="http://qistoph.github.io/WiFiQR/example.png" />
<meta property="og:image" content="https://qistoph.github.io/WiFiQR/example.png" />

<!-- Reference scripts and theme stylesheet on the Google CDN -->
<!-- use //ajax... for online web to automatically switch between http and https -->
<link href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.2/themes/ui-lightness/jquery-ui.css"
<link href="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.2/themes/ui-lightness/jquery-ui.css"
type="text/css" rel="Stylesheet" />
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.2/jquery-ui.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.2/jquery-ui.min.js"></script>

<script src="jquery.qrcode.min.js"></script>

<style>
/********** BEGIN RESET **********/
/* http://meyerweb.com/eric/tools/css/reset/
/* https://meyerweb.com/eric/tools/css/reset/
v2.0 | 20110126
License: none (public domain)
*/

html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
Expand All @@ -34,8 +34,8 @@
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, embed,
figure, figcaption, footer, header, hgroup,
article, aside, canvas, details, embed,
figure, figcaption, footer, header, hgroup,
menu, nav, output, ruby, section, summary,
time, mark, audio, video {
margin: 0;
Expand All @@ -46,7 +46,7 @@
vertical-align: baseline;
}
/* HTML5 display-role reset for older browsers */
article, aside, details, figcaption, figure,
article, aside, details, figcaption, figure,
footer, header, hgroup, menu, nav, section {
display: block;
}
Expand Down Expand Up @@ -78,29 +78,29 @@
background: #f1f1f1;
color: rgba(0, 0, 0, 0.5);
}

b {
font-weight: bold;
}

ul {
list-style: disc inside none;
margin: -1.4em 0.4em 1.4em;
}

h1 {
font-size: 1.4em;
font-weight: bold;
}

p {
margin-bottom: 1.4em;
}

p:last-child {
margin-bottom: 0;
}

td {
border: 0px solid black;
padding: 2px;
Expand All @@ -113,7 +113,7 @@
margin: 10px;
display: inline-block;
}

#qrresult {
background: #ffffff;
display: table;
Expand All @@ -126,7 +126,7 @@
width: 256px;
height: 256px;
}

#qrsub {
margin: 0.2em auto 0;
font-family: Courier New;
Expand All @@ -138,7 +138,7 @@
font-family: Courier New;
display: table;
}

#about {
border: 1px solid black;
float: left;
Expand All @@ -147,11 +147,11 @@
min-width: 335px;
width: 50%;
}

#spread {
margin-top: 10px;
}

input[type=text],
input[type=password] {
width: 100%;
Expand All @@ -160,34 +160,34 @@
-moz-box-sizing: border-box; /* Firefox, other Gecko */
box-sizing: border-box; /* Opera/IE 8+ */
}

.radio {
display: inline;
}

a {
text-decoration: none;
color: #0000cc;
}

a:visited {
color: #0000cc;
}

a:hover {
text-decoration: underline;
background: #eeeeff;
}

tr:last-child td {
height: 4em;
vertical-align: bottom;
}
</style>

<style target="card">
/****** Print Card ******/

#card {
margin: 4mm;
width: 54mm;
Expand All @@ -198,7 +198,7 @@
font-size: 2.8mm;
line-height: 1;
}

#card #cardcontent {
margin: 2mm;
height: 80mm;
Expand All @@ -208,14 +208,14 @@
border: 1px solid black;
position: absolute;
}

#card #qrcode canvas {
width: 42mm;
height: 42mm;
margin: 3mm auto;
display: table;
}

#card #qrtitle {
margin: 0 3mm;
font-weight: bold;
Expand All @@ -224,7 +224,7 @@
#card #qrkey {
margin: 0 3mm;
}

#card #text {
margin: 3mm;
}
Expand All @@ -235,7 +235,7 @@
bottom: 3mm;
font-size: 80%;
}

#card #wifilogo {
position: absolute;
left: 3mm;
Expand All @@ -245,7 +245,7 @@
</style>

<script>
// http://jeromeetienne.github.io/jquery-qrcode/
// https://jeromeetienne.github.io/jquery-qrcode/
// https://code.google.com/p/zxing/wiki/BarcodeContents

// H:true vs B:true for hidden networks:
Expand All @@ -267,7 +267,7 @@
})
.focus(function() { $(this).select() })
.mouseup(function(e) { e.preventDefault(); });

$("#H").click(function() {
$(this).button('option', 'label', $(this).is(':checked') ? 'Hidden' : 'Visible');
});
Expand All @@ -285,12 +285,12 @@
str = str.replace(/,/g, "\\,");
return str;
}

function generateQR(divCanvas, divText, divKey) {
var type = $("input:radio[name=T]:checked").val();
var ssid = mecard_escape($("#S").val());
var key = mecard_escape($("#P").val());

var url = "WIFI:" +
"T:" + type + ";" +
"S:" + ssid + ";" +
Expand All @@ -300,14 +300,14 @@

divCanvas.empty().qrcode(url);
divText.html('' + $("#S").val() + ' (' + type + ')');

if($('#PS').is(':checked')) {
divKey.html('' + key);
} else {
divKey.html('&nbsp;');
}
}

window.printQR = function(targetWin) {
var printWin = window.open('', '_blank', '');

Expand All @@ -319,15 +319,15 @@
printWin.document.write('<div id="qrkey"></div>');
printWin.document.write('<div id="text">Connect to the network by scanning the QR code above with your (Android) device.</div>');
printWin.document.write('<img src="wifi.png" id="wifilogo">');
printWin.document.write('<div id="about">Generate your WiFi QR at<br/>http://qistoph.github.io/WiFiQR</div>');
printWin.document.write('<div id="about">Generate your WiFi QR at<br/>https://qistoph.github.io/WiFiQR</div>');
printWin.document.write('</div>');
printWin.document.write('</div>');
printWin.document.write('</bo'+'dy></ht'+'ml>');

$("style[target='card']").each(function() {
$(printWin.document.head).append($(this).clone())
});

generateQR($("#qrcode", printWin.document), $("#qrtitle", printWin.document), $("#qrkey", printWin.document));
$(printWin.document).ready(function() {
printWin.print();
Expand All @@ -336,7 +336,7 @@
</script>
</head>
<body>
<div id="fb-root"></div><script>(function(d, s, id) {var js, fjs = d.getElementsByTagName(s)[0];if (d.getElementById(id)) return;js = d.createElement(s); js.id = id; js.src = "http://connect.facebook.net/nl_NL/all.js#xfbml=1"; fjs.parentNode.insertBefore(js, fjs);}(document, 'script', 'facebook-jssdk'));</script>
<div id="fb-root"></div><script>(function(d, s, id) {var js, fjs = d.getElementsByTagName(s)[0];if (d.getElementById(id)) return;js = d.createElement(s); js.id = id; js.src = "//connect.facebook.net/nl_NL/all.js#xfbml=1"; fjs.parentNode.insertBefore(js, fjs);}(document, 'script', 'facebook-jssdk'));</script>

<div id="content">
<div id="qrresult">
Expand Down Expand Up @@ -376,7 +376,7 @@
</table>
<div id="spread">
<a href="https://twitter.com/share" class="twitter-share-button" data-via="qistoph" data-hashtags="wifiqr">Tweet</a><script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
<div class="fb-like" data-href="http://qistoph.github.io/WiFiQR/" data-send="false" data-layout="button_count" data-width="200" data-show-faces="false" data-font="tahoma"></div>
<div class="fb-like" data-href="https://qistoph.github.io/WiFiQR/" data-send="false" data-layout="button_count" data-width="200" data-show-faces="false" data-font="tahoma"></div>
</div>
</div>
<div id="about">
Expand All @@ -394,22 +394,22 @@ <h1>Usage</h1>
<h1>References</h1>
<p>Libraries and information used:</p>
<ul>
<li><a href="http://jquery.com/" target="_blank">jQuery</a></li>
<li><a href="http://jqueryui.com/" target="_blank">jQuery UI</a></li>
<li><a href="http://jeromeetienne.github.io/jquery-qrcode/" target="_blank">jquery.qrcode.js</a></li>
<li><a href="http://meyerweb.com/eric/tools/css/reset/" target="_blank">CSS Reset</a></li>
<li><a href="https://jquery.com/" target="_blank">jQuery</a></li>
<li><a href="https://jqueryui.com/" target="_blank">jQuery UI</a></li>
<li><a href="https://jeromeetienne.github.io/jquery-qrcode/" target="_blank">jquery.qrcode.js</a></li>
<li><a href="https://meyerweb.com/eric/tools/css/reset/" target="_blank">CSS Reset</a></li>
<li><a href="https://code.google.com/p/zxing/wiki/BarcodeContents" target="_blank">ZXing documentation</a></li>
</ul>
<p>
The source is available on <a href="https://github.com/qistoph/WiFiQR/" target="_blank">GitHub</a><br/>
For questions, you're welcome on <a href="http://qistoph.blogspot.nl/2013/04/wifi-qr-code-generator.html">my blog</a>
For questions, you're welcome on <a href="https://qistoph.blogspot.nl/2013/04/wifi-qr-code-generator.html">my blog</a>
</p>
<h1>License</h1>
<p>
<a href="LICENSE">MIT license</a>
</p>
</div>

<a href="https://github.com/qistoph/WiFiQR/" target="_blank"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub"></a>

<script type="text/javascript">
Expand Down

0 comments on commit c43cc59

Please sign in to comment.