From 6e8bdbcfe5849e686c00a8c0817f8118dbcebc6c Mon Sep 17 00:00:00 2001 From: bentlor Date: Fri, 2 Jun 2017 19:38:14 +0200 Subject: [PATCH] Language selection implemented. --- css/style.css | 4 ++ img/en.png | Bin 0 -> 1039 bytes img/en.svg | 10 ++++ img/hu.png | Bin 0 -> 213 bytes img/hu.svg | 5 ++ index.html | 28 +++++++---- index_hu.html | 58 +++++++++++++++++++++++ js/selector.js | 6 +-- os/android/howto_en.html | 11 +++++ os/android/{howto.html => howto_hu.html} | 0 os/linux/howto_en.html | 17 +++++++ os/linux/{howto.html => howto_hu.html} | 0 os/mac/howto_en.html | 20 ++++++++ os/mac/{howto.html => howto_hu.html} | 0 os/other/howto_en.html | 19 ++++++++ os/other/{howto.html => howto_hu.html} | 0 os/win10/{howto.html => howto_en.html} | 0 os/win10/howto_hu.html | 12 +++++ os/win7/howto_en.html | 49 +++++++++++++++++++ os/win7/{howto.html => howto_hu.html} | 0 20 files changed, 226 insertions(+), 13 deletions(-) create mode 100644 img/en.png create mode 100644 img/en.svg create mode 100644 img/hu.png create mode 100644 img/hu.svg create mode 100644 index_hu.html create mode 100644 os/android/howto_en.html rename os/android/{howto.html => howto_hu.html} (100%) create mode 100644 os/linux/howto_en.html rename os/linux/{howto.html => howto_hu.html} (100%) create mode 100644 os/mac/howto_en.html rename os/mac/{howto.html => howto_hu.html} (100%) create mode 100644 os/other/howto_en.html rename os/other/{howto.html => howto_hu.html} (100%) rename os/win10/{howto.html => howto_en.html} (100%) create mode 100644 os/win10/howto_hu.html create mode 100644 os/win7/howto_en.html rename os/win7/{howto.html => howto_hu.html} (100%) diff --git a/css/style.css b/css/style.css index 499a5b3..053f6ee 100644 --- a/css/style.css +++ b/css/style.css @@ -31,6 +31,10 @@ figcaption { img { max-width: 100%; } +#lang { + margin-right: .5em; + vertical-align: middle; +} #logo { width: 80px; height: 80px; diff --git a/img/en.png b/img/en.png new file mode 100644 index 0000000000000000000000000000000000000000..14105cf133ccfb800f237a6fbc0928a46fa2bd24 GIT binary patch literal 1039 zcmV+q1n~QbP)M<3&;6>E!z;N>>tOI>TRIT_9-V14JCi zMGS~oN!yMbtWQ11(B&VAUKPUex6^2<%|ox#BA1CiC-+BknTTGerKv2Hl98Vn%gDyw zaf>yT$5CB4g(4vy@y!*F5p?<_fzhjJ-#H7Yj9SjgL%Ib8bOTwArcpHfGozW$Gtt#U zY}G7KYv%x21tvs;$&C7?v%D_T5?Jw>B%t-%S9x*QLw*5@qQLeP4ZnPxIt8>l%i{}m z*apctcn)=PDF%}n5y0tmVXU^G$vr0t=uYvS0J?!JWof)WX~v%EnKCz!YV(JDa{Ahg zuLYC`UEU^?GUePNF_^AXxIfXW`SXiw*!xJB&+)#BOfXhAdVtM56a-dFZFWEqRs#v%_3or&`XHr8at-qzs}KQcN&b9*m0Zw=ydNiK~%vFBIc`RIo68?%>= zfkEu;o%2GRqoecA`#(4OjE|Z=d`Y;zLL-g+A8O&7)B@>$3nug#s_r_Kf4ubplYb8b zAX^$tWMTf@gZ-DJu%fbcL}(NVPYj@`a0 zx9_j?xasa=@4WT|aWT_nUf)31dq)|nyUNm}O}Mi6@WuCC6mC#^ojAX^hMZjw6BiRo zaQw!p@g-#p)m + + + + + + + + + diff --git a/img/hu.png b/img/hu.png new file mode 100644 index 0000000000000000000000000000000000000000..879dc667a03327f4da6acb2f08cf8b24392bf488 GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^YCtT^!3HG%bk%PFQY^(zo*^7SP{WbZ0pxQQctjQh z=?V~LeDx{o8;~Jc;u=vBoS#-wo>-L1P+nfHmzkGcoSayYs+V7sKKq@G6i`u+r;B5V zM`yCl>eTP^69t%-HI^~x8N4zGI=JGn2W!v!vN!Tmc24^E|NsByONq^9TJExLS`u6M zk}XR + + + + \ No newline at end of file diff --git a/index.html b/index.html index 7b6cec4..9c5b6a8 100644 --- a/index.html +++ b/index.html @@ -15,18 +15,26 @@ + +
- -

Karinthy Free WiFi - Útmutató

+ +

Karinthy Free WiFi - Instructions

+ Megtekintés magyarulMegtekintés magyarul
-

Kedves Látogatónk! -

Az új WiFi hálózatban nem kell minden bejelentkezéskor beírnod a jelszavad, csak az első alkalommal. Az alábbiakban találhatod az operációs rendszeredhez szükséges beállításokat, hogy használhasd az internetet iskolánkban. -

Szerintünk te +

Dear Visitor! +

In our new WiFi network, you don't need to enter your username and password anymore, only at first use. Below you will find the instructions specific to your operating system that will enable you to use the internet in our school. +

We think you are using Windows XP Windows Vista Windows 7 @@ -35,16 +43,16 @@ Android Linux Mac OS X - ismeretlen - operációs rendszert használsz. A bejelentkezéshez kövesd az alábbi utasításokat. -

Ha másik operációs rendszer útmutatóját szeretnéd megtekinteni, válaszd ki az operációs rendszert az alábbi listából.
+ Other + operating system. Please follow the instructions below. +

If you want to view instructions for another operating system, please choose one from the list:

@@ -52,6 +60,6 @@ - + diff --git a/index_hu.html b/index_hu.html new file mode 100644 index 0000000..eaf06e1 --- /dev/null +++ b/index_hu.html @@ -0,0 +1,58 @@ + + + + + + + Karinthy Free WiFi + + + + + + + + + + +
+
+ +

Karinthy Free WiFi - Útmutató

+ Read in EnglishView in English +
+
+

Kedves Látogatónk! +

Az új WiFi hálózatban nem kell minden bejelentkezéskor beírnod a jelszavad, csak az első alkalommal. Az alábbiakban találhatod az operációs rendszeredhez szükséges beállításokat, hogy használhasd az internetet iskolánkban. +

Szerintünk te + Windows XP + Windows Vista + Windows 7 + Windows 8 + Windows 10 + Android + Linux + Mac OS X + ismeretlen + operációs rendszert használsz. A bejelentkezéshez kövesd az alábbi utasításokat. +

Ha másik operációs rendszer útmutatóját szeretnéd megtekinteni, válaszd ki az operációs rendszert az alábbi listából.
+ +

+
+
+ + + + + + diff --git a/js/selector.js b/js/selector.js index 19e6b5d..a3afbc4 100644 --- a/js/selector.js +++ b/js/selector.js @@ -1,4 +1,4 @@ -function selectOs( osDiv ) { +function selectOs( osDiv, language ) { osString = navigator.oscpu + navigator.userAgent; osString = osString.toLowerCase(); @@ -27,10 +27,10 @@ function selectOs( osDiv ) { var osSelect = checkOsString(detectedOs); $('#' + detectedOs).addClass('detectedOs'); - $('' + osDiv).load('os/' + detectedOs + '/howto.html'); + $('' + osDiv).load('os/' + detectedOs + '/howto_' + language + '.html'); $('#osSelector').val(osSelect); $('#osSelector').change(function () { - $('' + osDiv).load('os/' + $(this).val() + '/howto.html'); + $('' + osDiv).load('os/' + $(this).val() + '/howto_' + language + '.html'); }) } diff --git a/os/android/howto_en.html b/os/android/howto_en.html new file mode 100644 index 0000000..ffdd703 --- /dev/null +++ b/os/android/howto_en.html @@ -0,0 +1,11 @@ +
+
1. Choose the "karinthy" WiFi network.
+ +
+
+
2. Choose not to validate the CA certificate and then enter your "karinthy" username and password in the relevant fields. You don't have to fill anonymous user identity.
+ +
+
+
3. Now you can start using the network.
+
diff --git a/os/android/howto.html b/os/android/howto_hu.html similarity index 100% rename from os/android/howto.html rename to os/android/howto_hu.html diff --git a/os/linux/howto_en.html b/os/linux/howto_en.html new file mode 100644 index 0000000..766b546 --- /dev/null +++ b/os/linux/howto_en.html @@ -0,0 +1,17 @@ +

The below instructions are for the application Network manager. Small deviances may appear when using other applications. +

+
1. Add a new WiFi network to the list of configurations.
+ +
+
+
2. Set the name of the network (SSID: karinthy) on the "Wi-Fi" tab.
+ +
+
+
3. On the Wi-Fi Security tab, you have to set the type of encryption. Choose "WPA & WPA2 Enterprise".
+ +
+
+
4. After that, choose "Tunneled TLS" authentication, and check "No CA certificate is required" so that the computer does not check the certificate of our server. Inner authentication should be set to "MSCHAPv2". Finally, type your "karinthy" username and password in the relevant fields. You can then connect to the network.
+ +
diff --git a/os/linux/howto.html b/os/linux/howto_hu.html similarity index 100% rename from os/linux/howto.html rename to os/linux/howto_hu.html diff --git a/os/mac/howto_en.html b/os/mac/howto_en.html new file mode 100644 index 0000000..8e3c21f --- /dev/null +++ b/os/mac/howto_en.html @@ -0,0 +1,20 @@ +
+
1. Choose "karinthy" in the list of available networks.
+ +
+
+
2. In the pop-up box, enter your "karinthy" username and password, then click "Join".
+ +
+
+
3. The computer may ask if you trust the "karinthy" network. You can safely click "Continue" here...
+ +
+
+
4. ...then if required, enter your local password and click "Update settings".
+ +
+
+
5. After that your computer will connect to the network.
+
+ diff --git a/os/mac/howto.html b/os/mac/howto_hu.html similarity index 100% rename from os/mac/howto.html rename to os/mac/howto_hu.html diff --git a/os/other/howto_en.html b/os/other/howto_en.html new file mode 100644 index 0000000..7e67ac3 --- /dev/null +++ b/os/other/howto_en.html @@ -0,0 +1,19 @@ +

Use the following settings for other operating systems:

+
+
Network name (SSID)
+
karinthy
+
Encryption:
+
WPA2-Enterprise
+
Authentication:
+
MSCHAPv2
+
Username:
+
<karinthy username>
+
Jelszó:
+
<karinthy password>
+
Anonymous identity:
+
Leave empty.
+
CA certificate:
+
You can choose not to validate it, as we do not currently have one.
+
+ +

If the above settings don't work, your computer may not be able to connect to our WiFi netowork. If you want to be absolutely sure, contact the system administrators.

diff --git a/os/other/howto.html b/os/other/howto_hu.html similarity index 100% rename from os/other/howto.html rename to os/other/howto_hu.html diff --git a/os/win10/howto.html b/os/win10/howto_en.html similarity index 100% rename from os/win10/howto.html rename to os/win10/howto_en.html diff --git a/os/win10/howto_hu.html b/os/win10/howto_hu.html new file mode 100644 index 0000000..3e00cff --- /dev/null +++ b/os/win10/howto_hu.html @@ -0,0 +1,12 @@ +
+
1. Válaszd ki a "karinthy" hálózatot, és kattints a "csatlakozás" gombra.
+ +
+
+
2. Írd be a karinthys felhasználóneved és jelszavad. Figyelj a kis- és nagybetűkre.
+ +
+
+
3. Erősítsd meg, hogy valóban csatlakozni akarsz.
+ +
diff --git a/os/win7/howto_en.html b/os/win7/howto_en.html new file mode 100644 index 0000000..b56fa3a --- /dev/null +++ b/os/win7/howto_en.html @@ -0,0 +1,49 @@ +
+
1. In the list of available networks click "Open Network and Sharing Center".
+ +
+
+
2. Open the list of available networks (Manage wireless networks).
+ +
+
+
3. Click "Add".
+ +
+
+
4. Choose to "Manually create a network profile".
+ +
+
+
5. Fill the "Network name" (karinthy), the "Security type" (WPA2-Enterprise) and the "Encryption type" (AES) fields. If you like, you can choose to start this connection automatically.
+ +
+
+
6. Click on "Next", then choose to "Change connection settings".
+ +
+
+
7. On the security tab, click on "Settings" next to the network authentication method.
+ +
+
+
8. Set your computer not to validate the server certificate. Then click "Configure".
+ +
+
+
9. In the pop-up window disable using your windows username and password.
+ +
+
+
10. On the previous screen, choose "Advanced settings".
+ +
+
+
11. On the next screen, specify the authentication mode (User authentication) and then set your "karinthy" username and password under "Save credentials".
+ + +
+
+
12. Finally click on "Ok" and then "Close". The connection is now ready to be used.
+ +
diff --git a/os/win7/howto.html b/os/win7/howto_hu.html similarity index 100% rename from os/win7/howto.html rename to os/win7/howto_hu.html