From f171b9c8aac3a5999122f6dc90e0f514f345936f Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Tue, 26 Aug 2014 17:49:23 +0200 Subject: [PATCH 1/3] reformatted the whole code base --- .jshintrc | 18 +- css/uhr-black.css | 15 +- css/uhr-blue.css | 15 +- css/uhr-green.css | 15 +- css/uhr-pink.css | 29 +- css/uhr-red.css | 17 +- css/uhr-white.css | 29 +- css/uhr-yellow.css | 29 +- css/uhr.css | 240 ++++---- index.html | 85 +-- info/index.html | 1221 ++++++++++++++++++++------------------- info/info.css | 38 +- js/uhr-de.js | 2 +- js/uhr-de_CH-seconds.js | 148 ++--- js/uhr-de_CH.js | 2 +- js/uhr-de_CH_genau.js | 2 +- js/uhr-en.js | 4 +- js/uhr-fr.js | 59 +- js/uhr-it.js | 4 +- js/uhr.js | 82 +-- showcase/index.html | 86 +-- test/test.html | 2 +- test/test.js | 7 +- 23 files changed, 1148 insertions(+), 1001 deletions(-) diff --git a/.jshintrc b/.jshintrc index 21f287e..9a3a0c1 100644 --- a/.jshintrc +++ b/.jshintrc @@ -7,16 +7,7 @@ // Predefined globals whom JSHint will ignore. "browser" : true, // Standard browser globals e.g. `window`, `document`. - "node" : false, - "rhino" : false, - "couch" : false, - "wsh" : true, // Windows Scripting Host. - "jquery" : true, - "ender" : true, - "prototypejs" : false, - "mootools" : false, - "dojo" : false, "predef" : [ "suite", @@ -28,16 +19,13 @@ "debug" : false, // Allow debugger statements e.g. browser breakpoints. "devel" : true, // Allow developments statements e.g. `console.log();`. - - // ECMAScript 5. - "es5" : true, // Allow ECMAScript 5 syntax. "strict" : true, // Require `use strict` pragma in every file. "globalstrict" : false, // Allow global "use strict" (also enables 'strict'). // The Good Parts. "asi" : false, // Tolerate Automatic Semicolon Insertion (no semicolons). - "laxbreak" : true, // Tolerate unsafe line breaks e.g. `return [\n] x` without semicolons. + "laxbreak" : false, // Tolerate unsafe line breaks e.g. `return [\n] x` without semicolons. "bitwise" : true, // Prohibit bitwise operators (&, |, ^, etc.). "boss" : false, // Tolerate assignments inside if, for & while. Usually conditions & loops are for comparison, not assignments. "curly" : true, // Require {} for every new block or scope. @@ -50,8 +38,6 @@ "latedef" : true, // Prohipit variable use before definition. "loopfunc" : false, // Allow functions to be defined within loops. "noarg" : true, // Prohibit use of `arguments.caller` and `arguments.callee`. - "regexp" : true, // Prohibit `.` and `[^...]` in regular expressions. - "regexdash" : false, // Tolerate unescaped last dash i.e. `[-...]`. "scripturl" : true, // Tolerate script-targeted URLs. "shadow" : false, // Allows re-define variables later in code e.g. `var x=1; x=2;`. "supernew" : false, // Tolerate `new function () { ... };` and `new Object;`. @@ -67,6 +53,6 @@ "plusplus" : false, // Prohibit use of `++` & `--`. "sub" : false, // Tolerate all forms of subscript notation besides dot notation e.g. `dict['key']` instead of `dict.key`. "trailing" : true, // Prohibit trailing whitespaces. - "white" : true, // Check against strict whitespace and indentation rules. + "white" : false, // Check against strict whitespace and indentation rules. "indent" : 0 // Specify indentation spacing } \ No newline at end of file diff --git a/css/uhr-black.css b/css/uhr-black.css index 664da50..fc2a48c 100644 --- a/css/uhr-black.css +++ b/css/uhr-black.css @@ -13,16 +13,19 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ .uhr.black { - background-color: #111; + background-color: #111; } + .black .onoffswitch-inner:before { - background-color: #111; + background-color: #111; } + .uhr.black .dot:not(.active) { - border-color: rgba(255,255,255,0.1); - box-shadow: 0 0 0.1em rgba(255,255,255,0.1); + border-color: rgba(255, 255, 255, 0.1); + box-shadow: 0 0 0.1em rgba(255, 255, 255, 0.1); } + .uhr.black .letter:not(.active) { - color: rgba(255,255,255,0.1); - text-shadow: 0 0 0.1em rgba(255,255,255,0.1); + color: rgba(255, 255, 255, 0.1); + text-shadow: 0 0 0.1em rgba(255, 255, 255, 0.1); } diff --git a/css/uhr-blue.css b/css/uhr-blue.css index 602f909..743fc10 100644 --- a/css/uhr-blue.css +++ b/css/uhr-blue.css @@ -13,16 +13,19 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ .uhr.blue { - background-color: #00a; + background-color: #00a; } + .blue .onoffswitch-inner:before { - background-color: #00a; + background-color: #00a; } + .uhr.blue .dot:not(.active) { - border-color: rgba(255,255,255,0.1); - box-shadow: 0 0 0.1em rgba(255,255,255,0.1); + border-color: rgba(255, 255, 255, 0.1); + box-shadow: 0 0 0.1em rgba(255, 255, 255, 0.1); } + .uhr.blue .letter:not(.active) { - color: rgba(255,255,255,0.1); - text-shadow: 0 0 0.1em rgba(255,255,255,0.1); + color: rgba(255, 255, 255, 0.1); + text-shadow: 0 0 0.1em rgba(255, 255, 255, 0.1); } diff --git a/css/uhr-green.css b/css/uhr-green.css index fdb40b1..bd821a5 100644 --- a/css/uhr-green.css +++ b/css/uhr-green.css @@ -13,16 +13,19 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ .uhr.green { - background-color: #0c0; + background-color: #0c0; } + .green .onoffswitch-inner:before { - background-color: #0c0; + background-color: #0c0; } + .uhr.green .dot:not(.active) { - border-color: rgba(0,0,0,0.1); - box-shadow: 0 0 0.1em rgba(0,0,0,0.1); + border-color: rgba(0, 0, 0, 0.1); + box-shadow: 0 0 0.1em rgba(0, 0, 0, 0.1); } + .uhr.green .letter:not(.active) { - color: rgba(0,0,0,0.1); - text-shadow: 0 0 0.1em rgba(0,0,0,0.1); + color: rgba(0, 0, 0, 0.1); + text-shadow: 0 0 0.1em rgba(0, 0, 0, 0.1); } diff --git a/css/uhr-pink.css b/css/uhr-pink.css index bc38351..27525f4 100644 --- a/css/uhr-pink.css +++ b/css/uhr-pink.css @@ -13,24 +13,29 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ .uhr.pink { - background-color: #f0a; + background-color: #f0a; } -.uhr.pink .dot.active{ - border-color: #fff; - box-shadow: 0 0 0.1em #fff; + +.uhr.pink .dot.active { + border-color: #fff; + box-shadow: 0 0 0.1em #fff; } -.uhr.pink .letter.active{ - color: #fff; - text-shadow: 0 0 0.1em #fff; + +.uhr.pink .letter.active { + color: #fff; + text-shadow: 0 0 0.1em #fff; } + .pink .onoffswitch-inner:before { - background-color: #f0a; + background-color: #f0a; } + .uhr.pink .dot:not(.active) { - border-color: rgba(255,255,255,0.1); - box-shadow: 0 0 0.1em rgba(255,255,255,0.1); + border-color: rgba(255, 255, 255, 0.1); + box-shadow: 0 0 0.1em rgba(255, 255, 255, 0.1); } + .uhr.pink .letter:not(.active) { - color: rgba(255,255,255,0.1); - text-shadow: 0 0 0.1em rgba(255,255,255,0.1); + color: rgba(255, 255, 255, 0.1); + text-shadow: 0 0 0.1em rgba(255, 255, 255, 0.1); } diff --git a/css/uhr-red.css b/css/uhr-red.css index 71ce1ec..621517c 100644 --- a/css/uhr-red.css +++ b/css/uhr-red.css @@ -13,16 +13,19 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ .uhr.red { - background-color: #700; + background-color: #700; } + .red .onoffswitch-inner:before { - background-color: #700; + background-color: #700; } -.uhr.red .dot:not(.active){ - border-color: rgba(255,255,255,0.1); - box-shadow: 0 0 0.1em rgba(255,255,255,0.1); + +.uhr.red .dot:not(.active) { + border-color: rgba(255, 255, 255, 0.1); + box-shadow: 0 0 0.1em rgba(255, 255, 255, 0.1); } + .uhr.red .letter:not(.active) { - color: rgba(255,255,255,0.1); - text-shadow: 0 0 0.1em rgba(255,255,255,0.1); + color: rgba(255, 255, 255, 0.1); + text-shadow: 0 0 0.1em rgba(255, 255, 255, 0.1); } diff --git a/css/uhr-white.css b/css/uhr-white.css index bbb014d..7989be0 100644 --- a/css/uhr-white.css +++ b/css/uhr-white.css @@ -13,24 +13,29 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ .uhr.white { - background-color: #ccc; + background-color: #ccc; } -.uhr.white .dot.active{ - border-color: #fff; - box-shadow: 0 0 0.1em #fff; + +.uhr.white .dot.active { + border-color: #fff; + box-shadow: 0 0 0.1em #fff; } -.uhr.white .letter.active{ - color: #fff; - text-shadow: 0 0 0.1em #fff; + +.uhr.white .letter.active { + color: #fff; + text-shadow: 0 0 0.1em #fff; } + .white .onoffswitch-inner:before { - background-color: #ccc; + background-color: #ccc; } + .uhr.white .dot:not(.active) { - border-color: rgba(0,0,0,0.1); - box-shadow: 0 0 0.1em rgba(0,0,0,0.1); + border-color: rgba(0, 0, 0, 0.1); + box-shadow: 0 0 0.1em rgba(0, 0, 0, 0.1); } + .uhr.white .letter:not(.active) { - color: rgba(0,0,0,0.1); - text-shadow: 0 0 0.1em rgba(0,0,0,0.1); + color: rgba(0, 0, 0, 0.1); + text-shadow: 0 0 0.1em rgba(0, 0, 0, 0.1); } diff --git a/css/uhr-yellow.css b/css/uhr-yellow.css index 1e0faef..d109178 100644 --- a/css/uhr-yellow.css +++ b/css/uhr-yellow.css @@ -13,24 +13,29 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ .uhr.yellow { - background-color: #fd0; + background-color: #fd0; } -.uhr.yellow .dot.active{ - border-color: #fff; - box-shadow: 0 0 0.1em #fff; + +.uhr.yellow .dot.active { + border-color: #fff; + box-shadow: 0 0 0.1em #fff; } -.uhr.yellow .letter.active{ - color: #fff; - text-shadow: 0 0 0.1em #fff; + +.uhr.yellow .letter.active { + color: #fff; + text-shadow: 0 0 0.1em #fff; } + .yellow .onoffswitch-inner:before { - background-color: #fd0; + background-color: #fd0; } + .uhr.yellow .dot:not(.active) { - border-color: rgba(0,0,0,0.05); - box-shadow: 0 0 0.1em rgba(0,0,0,0.05); + border-color: rgba(0, 0, 0, 0.05); + box-shadow: 0 0 0.1em rgba(0, 0, 0, 0.05); } + .uhr.yellow .letter:not(.active) { - color: rgba(0,0,0,0.05); - text-shadow: 0 0 0.1em rgba(0,0,0,0.05); + color: rgba(0, 0, 0, 0.05); + text-shadow: 0 0 0.1em rgba(0, 0, 0, 0.05); } diff --git a/css/uhr.css b/css/uhr.css index f2e60ed..1bcb0c5 100644 --- a/css/uhr.css +++ b/css/uhr.css @@ -13,158 +13,179 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ @font-face { - font-family: 'Uhrenfont'; - src: url('../resources/uhr.woff') format('woff'); + font-family: 'Uhrenfont'; + src: url('../resources/uhr.woff') format('woff'); } + body { - font-family: 'Uhrenfont', sans-serif; + font-family: 'Uhrenfont', sans-serif; } + .uhr { - position: relative; - margin: 0; - transition: background-color 0.5s; + position: relative; + margin: 0; + transition: background-color 0.5s; } + .uhr .reflection { - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; - background: radial-gradient(225em 45em at 160% 0, rgba(255, 255, 255, 0.4) 0, rgba(255, 255, 255, 0.05) 40%, rgba(255, 255, 255, 0) 40%) no-repeat scroll; - display: block; - margin: 0.15em; + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; + background: radial-gradient(225em 45em at 160% 0, rgba(255, 255, 255, 0.4) 0, rgba(255, 255, 255, 0.05) 40%, rgba(255, 255, 255, 0) 40%) no-repeat scroll; + display: block; + margin: 0.15em; } + #themeswitcher { } + .uhr .letterarea { - display: block; - position: absolute; - top: 12%; - bottom: 12%; - left: 12%; - right: 12%; - overflow: hidden; - font-size: 200%; + display: block; + position: absolute; + top: 12%; + bottom: 12%; + left: 12%; + right: 12%; + overflow: hidden; + font-size: 200%; } + .item { - transition: box-shadow 0.5s, text-shadow 0.5s, border-color 0.5s, color 0.5s; + transition: box-shadow 0.5s, text-shadow 0.5s, border-color 0.5s, color 0.5s; } + .dot { - position: absolute; - display: block; - height: 0; - width: 0; - border: 0.2em solid; - border-radius: 1em; + position: absolute; + display: block; + height: 0; + width: 0; + border: 0.2em solid; + border-radius: 1em; } + .dot.active { - border-color: #eee; - box-shadow: 0 0 0.2em #eee; + border-color: #eee; + box-shadow: 0 0 0.2em #eee; } + .dot1 { - top: 3.75%; - left: 3.75%; + top: 3.75%; + left: 3.75%; } + .dot2 { - top: 3.75%; - right: 3.75%; + top: 3.75%; + right: 3.75%; } + .dot3 { - bottom: 3.75%; - right: 3.75%; + bottom: 3.75%; + right: 3.75%; } + .dot4 { - bottom: 3.75%; - left: 3.75%; + bottom: 3.75%; + left: 3.75%; } + .letter { - height: 10%; - width: 9.0909%; - padding: 0; - margin: 0; - display: inline-block; - text-align: center; - line-height: 160%; + height: 10%; + width: 9.0909%; + padding: 0; + margin: 0; + display: inline-block; + text-align: center; + line-height: 160%; } + .letter.active { - color: #eee; - text-shadow: 0 0 0.2em #eee; + color: #eee; + text-shadow: 0 0 0.2em #eee; } + .onoffswitch { - position: relative; - width: 86px; - margin: 1em; - -webkit-user-select:none; - -moz-user-select:none; - -ms-user-select: none; + position: relative; + width: 86px; + margin: 1em; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; } + .onoffswitch-checkbox { - display: none; + display: none; } + .onoffswitch-label { - display: block; - overflow: hidden; - cursor: pointer; - border: 2px solid #999; - border-radius: 50px; + display: block; + overflow: hidden; + cursor: pointer; + border: 2px solid #999; + border-radius: 50px; } + .onoffswitch-inner { - width: 200%; - margin-left: -100%; - -moz-transition: margin 0.3s ease-in 0s; - -webkit-transition: margin 0.3s ease-in 0s; - -o-transition: margin 0.3s ease-in 0s; - transition: margin 0.3s ease-in 0s; + width: 200%; + margin-left: -100%; + -moz-transition: margin 0.3s ease-in 0s; + -webkit-transition: margin 0.3s ease-in 0s; + -o-transition: margin 0.3s ease-in 0s; + transition: margin 0.3s ease-in 0s; } + .onoffswitch-inner:before, .onoffswitch-inner:after { - float: left; - width: 50%; - height: 24px; - padding: 0; - line-height: 24px; - font-size: 18px; - color: white; - font-weight: bold; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; + float: left; + width: 50%; + height: 24px; + padding: 0; + line-height: 24px; + font-size: 18px; + color: white; + font-weight: bold; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; } + .onoffswitch-inner:before { - content: "EIN"; - padding-left: 12px; - color: #eee; - transition: background-color 0.5s; + content: "EIN"; + padding-left: 12px; + color: #eee; + transition: background-color 0.5s; } + .onoffswitch-inner:after { - content: "AUS"; - padding-right: 12px; - background-color: #eee; - color: #999; - text-align: right; + content: "AUS"; + padding-right: 12px; + background-color: #eee; + color: #999; + text-align: right; } .onoffswitch-switch { - width: 30px; - margin: -3px; - background: #fff; - border: 2px solid #999; - border-radius: 50px; - position: absolute; - top: 0; - bottom: 0; - right: 58px; - -moz-transition: all 0.3s ease-in 0s; - -webkit-transition: all 0.3s ease-in 0s; - -o-transition: all 0.3s ease-in 0s; - transition: all 0.3s ease-in 0s; + width: 30px; + margin: -3px; + background: #fff; + border: 2px solid #999; + border-radius: 50px; + position: absolute; + top: 0; + bottom: 0; + right: 58px; + -moz-transition: all 0.3s ease-in 0s; + -webkit-transition: all 0.3s ease-in 0s; + -o-transition: all 0.3s ease-in 0s; + transition: all 0.3s ease-in 0s; } .onoffswitch-checkbox:checked + .onoffswitch-label .onoffswitch-inner { - margin-left: 0; + margin-left: 0; } .onoffswitch-checkbox:checked + .onoffswitch-label .onoffswitch-switch { - right: 0; + right: 0; } a.uhr-configlink { @@ -175,34 +196,39 @@ a.uhr-configlink { display: inline-block; margin: 2px; } + .uhr-controlpanel { - background-color: rgba(0,0,0,0.5); + background-color: rgba(0, 0, 0, 0.5); position: fixed; width: 100%; height: 100%; top: 0; left: 0; } + @media (max-width: 400px) { .uhr-controlpanel .content { height: 100%; } } + @media (min-width: 401px) { .uhr-controlpanel .content { margin-left: auto; margin-right: auto; width: 10em; - top : 1em; + top: 1em; border-radius: 0.5em; box-shadow: 0 0 1em black; } } + .uhr-controlpanel .content { background-color: #fff; padding: 2em; position: relative; } + a.uhr-closecontrolpanel { cursor: pointer; display: inline-block; @@ -213,10 +239,12 @@ a.uhr-closecontrolpanel { height: 24px; background: url("../resources/close.png") no-repeat; } + #disclaimer { - font-size: 0.5em; + font-size: 0.5em; } + #disclaimer a { - color: #444; - text-decoration: underline; + color: #444; + text-decoration: underline; } diff --git a/index.html b/index.html index 6ca09a2..cd2a9e3 100644 --- a/index.html +++ b/index.html @@ -15,49 +15,50 @@ along with this program. If not, see . --> - Bärneruhr - Die Zeit im Wort - - - - - - - - - - - - - - - - - - - - - - - - - - + Bärneruhr - Die Zeit im Wort + + + + + + + + + + + + + + + + + + + + + + + + + + -
-

Created by fritteli, inspired by QLOCKTWO. Read more! - View full showcase!

- +
+

Created by fritteli, inspired by QLOCKTWO. Read more! - View full showcase!

+ diff --git a/info/index.html b/info/index.html index 07b9622..5140ffa 100644 --- a/info/index.html +++ b/info/index.html @@ -15,226 +15,262 @@ along with this program. If not, see . --> - Die Zeit im Wort - Informationen - - - - - - - - - - - + Die Zeit im Wort - Informationen + + + + + + + + + + + -

Die Zeit im Wort

- -

Was soll das?Zum Inhalt

-

Hallo, Besucher!

-

Hier gibt's vertiefte Informationen über diese Uhr, die dir sagt, - wie spät es ist. Hier erfährt du, wie du sie selber auf deiner - Website einbauen kannst. Denn das darfst du gerne tun, solange du - dich dabei an die Regeln der Lizenz hältst.

-

Das interessiert mich nicht, ich will zurück zur grossen Uhr!

+

Die Zeit im Wort

+ +

Was soll das?Zum Inhalt

+ +

Hallo, Besucher!

+ +

Hier gibt's vertiefte Informationen über diese Uhr, die dir sagt, + wie spät es ist. Hier erfährt du, wie du sie selber auf deiner + Website einbauen kannst. Denn das darfst du gerne tun, solange du + dich dabei an die Regeln der Lizenz hältst.

+ +

Das interessiert mich nicht, ich will zurück zur grossen Uhr!

+ +

Die UhrZum Inhalt

+ +
+ + +

Benötigte BibliothekenZum Inhalt

+
    +
  • jQuery (getestet mit Version 2.1.0)
    • +
  • jQuery-UI (getestet mit Version 1.10.4) mit folgenden Komponenten: +
      +
    • core
      • +
    • widget
      • +
    +
    • +
  • jQuery-cookie (getestet mit Version 1.4.0)
    • +
+

Einbinden in HTMLZum Inhalt

+

Javascript- und CSS-Dateien im <head>Zum Inhalt

+ +

Füge folgende Zeilen im <head>-Tag deines HTML-Dokumentes ein. Beachte dabei, dass die CSS-Dateien vor den + Javascript eingebunden werden.
+ <link rel="stylesheet" type="text/css" href="uhr.css" /> + <link rel="stylesheet" type="text/css" href="uhr-black.css" data-class="black" data-name="Schwarz" /> + <link rel="stylesheet" type="text/css" href="uhr-white.css" data-class="white" data-name="Weiss" /> + <link rel="stylesheet" type="text/css" href="uhr-red.css" data-class="red" data-name="Rot" /> + <link rel="stylesheet" type="text/css" href="uhr-yellow.css" data-class="yellow" data-name="Gelb" /> + <link rel="stylesheet" type="text/css" href="uhr-green.css" data-class="green" data-name="Grün" /> + <link rel="stylesheet" type="text/css" href="uhr-blue.css" data-class="blue" data-name="Blau" /> + <link rel="stylesheet" type="text/css" href="uhr-pink.css" data-class="pink" data-name="Pink" /> + <script type="text/javascript" src="jquery-2.1.0.min.js"></script> + <script type="text/javascript" src="jquery-ui-1.10.4.custom.min.js"></script> + <script type="text/javascript" src="jquery-cookie-1.4.0.js"></script> + <script type="text/javascript" src="uhr.js"></script> + <script type="text/javascript" src="uhr-de_CH.js"></script> + <script type="text/javascript" src="uhr-de_CH_genau.js"></script> + <script type="text/javascript" src="uhr-de.js"></script> + <script type="text/javascript" src="uhr-en.js"></script> + <script type="text/javascript" src="uhr-fr.js"></script> + <script type="text/javascript" src="uhr-it.js"></script> +

+ +

Von den Stylesheets zwingend ist uhr.css und mindestens eines der Farbschema-Stylesheets. Die Attribute data-class bzw. + data-name definieren dabei die im Stylesheet deklarierte Klasse bzw. den im Auswahlmenu anzuzeigenden Namen. Der Name kann frei + gewählt werden, die Style-Klasse muss mit der im Stylesheet definierten übereinstimmen.

+ +

uhr-de_CH_genau.js ist eine Variante von Berndeutsch, bei der zur vollen Stunde zusätlich das Wort genau + angezeigt wird (also z.B. um 15:00 Uhr ES ISCH GENAU DRÜ).

+

Uhr-Element auf der SeiteZum Inhalt

+ +

Definiere an der Stelle, wo die Uhr angezeigt werden soll, ein leeres <div>-Element:
+ <div id="meine-uhr"></div> +

+

Uhr initialisierenZum Inhalt

+ +

Definiere im HTML-Dokument (<head> oder <body>) ein Javascript-Snippet, um die Uhr zu initialisieren:
+ <script type="text/javascript"> + jQuery(document).ready(function() { + jQuery('#meine-uhr').uhr(); + }); + </script> +

+ +

Die Uhr wird so in der Standardkonfiguration angezeigt, das heisst: Berndeutsche Sprache, in der Farbe der ersten eingebundenen CSS-Datei (im + Beispiel also Schwarz), eingeschaltet, Breite 100% des Elternelementes. Wenn dies nicht deinen Bedürfnissen entspricht, lässt sich die Uhr wie im + folgenden Abschnitt beschrieben konfigurieren. Die Konfiguration wird der .uhr()-Methode als JSON-Objekt übergeben, beispielsweise + so:
+ jQuery('#uhr').uhr({ + width: '200px', + theme: 'red' + }); +

+ +

KonfigurationZum Inhalt

+ +

Es existieren die folgenden Konfigurationsoptionen:

+
+
width
+
Die Breite der Uhr als CSS-String, z.B. '50%', '120px' oder '2.8em'. Die Höhe passt sich automatisch + der Breite an, so dass die Uhr immer quadratisch ist. +
Typ: String +
Default: '100%'
+
status
+
Der Anfangszustand der Uhr, entweder 'on' oder 'off' +
Typ: String +
Default: 'on'
+
language
+
Die anfänglich ausgewählte Sprache als String. Welche Sprachen unterstützt werden, hängt davon ab, welche Sprachdateien eingebunden werden. +
Typ: String +
Default: 'de_CH'
+
theme
+
Die anfänglich ausgewählte Farbe der Uhr. Welche Farben unterstützt werden, hängt davon ab, welche CSS-Dateien eingebunden werden. +
Typ: String +
Default: Farbe der ersten eingebundenen CSS-Datei +
+
force
+
Legt fest, ob die in der Konfiguration angegebenen Werte allfällig in einem Browser-Cookie gespeicherte Einstellungen überschreiben sollen + oder nicht. Mögliche Werte sind true (Konfiguration überschreibt Cookie-Werte) oder false (Cookie-Werte haben + Vorrang). +
Typ: boolean +
Default: false
+
controls
+
Gibt an, ob die Steuerelemente zur Auswahl von Farbe und Sprache und der Ein-/Ausschalter angezeigt werden sollen. Mögliche Werte sind true + oder false. +
Typ: boolean +
Default: true
+
autoresize
+
Gibt an, ob die Uhr ihre Grösse dynamisch anpassen soll, wenn das Elternelement seine Grösse ändert, oder ob sie immer die anfängliche Grösse + behält. Mögliche Werte sind true oder false. +
Typ: boolean +
Default: true
+
+ +

InformationenZum Inhalt

+ +

Programmiert von Manuel Friedli mit Inspiration von QLOCKTWO.
+ Diese Uhr ist aus Freude am Programmieren und am Konzept einer die Zeit in Worten ausdrückenden Uhr entstanden. Sollte daraus jemandem Schaden + oder ein gravierender Nachteil erwachsen, so soll sich diese Person bei mir melden und wir werden bestimmt eine Lösung finden, die für alle + beteiligten angemessen ist. Allen anderen Personen wünsche ich viel Freude mit der Zeit im Wort.

+ +

Der Quellcode ist frei zugänglich unter https://git.friedli.info/manuel/uhr.

+ +

LizenzbestimmungenZum Inhalt

+ +

Der komplette Sourcecode ist unter der GNU GPL 3.0 lizenziert und darf nach deren Vorgaben verwendet, kopiert, weitergegeben und verändert werden. + Die GNU GPL 3.0 findest Du unter folgendem Link: GNU GPL 3.0. Und direkt hier:

+ +

GNU GENERAL PUBLIC LICENSE

-

Die UhrZum Inhalt

- -
- -

Benötigte BibliothekenZum Inhalt

-
    -
  • jQuery (getestet mit Version 2.1.0)
    • -
  • jQuery-UI (getestet mit Version 1.10.4) mit folgenden Komponenten: -
      -
    • core
      • -
    • widget
      • -
    -
    • -
  • jQuery-cookie (getestet mit Version 1.4.0)
    • -
-

Einbinden in HTMLZum Inhalt

-

Javascript- und CSS-Dateien im <head>Zum Inhalt

-

Füge folgende Zeilen im <head>-Tag deines HTML-Dokumentes ein. Beachte dabei, dass die CSS-Dateien vor den Javascript eingebunden werden.
- <link rel="stylesheet" type="text/css" href="uhr.css" /> -<link rel="stylesheet" type="text/css" href="uhr-black.css" data-class="black" data-name="Schwarz" /> -<link rel="stylesheet" type="text/css" href="uhr-white.css" data-class="white" data-name="Weiss" /> -<link rel="stylesheet" type="text/css" href="uhr-red.css" data-class="red" data-name="Rot" /> -<link rel="stylesheet" type="text/css" href="uhr-yellow.css" data-class="yellow" data-name="Gelb" /> -<link rel="stylesheet" type="text/css" href="uhr-green.css" data-class="green" data-name="Grün" /> -<link rel="stylesheet" type="text/css" href="uhr-blue.css" data-class="blue" data-name="Blau" /> -<link rel="stylesheet" type="text/css" href="uhr-pink.css" data-class="pink" data-name="Pink" /> -<script type="text/javascript" src="jquery-2.1.0.min.js"></script> -<script type="text/javascript" src="jquery-ui-1.10.4.custom.min.js"></script> -<script type="text/javascript" src="jquery-cookie-1.4.0.js"></script> -<script type="text/javascript" src="uhr.js"></script> -<script type="text/javascript" src="uhr-de_CH.js"></script> -<script type="text/javascript" src="uhr-de_CH_genau.js"></script> -<script type="text/javascript" src="uhr-de.js"></script> -<script type="text/javascript" src="uhr-en.js"></script> -<script type="text/javascript" src="uhr-fr.js"></script> -<script type="text/javascript" src="uhr-it.js"></script> -

-

Von den Stylesheets zwingend ist uhr.css und mindestens eines der Farbschema-Stylesheets. Die Attribute data-class bzw. data-name definieren dabei die im Stylesheet deklarierte Klasse bzw. den im Auswahlmenu anzuzeigenden Namen. Der Name kann frei gewählt werden, die Style-Klasse muss mit der im Stylesheet definierten übereinstimmen.

-

uhr-de_CH_genau.js ist eine Variante von Berndeutsch, bei der zur vollen Stunde zusätlich das Wort genau angezeigt wird (also z.B. um 15:00 Uhr ES ISCH GENAU DRÜ).

-

Uhr-Element auf der SeiteZum Inhalt

-

Definiere an der Stelle, wo die Uhr angezeigt werden soll, ein leeres <div>-Element:
- <div id="meine-uhr"></div> -

-

Uhr initialisierenZum Inhalt

-

Definiere im HTML-Dokument (<head> oder <body>) ein Javascript-Snippet, um die Uhr zu initialisieren:
- <script type="text/javascript"> - jQuery(document).ready(function() { - jQuery('#meine-uhr').uhr(); - }); -</script> -

-

Die Uhr wird so in der Standardkonfiguration angezeigt, das heisst: Berndeutsche Sprache, in der Farbe der ersten eingebundenen CSS-Datei (im Beispiel also Schwarz), eingeschaltet, Breite 100% des Elternelementes. Wenn dies nicht deinen Bedürfnissen entspricht, lässt sich die Uhr wie im folgenden Abschnitt beschrieben konfigurieren. Die Konfiguration wird der .uhr()-Methode als JSON-Objekt übergeben, beispielsweise so:
- jQuery('#uhr').uhr({ - width: '200px', - theme: 'red' -}); -

-

KonfigurationZum Inhalt

-

Es existieren die folgenden Konfigurationsoptionen:

-
-
width
-
Die Breite der Uhr als CSS-String, z.B. '50%', '120px' oder '2.8em'. Die Höhe passt sich automatisch der Breite an, so dass die Uhr immer quadratisch ist. -
Typ: String -
Default: '100%'
-
status
-
Der Anfangszustand der Uhr, entweder 'on' oder 'off' -
Typ: String -
Default: 'on'
-
language
-
Die anfänglich ausgewählte Sprache als String. Welche Sprachen unterstützt werden, hängt davon ab, welche Sprachdateien eingebunden werden. -
Typ: String -
Default: 'de_CH'
-
theme
-
Die anfänglich ausgewählte Farbe der Uhr. Welche Farben unterstützt werden, hängt davon ab, welche CSS-Dateien eingebunden werden. -
Typ: String -
Default: Farbe der ersten eingebundenen CSS-Datei
-
force
-
Legt fest, ob die in der Konfiguration angegebenen Werte allfällig in einem Browser-Cookie gespeicherte Einstellungen überschreiben sollen oder nicht. Mögliche Werte sind true (Konfiguration überschreibt Cookie-Werte) oder false (Cookie-Werte haben Vorrang). -
Typ: boolean -
Default: false
-
controls
-
Gibt an, ob die Steuerelemente zur Auswahl von Farbe und Sprache und der Ein-/Ausschalter angezeigt werden sollen. Mögliche Werte sind true oder false. -
Typ: boolean -
Default: true
-
autoresize
-
Gibt an, ob die Uhr ihre Grösse dynamisch anpassen soll, wenn das Elternelement seine Grösse ändert, oder ob sie immer die anfängliche Grösse behält. Mögliche Werte sind true oder false. -
Typ: boolean -
Default: true
-
- -

InformationenZum Inhalt

-

Programmiert von Manuel Friedli mit Inspiration von QLOCKTWO.
- Diese Uhr ist aus Freude am Programmieren und am Konzept einer die Zeit in Worten ausdrückenden Uhr entstanden. Sollte daraus jemandem Schaden oder ein gravierender Nachteil erwachsen, so soll sich diese Person bei mir melden und wir werden bestimmt eine Lösung finden, die für alle beteiligten angemessen ist. Allen anderen Personen wünsche ich viel Freude mit der Zeit im Wort.

-

Der Quellcode ist frei zugänglich unter https://git.friedli.info/manuel/uhr.

-

LizenzbestimmungenZum Inhalt

-

Der komplette Sourcecode ist unter der GNU GPL 3.0 lizenziert und darf nach deren Vorgaben verwendet, kopiert, weitergegeben und verändert werden. Die GNU GPL 3.0 findest Du unter folgendem Link: GNU GPL 3.0. Und direkt hier:

-

GNU GENERAL PUBLIC LICENSE

Version 3, 29 June 2007

Copyright © 2007 Free Software Foundation, Inc. - <http://fsf.org/>

- Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed.

+ <http://fsf.org/>

+ +

+ Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed.

Preamble

The GNU General Public License is a free, copyleft license for -software and other kinds of works.

+ software and other kinds of works.

The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too.

+ to take away your freedom to share and change the works. By contrast, + the GNU General Public License is intended to guarantee your freedom to + share and change all versions of a program--to make sure it remains free + software for all its users. We, the Free Software Foundation, use the + GNU General Public License for most of our software; it applies also to + any other work released this way by its authors. You can apply it to + your programs, too.

When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things.

+ price. Our General Public Licenses are designed to make sure that you + have the freedom to distribute copies of free software (and charge for + them if you wish), that you receive source code or can get it if you + want it, that you can change the software or use pieces of it in new + free programs, and that you know you can do these things.

To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others.

+ these rights or asking you to surrender the rights. Therefore, you have + certain responsibilities if you distribute copies of the software, or if + you modify it: responsibilities to respect the freedom of others.

For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights.

+ gratis or for a fee, you must pass on to the recipients the same + freedoms that you received. You must make sure that they, too, receive + or can get the source code. And you must show them these terms so they + know their rights.

Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it.

+ (1) assert copyright on the software, and (2) offer you this License + giving you legal permission to copy, distribute and/or modify it.

For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions.

+ that there is no warranty for this free software. For both users' and + authors' sake, the GPL requires that modified versions be marked as + changed, so that their problems will not be attributed erroneously to + authors of previous versions.

Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users.

+ modified versions of the software inside them, although the manufacturer + can do so. This is fundamentally incompatible with the aim of + protecting users' freedom to change the software. The systematic + pattern of such abuse occurs in the area of products for individuals to + use, which is precisely where it is most unacceptable. Therefore, we + have designed this version of the GPL to prohibit the practice for those + products. If such problems arise substantially in other domains, we + stand ready to extend this provision to those domains in future versions + of the GPL, as needed to protect the freedom of users.

Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free.

+ States should not allow patents to restrict development and use of + software on general-purpose computers, but in those that do, we wish to + avoid the special danger that patents applied to a free program could + make it effectively proprietary. To prevent this, the GPL assures that + patents cannot be used to render the program non-free.

The precise terms and conditions for copying, distribution and -modification follow.

+ modification follow.

TERMS AND CONDITIONS

@@ -243,567 +279,582 @@ modification follow.

“This License” refers to version 3 of the GNU General Public License.

“Copyright” also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks.

+ works, such as semiconductor masks.

“The Program” refers to any copyrightable work licensed under this -License. Each licensee is addressed as “you”. “Licensees” and -“recipients” may be individuals or organizations.

+ License. Each licensee is addressed as “you”. “Licensees” and + “recipients” may be individuals or organizations.

To “modify” a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a “modified version” of the -earlier work or a work “based on” the earlier work.

+ in a fashion requiring copyright permission, other than the making of an + exact copy. The resulting work is called a “modified version” of the + earlier work or a work “based on” the earlier work.

A “covered work” means either the unmodified Program or a work based -on the Program.

+ on the Program.

To “propagate” a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well.

+ permission, would make you directly or secondarily liable for + infringement under applicable copyright law, except executing it on a + computer or modifying a private copy. Propagation includes copying, + distribution (with or without modification), making available to the + public, and in some countries other activities as well.

To “convey” a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying.

+ parties to make or receive copies. Mere interaction with a user through + a computer network, with no transfer of a copy, is not conveying.

An interactive user interface displays “Appropriate Legal Notices” -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion.

+ to the extent that it includes a convenient and prominently visible + feature that (1) displays an appropriate copyright notice, and (2) + tells the user that there is no warranty for the work (except to the + extent that warranties are provided), that licensees may convey the + work under this License, and how to view a copy of this License. If + the interface presents a list of user commands or options, such as a + menu, a prominent item in the list meets this criterion.

1. Source Code.

The “source code” for a work means the preferred form of the work -for making modifications to it. “Object code” means any non-source -form of a work.

+ for making modifications to it. “Object code” means any non-source + form of a work.

A “Standard Interface” means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language.

+ standard defined by a recognized standards body, or, in the case of + interfaces specified for a particular programming language, one that + is widely used among developers working in that language.

The “System Libraries” of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -“Major Component”, in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it.

+ than the work as a whole, that (a) is included in the normal form of + packaging a Major Component, but which is not part of that Major + Component, and (b) serves only to enable use of the work with that + Major Component, or to implement a Standard Interface for which an + implementation is available to the public in source code form. A + “Major Component”, in this context, means a major essential component + (kernel, window system, and so on) of the specific operating system + (if any) on which the executable work runs, or a compiler used to + produce the work, or an object code interpreter used to run it.

The “Corresponding Source” for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work.

+ the source code needed to generate, install, and (for an executable + work) run the object code and to modify the work, including scripts to + control those activities. However, it does not include the work's + System Libraries, or general-purpose tools or generally available free + programs which are used unmodified in performing those activities but + which are not part of the work. For example, Corresponding Source + includes interface definition files associated with source files for + the work, and the source code for shared libraries and dynamically + linked subprograms that the work is specifically designed to require, + such as by intimate data communication or control flow between those + subprograms and other parts of the work.

The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source.

+ can regenerate automatically from other parts of the Corresponding + Source.

The Corresponding Source for a work in source code form is that -same work.

+ same work.

2. Basic Permissions.

All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law.

+ copyright on the Program, and are irrevocable provided the stated + conditions are met. This License explicitly affirms your unlimited + permission to run the unmodified Program. The output from running a + covered work is covered by this License only if the output, given its + content, constitutes a covered work. This License acknowledges your + rights of fair use or other equivalent, as provided by copyright law.

You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you.

+ convey, without conditions so long as your license otherwise remains + in force. You may convey covered works to others for the sole purpose + of having them make modifications exclusively for you, or provide you + with facilities for running those works, provided that you comply with + the terms of this License in conveying all material for which you do + not control copyright. Those thus making or running the covered works + for you must do so exclusively on your behalf, under your direction + and control, on terms that prohibit them from making any copies of + your copyrighted material outside their relationship with you.

Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary.

+ the conditions stated below. Sublicensing is not allowed; section 10 + makes it unnecessary.

3. Protecting Users' Legal Rights From Anti-Circumvention Law.

No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures.

+ measure under any applicable law fulfilling obligations under article + 11 of the WIPO copyright treaty adopted on 20 December 1996, or + similar laws prohibiting or restricting circumvention of such + measures.

When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures.

+ circumvention of technological measures to the extent such circumvention + is effected by exercising rights under this License with respect to + the covered work, and you disclaim any intention to limit operation or + modification of the work as a means of enforcing, against the work's + users, your or third parties' legal rights to forbid circumvention of + technological measures.

4. Conveying Verbatim Copies.

You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program.

+ receive it, in any medium, provided that you conspicuously and + appropriately publish on each copy an appropriate copyright notice; + keep intact all notices stating that this License and any + non-permissive terms added in accord with section 7 apply to the code; + keep intact all notices of the absence of any warranty; and give all + recipients a copy of this License along with the Program.

You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee.

+ and you may offer support or warranty protection for a fee.

5. Conveying Modified Source Versions.

You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions:

+ produce it from the Program, in the form of source code under the + terms of section 4, provided that you also meet all of these conditions:

    -
  • a) The work must carry prominent notices stating that you modified - it, and giving a relevant date.
    • +
  • a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. +
    • -
  • b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - “keep intact all notices”.
    • +
  • b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + “keep intact all notices”. +
    • -
  • c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it.
    • +
  • c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. +
    • -
  • d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so.
    • +
  • d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. +

A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -“aggregate” if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate.

+ works, which are not by their nature extensions of the covered work, + and which are not combined with it such as to form a larger program, + in or on a volume of a storage or distribution medium, is called an + “aggregate” if the compilation and its resulting copyright are not + used to limit the access or legal rights of the compilation's users + beyond what the individual works permit. Inclusion of a covered work + in an aggregate does not cause this License to apply to the other + parts of the aggregate.

6. Conveying Non-Source Forms.

You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways:

+ of sections 4 and 5, provided that you also convey the + machine-readable Corresponding Source under the terms of this License, + in one of these ways:

    -
  • a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange.
    • +
  • a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. +
    • -
  • b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge.
    • +
  • b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. +
    • -
  • c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b.
    • +
  • c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. +
    • -
  • d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements.
    • +
  • d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. +
    • -
  • e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d.
    • +
  • e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. +

A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work.

+ from the Corresponding Source as a System Library, need not be + included in conveying the object code work.

A “User Product” is either (1) a “consumer product”, which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, “normally used” refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product.

+ tangible personal property which is normally used for personal, family, + or household purposes, or (2) anything designed or sold for incorporation + into a dwelling. In determining whether a product is a consumer product, + doubtful cases shall be resolved in favor of coverage. For a particular + product received by a particular user, “normally used” refers to a + typical or common use of that class of product, regardless of the status + of the particular user or of the way in which the particular user + actually uses, or expects or is expected to use, the product. A product + is a consumer product regardless of whether the product has substantial + commercial, industrial or non-consumer uses, unless such uses represent + the only significant mode of use of the product.

“Installation Information” for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made.

+ procedures, authorization keys, or other information required to install + and execute modified versions of a covered work in that User Product from + a modified version of its Corresponding Source. The information must + suffice to ensure that the continued functioning of the modified object + code is in no case prevented or interfered with solely because + modification has been made.

If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM).

+ specifically for use in, a User Product, and the conveying occurs as + part of a transaction in which the right of possession and use of the + User Product is transferred to the recipient in perpetuity or for a + fixed term (regardless of how the transaction is characterized), the + Corresponding Source conveyed under this section must be accompanied + by the Installation Information. But this requirement does not apply + if neither you nor any third party retains the ability to install + modified object code on the User Product (for example, the work has + been installed in ROM).

The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network.

+ requirement to continue to provide support service, warranty, or updates + for a work that has been modified or installed by the recipient, or for + the User Product in which it has been modified or installed. Access to a + network may be denied when the modification itself materially and + adversely affects the operation of the network or violates the rules and + protocols for communication across the network.

Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying.

+ in accord with this section must be in a format that is publicly + documented (and with an implementation available to the public in + source code form), and must require no special password or key for + unpacking, reading or copying.

7. Additional Terms.

“Additional permissions” are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions.

+ License by making exceptions from one or more of its conditions. + Additional permissions that are applicable to the entire Program shall + be treated as though they were included in this License, to the extent + that they are valid under applicable law. If additional permissions + apply only to part of the Program, that part may be used separately + under those permissions, but the entire Program remains governed by + this License without regard to the additional permissions.

When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission.

+ remove any additional permissions from that copy, or from any part of + it. (Additional permissions may be written to require their own + removal in certain cases when you modify the work.) You may place + additional permissions on material, added by you to a covered work, + for which you have or can give appropriate copyright permission.

Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms:

+ add to a covered work, you may (if authorized by the copyright holders of + that material) supplement the terms of this License with terms:

    -
  • a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or
    • +
  • a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or +
    • -
  • b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or
    • +
  • b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or +
    • -
  • c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or
    • +
  • c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or +
    • -
  • d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or
    • +
  • d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or +
    • -
  • e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or
    • +
  • e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or +
    • -
  • f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors.
    • +
  • f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. +

All other non-permissive additional terms are considered “further -restrictions” within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying.

+ restrictions” within the meaning of section 10. If the Program as you + received it, or any part of it, contains a notice stating that it is + governed by this License along with a term that is a further + restriction, you may remove that term. If a license document contains + a further restriction but permits relicensing or conveying under this + License, you may add to a covered work material governed by the terms + of that license document, provided that the further restriction does + not survive such relicensing or conveying.

If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms.

+ must place, in the relevant source files, a statement of the + additional terms that apply to those files, or a notice indicating + where to find the applicable terms.

Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way.

+ form of a separately written license, or stated as exceptions; + the above requirements apply either way.

8. Termination.

You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11).

+ provided under this License. Any attempt otherwise to propagate or + modify it is void, and will automatically terminate your rights under + this License (including any patent licenses granted under the third + paragraph of section 11).

However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation.

+ license from a particular copyright holder is reinstated (a) + provisionally, unless and until the copyright holder explicitly and + finally terminates your license, and (b) permanently, if the copyright + holder fails to notify you of the violation by some reasonable means + prior to 60 days after the cessation.

Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice.

+ reinstated permanently if the copyright holder notifies you of the + violation by some reasonable means, this is the first time you have + received notice of violation of this License (for any work) from that + copyright holder, and you cure the violation prior to 30 days after + your receipt of the notice.

Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10.

+ licenses of parties who have received copies or rights from you under + this License. If your rights have been terminated and not permanently + reinstated, you do not qualify to receive new licenses for the same + material under section 10.

9. Acceptance Not Required for Having Copies.

You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so.

+ run a copy of the Program. Ancillary propagation of a covered work + occurring solely as a consequence of using peer-to-peer transmission + to receive a copy likewise does not require acceptance. However, + nothing other than this License grants you permission to propagate or + modify any covered work. These actions infringe copyright if you do + not accept this License. Therefore, by modifying or propagating a + covered work, you indicate your acceptance of this License to do so.

10. Automatic Licensing of Downstream Recipients.

Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License.

+ receives a license from the original licensors, to run, modify and + propagate that work, subject to this License. You are not responsible + for enforcing compliance by third parties with this License.

An “entity transaction” is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts.

+ organization, or substantially all assets of one, or subdividing an + organization, or merging organizations. If propagation of a covered + work results from an entity transaction, each party to that + transaction who receives a copy of the work also receives whatever + licenses to the work the party's predecessor in interest had or could + give under the previous paragraph, plus a right to possession of the + Corresponding Source of the work from the predecessor in interest, if + the predecessor has it or can get it with reasonable efforts.

You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it.

+ rights granted or affirmed under this License. For example, you may + not impose a license fee, royalty, or other charge for exercise of + rights granted under this License, and you may not initiate litigation + (including a cross-claim or counterclaim in a lawsuit) alleging that + any patent claim is infringed by making, using, selling, offering for + sale, or importing the Program or any portion of it.

11. Patents.

A “contributor” is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's “contributor version”.

+ License of the Program or a work on which the Program is based. The + work thus licensed is called the contributor's “contributor version”.

A contributor's “essential patent claims” are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, “control” includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License.

+ owned or controlled by the contributor, whether already acquired or + hereafter acquired, that would be infringed by some manner, permitted + by this License, of making, using, or selling its contributor version, + but do not include claims that would be infringed only as a + consequence of further modification of the contributor version. For + purposes of this definition, “control” includes the right to grant + patent sublicenses in a manner consistent with the requirements of + this License.

Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version.

+ patent license under the contributor's essential patent claims, to + make, use, sell, offer for sale, import and otherwise run, modify and + propagate the contents of its contributor version.

In the following three paragraphs, a “patent license” is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To “grant” such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party.

+ agreement or commitment, however denominated, not to enforce a patent + (such as an express permission to practice a patent or covenant not to + sue for patent infringement). To “grant” such a patent license to a + party means to make such an agreement or commitment not to enforce a + patent against the party.

If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. “Knowingly relying” means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid.

+ and the Corresponding Source of the work is not available for anyone + to copy, free of charge and under the terms of this License, through a + publicly available network server or other readily accessible means, + then you must either (1) cause the Corresponding Source to be so + available, or (2) arrange to deprive yourself of the benefit of the + patent license for this particular work, or (3) arrange, in a manner + consistent with the requirements of this License, to extend the patent + license to downstream recipients. “Knowingly relying” means you have + actual knowledge that, but for the patent license, your conveying the + covered work in a country, or your recipient's use of the covered work + in a country, would infringe one or more identifiable patents in that + country that you have reason to believe are valid.

If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it.

+ arrangement, you convey, or propagate by procuring conveyance of, a + covered work, and grant a patent license to some of the parties + receiving the covered work authorizing them to use, propagate, modify + or convey a specific copy of the covered work, then the patent license + you grant is automatically extended to all recipients of the covered + work and works based on it.

A patent license is “discriminatory” if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007.

+ the scope of its coverage, prohibits the exercise of, or is + conditioned on the non-exercise of one or more of the rights that are + specifically granted under this License. You may not convey a covered + work if you are a party to an arrangement with a third party that is + in the business of distributing software, under which you make payment + to the third party based on the extent of your activity of conveying + the work, and under which the third party grants, to any of the + parties who would receive the covered work from you, a discriminatory + patent license (a) in connection with copies of the covered work + conveyed by you (or copies made from those copies), or (b) primarily + for and in connection with specific products or compilations that + contain the covered work, unless you entered into that arrangement, + or that patent license was granted, prior to 28 March 2007.

Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law.

+ any implied license or other defenses to infringement that may + otherwise be available to you under applicable patent law.

12. No Surrender of Others' Freedom.

If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program.

+ otherwise) that contradict the conditions of this License, they do not + excuse you from the conditions of this License. If you cannot convey a + covered work so as to satisfy simultaneously your obligations under this + License and any other pertinent obligations, then as a consequence you may + not convey it at all. For example, if you agree to terms that obligate you + to collect a royalty for further conveying from those to whom you convey + the Program, the only way you could satisfy both those terms and this + License would be to refrain entirely from conveying the Program.

13. Use with the GNU Affero General Public License.

Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such.

+ permission to link or combine any covered work with a work licensed + under version 3 of the GNU Affero General Public License into a single + combined work, and to convey the resulting work. The terms of this + License will continue to apply to the part which is the covered work, + but the special requirements of the GNU Affero General Public License, + section 13, concerning interaction through a network will apply to the + combination as such.

14. Revised Versions of this License.

The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns.

+ the GNU General Public License from time to time. Such new versions will + be similar in spirit to the present version, but may differ in detail to + address new problems or concerns.

-

Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License “or any later version” applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation.

+

Each version is given a distinguishing version number. If the + Program specifies that a certain numbered version of the GNU General + Public License “or any later version” applies to it, you have the + option of following the terms and conditions either of that numbered + version or of any later version published by the Free Software + Foundation. If the Program does not specify a version number of the + GNU General Public License, you may choose any version ever published + by the Free Software Foundation.

If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program.

+ versions of the GNU General Public License can be used, that proxy's + public statement of acceptance of a version permanently authorizes you + to choose that version for the Program.

Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version.

+ permissions. However, no additional obligations are imposed on any + author or copyright holder as a result of your choosing to follow a + later version.

15. Disclaimer of Warranty.

THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION.

+ APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT + HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY + OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, + THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM + IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF + ALL NECESSARY SERVICING, REPAIR OR CORRECTION.

16. Limitation of Liability.

IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES.

+ WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS + THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY + GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE + USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF + DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD + PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), + EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF + SUCH DAMAGES.

17. Interpretation of Sections 15 and 16.

If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee.

+ above cannot be given local legal effect according to their terms, + reviewing courts shall apply local law that most closely approximates + an absolute waiver of all civil liability in connection with the + Program, unless a warranty or assumption of liability accompanies a + copy of the Program in return for a fee.

END OF TERMS AND CONDITIONS

How to Apply These Terms to Your New Programs

If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms.

+ possible use to the public, the best way to achieve this is to make it + free software which everyone can redistribute and change under these terms.

-

To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the “copyright” line and a pointer to where the full notice is found.

+

To do so, attach the following notices to the program. It is safest + to attach them to the start of each source file to most effectively + state the exclusion of warranty; and each file should have at least + the “copyright” line and a pointer to where the full notice is found.

    <one line to give the program's name and a brief idea of what it does.>
     Copyright (C) <year>  <name of author>
@@ -825,7 +876,7 @@ the “copyright” line and a pointer to where the full notice is found
 
Also add information on how to contact you by electronic and paper mail.

 
 
If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:

+    notice like this when it starts in an interactive mode:

 
 
    <program>  Copyright (C) <year>  <name of author>
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
@@ -834,19 +885,19 @@ notice like this when it starts in an interactive mode:

 

 
 
The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an “about box”.

+    parts of the General Public License. Of course, your program's commands
+    might be different; for a GUI interface, you would use an “about box”.

 
 
You should also get your employer (if you work as a programmer) or school,
-if any, to sign a “copyright disclaimer” for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.

+    if any, to sign a “copyright disclaimer” for the program, if necessary.
+    For more information on this, and how to apply and follow the GNU GPL, see
+    <http://www.gnu.org/licenses/>.

 
 
The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

+    into proprietary programs. If your program is a subroutine library, you
+    may consider it more useful to permit linking proprietary applications with
+    the library. If this is what you want to do, use the GNU Lesser General
+    Public License instead of this License. But first, please read
+    <http://www.gnu.org/philosophy/why-not-lgpl.html>.

 
 
diff --git a/info/info.css b/info/info.css
index 8aa7f4a..4b7dc76 100644
--- a/info/info.css
+++ b/info/info.css
@@ -1,24 +1,48 @@
+/*
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see .
+*/
 body {
-	font-size: 120%;
+    font-size: 120%;
 }
+
 code {
-	white-space: pre-line;
+    white-space: pre-line;
     display: inline-block;
 }
+
+code.inline {
+    display: inline;
+}
+
 ol {
-	counter-reset: item;
-	padding-left: 1em;
+    counter-reset: item;
+    padding-left: 1em;
 }
+
 ol li {
-	display: block;
+    display: block;
 }
+
 ol li:before {
-	content: counters(item, ".") ". ";
-	counter-increment: item;
+    content: counters(item, ".") ". ";
+    counter-increment: item;
 }
+
 a.toclink {
     font-size: 25%;
 }
+
 a.toclink:before {
     content: "▲ ";
 }
\ No newline at end of file
diff --git a/js/uhr-de.js b/js/uhr-de.js
index 93331b1..b63a1cf 100644
--- a/js/uhr-de.js
+++ b/js/uhr-de.js
@@ -12,7 +12,7 @@
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see .
  */
-(function () {
+(function() {
     'use strict';
     var es_ist = {1: [1, 2, 4, 5, 6]};
     var uhr = {10: [9, 10, 11]};
diff --git a/js/uhr-de_CH-seconds.js b/js/uhr-de_CH-seconds.js
index 8732d2f..c5dc26b 100644
--- a/js/uhr-de_CH-seconds.js
+++ b/js/uhr-de_CH-seconds.js
@@ -16,7 +16,7 @@
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see .
  */
-(function () {
+(function() {
     'use strict';
     var vorne0 = {
         3: [2, 3, 4],
@@ -73,86 +73,86 @@
         9: [7, 8, 9, 10, 11]
     };
     var vorne3 = {
-            3: [1, 2, 3, 4, 5],
-            4: [4],
-            5: [3],
-            6: [4],
-            7: [5],
-            8: [1, 5],
-            9: [2, 3, 4]
-        };
+        3: [1, 2, 3, 4, 5],
+        4: [4],
+        5: [3],
+        6: [4],
+        7: [5],
+        8: [1, 5],
+        9: [2, 3, 4]
+    };
     var hinten3 = {
-            3: [7, 8, 9, 10, 11],
-            4: [10],
-            5: [9],
-            6: [10],
-            7: [11],
-            8: [7, 11],
-            9: [8, 9, 10]
-        };
+        3: [7, 8, 9, 10, 11],
+        4: [10],
+        5: [9],
+        6: [10],
+        7: [11],
+        8: [7, 11],
+        9: [8, 9, 10]
+    };
     var vorne4 = {
-            3: [4],
-            4: [3, 4],
-            5: [2, 4],
-            6: [1, 4],
-            7: [1, 2, 3, 4, 5],
-            8: [4],
-            9: [4]
-        };
+        3: [4],
+        4: [3, 4],
+        5: [2, 4],
+        6: [1, 4],
+        7: [1, 2, 3, 4, 5],
+        8: [4],
+        9: [4]
+    };
     var hinten4 = {
-            3: [10],
-            4: [9, 10],
-            5: [8, 10],
-            6: [7, 10],
-            7: [7, 8, 9, 10, 11],
-            8: [10],
-            9: [10]
-        };
+        3: [10],
+        4: [9, 10],
+        5: [8, 10],
+        6: [7, 10],
+        7: [7, 8, 9, 10, 11],
+        8: [10],
+        9: [10]
+    };
     var vorne5 = {
-            3: [1, 2, 3, 4, 5],
-            4: [1],
-            5: [1, 2, 3, 4],
-            6: [5],
-            7: [5],
-            8: [1, 5],
-            9: [2, 3, 4]
-        };
+        3: [1, 2, 3, 4, 5],
+        4: [1],
+        5: [1, 2, 3, 4],
+        6: [5],
+        7: [5],
+        8: [1, 5],
+        9: [2, 3, 4]
+    };
     var hinten5 = {
-            3: [7, 8, 9, 10, 11],
-            4: [7],
-            5: [7, 8, 9, 10],
-            6: [11],
-            7: [11],
-            8: [7, 11],
-            9: [8, 9, 10]
-        };
+        3: [7, 8, 9, 10, 11],
+        4: [7],
+        5: [7, 8, 9, 10],
+        6: [11],
+        7: [11],
+        8: [7, 11],
+        9: [8, 9, 10]
+    };
     var hinten6 = {
-            3: [9, 10],
-            4: [8],
-            5: [7],
-            6: [7, 8, 9, 10],
-            7: [7, 11],
-            8: [7, 11],
-            9: [8, 9, 10]
-        };
+        3: [9, 10],
+        4: [8],
+        5: [7],
+        6: [7, 8, 9, 10],
+        7: [7, 11],
+        8: [7, 11],
+        9: [8, 9, 10]
+    };
     var hinten7 = {
-            3: [7, 8, 9, 10, 11],
-            4: [11],
-            5: [10],
-            6: [9],
-            7: [8],
-            8: [8],
-            9: [8]
-        };
+        3: [7, 8, 9, 10, 11],
+        4: [11],
+        5: [10],
+        6: [9],
+        7: [8],
+        8: [8],
+        9: [8]
+    };
     var hinten8 = {
-            3: [8, 9, 10],
-            4: [7, 11],
-            5: [7, 11],
-            6: [8, 9, 10],
-            7: [7, 11],
-            8: [7, 11],
-            9: [8, 9, 10]
-        };
+        3: [8, 9, 10],
+        4: [7, 11],
+        5: [7, 11],
+        6: [8, 9, 10],
+        7: [7, 11],
+        8: [7, 11],
+        9: [8, 9, 10]
+    };
     var hinten9 = {
         3: [8, 9, 10],
         4: [7, 11],
@@ -239,7 +239,7 @@
             "58": [vorne5, hinten8],
             "59": [vorne5, hinten9]
         },
-        "getDotMinute": function (time) {
+        "getDotMinute": function() {
             return 0;
         }
     };
diff --git a/js/uhr-de_CH.js b/js/uhr-de_CH.js
index e87e173..3d2945e 100644
--- a/js/uhr-de_CH.js
+++ b/js/uhr-de_CH.js
@@ -12,7 +12,7 @@
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see .
  */
-(function () {
+(function() {
     'use strict';
 // hilfsvariablen
     var es_isch = {1: [1, 2, 4, 5, 6, 7]};
diff --git a/js/uhr-de_CH_genau.js b/js/uhr-de_CH_genau.js
index 301852c..4181ccc 100644
--- a/js/uhr-de_CH_genau.js
+++ b/js/uhr-de_CH_genau.js
@@ -12,7 +12,7 @@
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see .
  */
-(function () {
+(function() {
     'use strict';
     var es_isch = {1: [1, 2, 4, 5, 6, 7]};
     var genau = {3: [7, 8, 9, 10, 11]};
diff --git a/js/uhr-en.js b/js/uhr-en.js
index 863c40f..f5ed95f 100644
--- a/js/uhr-en.js
+++ b/js/uhr-en.js
@@ -12,7 +12,7 @@
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see .
  */
-(function () {
+(function() {
     'use strict';
     var it_is = {1: [1, 2, 4, 5]};
     var half = {4: [1, 2, 3, 4]};
@@ -69,7 +69,7 @@
             "10,22": {10: [1, 2, 3]},
             "11,23": {8: [6, 7, 8, 9, 10, 11]}
         },
-        "getHour": function (date) {
+        "getHour": function(date) {
             var hour = date.getHours();
             if (date.getMinutes() >= 35) {
                 return (hour + 1) % 24;
diff --git a/js/uhr-fr.js b/js/uhr-fr.js
index c4fed2c..bcf375e 100644
--- a/js/uhr-fr.js
+++ b/js/uhr-fr.js
@@ -12,7 +12,7 @@
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see .
  */
-(function () {
+(function() {
     'use strict';
     var il_est = {1: [1, 2, 4, 5, 6]};
     var et = {8: [1, 2]};
@@ -57,20 +57,53 @@
         },
         "hours": {
             "0": {5: [6, 7, 8, 9, 10, 11]},
-            "1,13": [{3: [5, 6, 7]}, heures],
-            "2,14": [{1: [8, 9, 10, 11]}, heures],
-            "3,15": [{2: [7, 8, 9, 10, 11]}, heures],
-            "4,16": [{2: [1, 2, 3, 4, 5, 6]}, heures],
-            "5,17": [{4: [8, 9, 10, 11]}, heures],
-            "6,18": [{4: [5, 6, 7]}, heures],
-            "7,19": [{3: [8, 9, 10, 11]}, heures],
-            "8,20": [{4: [1, 2, 3, 4]}, heures],
-            "9,21": [{3: [1, 2, 3, 4]}, heures],
-            "10,22": [{5: [3, 4, 5]}, heures],
-            "11,23": [{6: [1, 2, 3, 4]}, heures],
+            "1,13": [
+                {3: [5, 6, 7]},
+                heures
+            ],
+            "2,14": [
+                {1: [8, 9, 10, 11]},
+                heures
+            ],
+            "3,15": [
+                {2: [7, 8, 9, 10, 11]},
+                heures
+            ],
+            "4,16": [
+                {2: [1, 2, 3, 4, 5, 6]},
+                heures
+            ],
+            "5,17": [
+                {4: [8, 9, 10, 11]},
+                heures
+            ],
+            "6,18": [
+                {4: [5, 6, 7]},
+                heures
+            ],
+            "7,19": [
+                {3: [8, 9, 10, 11]},
+                heures
+            ],
+            "8,20": [
+                {4: [1, 2, 3, 4]},
+                heures
+            ],
+            "9,21": [
+                {3: [1, 2, 3, 4]},
+                heures
+            ],
+            "10,22": [
+                {5: [3, 4, 5]},
+                heures
+            ],
+            "11,23": [
+                {6: [1, 2, 3, 4]},
+                heures
+            ],
             "12": {5: [1, 2, 3, 4]}
         },
-        "getHour": function (date) {
+        "getHour": function(date) {
             var hour = date.getHours();
             if (date.getMinutes() >= 35) {
                 return (hour + 1) % 24;
diff --git a/js/uhr-it.js b/js/uhr-it.js
index 65e33af..4f6e706 100644
--- a/js/uhr-it.js
+++ b/js/uhr-it.js
@@ -12,7 +12,7 @@
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see .
  */
-(function () {
+(function() {
     'use strict';
     var sono_le = {1: [1, 2, 3, 4, 6, 7]};
     var e_l = {2: [1, 3, 4]};
@@ -68,7 +68,7 @@
             "10,22": [sono_le, {4: [1, 2, 3, 4, 5]}],
             "11,23": [sono_le, {4: [6, 7, 8, 9, 10, 11]}]
         },
-        "getHour": function (date) {
+        "getHour": function(date) {
             var hour = date.getHours();
             if (date.getMinutes() >= 35) {
                 return (hour + 1) % 24;
diff --git a/js/uhr.js b/js/uhr.js
index b2d2ea3..c88e42b 100644
--- a/js/uhr.js
+++ b/js/uhr.js
@@ -12,16 +12,17 @@
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see .
  */
-(function ($) {
+(function($) {
     'use strict';
     var uhrGlobals = {
         "id": 0,
         "languages": [],
         "themes": [],
         registerLanguage: function registerLanguage(code, language) {
-            var alreadyExists = uhrGlobals.languages.some(function (element) {
+            var alreadyExists = uhrGlobals.languages.some(function(element) {
                 if (code === element.code) {
-                    console.error("Error: Language code '" + code + "' cannot be registered for language '" + language.language + "' because it is already registered for language '" + element.language + "'!");
+                    console.error("Error: Language code '" + code + "' cannot be registered for language '" + language.language +
+                                  "' because it is already registered for language '" + element.language + "'!");
                     return true;
                 }
                 return false;
@@ -34,7 +35,7 @@
     };
 
     // auto-detect themes
-    $('link[rel=stylesheet]').each(function (index, item) {
+    $('link[rel=stylesheet]').each(function(index, item) {
         var styleSheet = $(item);
         var styleClass = styleSheet.attr('data-class');
         if (styleClass !== undefined) {
@@ -53,7 +54,7 @@
     // public interface methods (exported later)
     var start = function start() {
         if (!isOn.bind(this)()) {
-            this.timer = window.setInterval(function () {
+            this.timer = window.setInterval(function() {
                 this.options.time = new Date();
                 update.bind(this)();
             }.bind(this), 1000);
@@ -80,7 +81,7 @@
         if (languageKey !== this.options.language) {
             this.options.language = languageKey;
             var renderer = new UhrRenderer(language.bind(this)(), this.element.find('.letterarea'));
-            renderer.render.bind(this)(function () {
+            renderer.render.bind(this)(function() {
                 this.currentMinute = -1;
                 update.bind(this)();
             }.bind(this));
@@ -152,7 +153,7 @@
 
         if (this.options.controls) {
             var configlink = $('');
-            configlink.on('click', function () {
+            configlink.on('click', function() {
                 showConfigScreen.bind(this)();
             }.bind(this));
             e.after(configlink);
@@ -161,17 +162,16 @@
             controlpanel.append(content);
             // on/off switch
             var toggleSwitch = $('
');
-            toggleSwitch.append('');
-            toggleSwitch.append('');
+            toggleSwitch.append('');
+            toggleSwitch.append('');
             content.append(toggleSwitch);
 
             // language chooser
             if (uhrGlobals.languages.length > 1) {
                 var languageChooser = $('');
-                uhrGlobals.languages.forEach(function (item) {
+                uhrGlobals.languages.forEach(function(item) {
                     languageChooser.append('');
                 });
                 content.append(languageChooser);
@@ -180,13 +180,13 @@
             // theme chooser
             if (uhrGlobals.themes.length > 1) {
                 var themeChooser = $('');
-                uhrGlobals.themes.forEach(function (item) {
+                uhrGlobals.themes.forEach(function(item) {
                     themeChooser.append('');
                 });
                 content.append(themeChooser);
             }
             var closebutton = $('');
-            closebutton.on('click', function () {
+            closebutton.on('click', function() {
                 $('#uhr-controlpanel' + this.id).fadeOut('fast');
             }.bind(this));
             content.append(closebutton);
@@ -197,7 +197,7 @@
     var wireFunctionality = function wireFunctionality() {
         // on/off switch
         var toggleSwitch = $('#uhr-onoffswitch-checkbox' + this.id);
-        toggleSwitch.on('click', function () {
+        toggleSwitch.on('click', function() {
             this.toggle();
         }.bind(this));
         var status = $.cookie('uhr-status' + this.id);
@@ -213,7 +213,7 @@
 
         // language chooser
         var languageChooser = $('#uhr-languagechooser' + this.id);
-        languageChooser.on('change', function () {
+        languageChooser.on('change', function() {
             var languageKey = $('#uhr-languagechooser' + this.id).val();
             this.language(languageKey);
         }.bind(this));
@@ -221,7 +221,7 @@
         if (selectedLanguage === undefined || this.options.force) {
             selectedLanguage = this.options.language;
         }
-        var found = uhrGlobals.languages.some(function (item) {
+        var found = uhrGlobals.languages.some(function(item) {
             return selectedLanguage === item.code;
         });
         if (!found) {
@@ -240,7 +240,7 @@
 
         // theme chooser
         var themeChooser = $('#uhr-themechooser' + this.id);
-        themeChooser.on('change', function () {
+        themeChooser.on('change', function() {
             var themeKey = $('#uhr-themechooser' + this.id).val();
             this.theme(themeKey);
         }.bind(this));
@@ -248,7 +248,7 @@
         if (selectedTheme === undefined || this.options.force) {
             selectedTheme = this.options.theme;
         }
-        found = uhrGlobals.themes.some(function (item) {
+        found = uhrGlobals.themes.some(function(item) {
             return selectedTheme === item.styleClass;
         });
         if (!found) {
@@ -260,7 +260,7 @@
         this.options.theme = "";
         this.theme(selectedTheme);
         if (this.options.autoresize) {
-            $(window).on('resize', function () {
+            $(window).on('resize', function() {
                 var $e = this.element;
                 var $parent = $e.parent();
                 var $window = $(window);
@@ -353,7 +353,7 @@
     };
 
     var language = function language() {
-        var matchingLanguages = uhrGlobals.languages.filter(function (element) {
+        var matchingLanguages = uhrGlobals.languages.filter(function(element) {
             return (element.code === this.options.language);
         }, this);
         if (matchingLanguages.length > 0) {
@@ -394,21 +394,21 @@
         this.render = function render(beforeshow) {
             if (layout.parsed === undefined) {
                 switch (layout.version) {
-                    case 2:
-                        var delegate = new UhrRendererV2Delegate(layout);
-                        var parsedLayout = delegate.parse();
-                        Object.defineProperty(layout, "parsed", {"value": parsedLayout, "writable": false, "configurable": false});
-                        break;
-                    default:
-                        console.warn("Unknown layout version: '" + layout.version + "'");
-                        return;
+                case 2:
+                    var delegate = new UhrRendererV2Delegate(layout);
+                    var parsedLayout = delegate.parse();
+                    Object.defineProperty(layout, "parsed", {"value": parsedLayout, "writable": false, "configurable": false});
+                    break;
+                default:
+                    console.warn("Unknown layout version: '" + layout.version + "'");
+                    return;
                 }
             }
             var letters = layout.parsed;
-            renderarea.fadeOut('fast', function () {
+            renderarea.fadeOut('fast', function() {
                 renderarea.empty();
-                letters.forEach(function (line, index, array) {
-                    line.forEach(function (letter) {
+                letters.forEach(function(line, index, array) {
+                    line.forEach(function(letter) {
                         renderarea.append(letter.toString());
                     });
                     if (index < array.length - 1) {
@@ -427,7 +427,7 @@
         function parseArrayOrObject(letters, styleClass, input) {
             if (typeof input !== 'undefined' && input !== null) {
                 if (Array.isArray(input)) {
-                    input.forEach(function (item) {
+                    input.forEach(function(item) {
                         parseObject(letters, styleClass, item);
                     });
                 } else {
@@ -438,9 +438,9 @@
 
         function parseObject(letters, styleClass, object) {
             if (typeof object !== 'undefined' && object !== null) {
-                Object.keys(object).forEach(function (y) {
+                Object.keys(object).forEach(function(y) {
                     var highlightLetters = object[y];
-                    highlightLetters.forEach(function (x) {
+                    highlightLetters.forEach(function(x) {
                         letters[y - 1][x - 1].addStyle(styleClass);
                     });
                 });
@@ -449,10 +449,10 @@
 
         function parseTimeDefinition(letters, styleClass, definition) {
             if (typeof definition !== 'undefined' && definition !== null) {
-                Object.keys(definition).forEach(function (listString) {
+                Object.keys(definition).forEach(function(listString) {
                     var array = listString.split(',');
                     var highlightLetters = definition[listString];
-                    array.forEach(function (item) {
+                    array.forEach(function(item) {
                         parseArrayOrObject(letters, styleClass + item, highlightLetters);
                     });
                 });
@@ -461,7 +461,7 @@
 
         this.parse = function parse() {
             var letters = [];
-            layout.letters.forEach(function (string) {
+            layout.letters.forEach(function(string) {
                 var line = [];
                 for (var c = 0; c < string.length; c++) {
                     var character = new Letter(string[c]);
@@ -485,14 +485,14 @@
     function Letter(value, style) {
         var myValue = value;
         var myStyle = style || '';
-        this.addStyle = function (style) {
+        this.addStyle = function(style) {
             if (myStyle === '') {
                 myStyle = style;
             } else {
                 myStyle += ' ' + style;
             }
         };
-        this.toString = function () {
+        this.toString = function() {
             return '' + myValue + '';
         };
     }
diff --git a/showcase/index.html b/showcase/index.html
index b995e98..cb1c6a0 100644
--- a/showcase/index.html
+++ b/showcase/index.html
@@ -15,50 +15,50 @@ along with this program.  If not, see .
 -->
 
 
-	Bärneruhr - Die Zeit im Wort: Showcase
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
+    Bärneruhr - Die Zeit im Wort: Showcase
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
 
 
-	

-	
Go back to the main page

-	
-	
-	
-	
-	
-	
-	
-	
+

+
Go back to the main page

+
+
+
+
+
+
+
+
 
 
diff --git a/test/test.html b/test/test.html
index 386cee4..6b6ec85 100644
--- a/test/test.html
+++ b/test/test.html
@@ -22,7 +22,7 @@
 
 
 
\ No newline at end of file
diff --git a/test/test.js b/test/test.js
index a3a35a0..518a0ba 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1,8 +1,5 @@
-/**
- * Created by u203395 on 04.07.2014.
- */
-suite('Bärneruhr', function () {
+suite('Bärneruhr', function() {
     "use strict";
-    test('dummy', function () {
+    test('dummy', function() {
     });
 });
\ No newline at end of file

From 9abfc597869e3c39bef4f3ecc61c39d2402f6983 Mon Sep 17 00:00:00 2001
From: Manuel Friedli 
Date: Tue, 26 Aug 2014 17:50:33 +0200
Subject: [PATCH 2/3] incremented the version

---
 VERSION           | 2 +-
 manifest.appcache | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index 0faee7d..ebfa5e0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.3
+6.3.1_rc1
diff --git a/manifest.appcache b/manifest.appcache
index 92edca5..9e547bd 100644
--- a/manifest.appcache
+++ b/manifest.appcache
@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# 6.3
+# 6.3.1_rc1
 
 css/uhr.css
 css/uhr-black.css

From 3c22e2ab5f7d62d1428d8b8dbe43f9f56a621d2e Mon Sep 17 00:00:00 2001
From: Manuel Friedli 
Date: Tue, 26 Aug 2014 18:00:52 +0200
Subject: [PATCH 3/3] removed unnecessary options

---
 index.html | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/index.html b/index.html
index cd2a9e3..578d904 100644
--- a/index.html
+++ b/index.html
@@ -53,10 +53,7 @@ along with this program.  If not, see .
         var height = $(window).height();
         var size = Math.min(width, height) + 'px';
         $('#uhr').uhr({
-            width: size,
-            color: 'black',
-            language: 'de_CH',
-            controls: true
+            width: size
         });
     })(jQuery);