Merge branch 'develop' into feature/new-splashscreen

2014-09-03 15:31:04 +02:00 · 2014-09-03 15:31:04 +02:00 · a0ca6228e2
parent 851c5cbddd 5f6f67cfef
commit a0ca6228e2
12 changed files with 32 additions and 85 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-6.3.1
+6.3.3
--- a/index.html
+++ b/index.html
@ -46,11 +46,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    <script type="text/javascript" src="js/uhr-en.js"></script>
    <script type="text/javascript" src="js/uhr-fr.js"></script>
    <script type="text/javascript" src="js/uhr-it.js"></script>
+    <script type="text/javascript">
+        function go(url) {
+            window.location = url;
+            return true;
+        }
+    </script>
 </head>
 <body style="padding:0;margin:0;">
 <div id="uhr"></div>
 <p id="disclaimer">Created by <a href="http://www.fritteli.ch/">fritteli</a>, inspired by <a href="http://www.qlocktwo.com/">QLOCKTWO</a>. <a
-        href="info/">Read more!</a> - <a href="showcase">View full showcase!</a></p>
+        onclick="go('info/')" href="#">Read more!</a></p>
 <script type="text/javascript">
    (function($) {
        var width = $(window).width();
--- a/info/index.html
+++ b/info/index.html
@ -27,6 +27,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    <script type="text/javascript" src="../lib/jquery-cookie-1.4.0.js"></script>
    <script type="text/javascript" src="../js/uhr.js"></script>
    <script type="text/javascript" src="../js/uhr-de_CH.js"></script>
+    <script type="text/javascript">
+        function go(url) {
+            window.location = url;
+            return true;
+        }
+    </script>
 </head>
 <body>
 <h1 id="main-title">Die Zeit im Wort</h1>
@ -59,10 +65,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    Website einbauen kannst. Denn das darfst du gerne tun, solange du
    dich dabei an die Regeln der <a href="#license">Lizenz</a> hältst.</p>

-<p><a href="..">Das interessiert mich nicht, ich will zurück zur grossen Uhr!</a></p>
+<p><a onclick="go('../')" href="#">Das interessiert mich nicht, ich will zurück zur grossen Uhr!</a></p>

 <h2 id="the-clock">Die Uhr<a href="#toc" class="toclink">Zum Inhalt</a></h2>
-<a href="../">
+<a onclick="go('../')" href="#">
    <div id="uhr1"></div>
 </a>

@ -191,7 +197,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    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.</p>

-<p>Der Quellcode ist frei zugänglich unter <a href="https://git.friedli.info/manuel/uhr">https://git.friedli.info/manuel/uhr</a>.</p>
+<p>Der Quellcode ist frei zugänglich unter <a href="https://gittr.ch/manuel/uhr">https://gittr.ch/manuel/uhr</a>.</p>

 <h2 id="license">Lizenzbestimmungen<a href="#toc" class="toclink">Zum Inhalt</a></h2>

--- 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 <http://www.gnu.org/licenses/>.
 */
-(function() {
+(function($) {
    'use strict';
    var es_ist = {1: [1, 2, 4, 5, 6]};
    var uhr = {10: [9, 10, 11]};
@ -71,4 +71,4 @@
        }
    };
    $.fritteli.uhr.register('de', layout);
-}());
+}(jQuery));
--- 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 <http://www.gnu.org/licenses/>.
 */
-(function() {
+(function($) {
    'use strict';
    var vorne0 = {
        3: [2, 3, 4],
@ -244,4 +244,4 @@
        }
    };
    $.fritteli.uhr.register('de_CH_seconds', layout);
-}());
+}(jQuery));
--- 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 <http://www.gnu.org/licenses/>.
 */
-(function() {
+(function($) {
    'use strict';
 // hilfsvariablen
    var es_isch = {1: [1, 2, 4, 5, 6, 7]};
@ -94,4 +94,4 @@
    };
 // Das Layout bei der Uhr unter dem Code "de_CH" registrieren.
    $.fritteli.uhr.register('de_CH', layout);
-}());
+}(jQuery));
--- 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 <http://www.gnu.org/licenses/>.
 */
-(function() {
+(function($) {
    'use strict';
    var es_isch = {1: [1, 2, 4, 5, 6, 7]};
    var genau = {3: [7, 8, 9, 10, 11]};
@ -69,4 +69,4 @@
        }
    };
    $.fritteli.uhr.register('de_CH_genau', layout);
-}());
+}(jQuery));
--- 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 <http://www.gnu.org/licenses/>.
 */
-(function() {
+(function($) {
    'use strict';
    var it_is = {1: [1, 2, 4, 5]};
    var half = {4: [1, 2, 3, 4]};
@ -78,4 +78,4 @@
        }
    };
    $.fritteli.uhr.register('en', layout);
-}());
+}(jQuery));
--- 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 <http://www.gnu.org/licenses/>.
 */
-(function() {
+(function($) {
    'use strict';
    var il_est = {1: [1, 2, 4, 5, 6]};
    var et = {8: [1, 2]};
@ -112,4 +112,4 @@
        }
    };
    $.fritteli.uhr.register('fr', layout);
-}());
+}(jQuery));
--- 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 <http://www.gnu.org/licenses/>.
 */
-(function() {
+(function($) {
    'use strict';
    var sono_le = {1: [1, 2, 3, 4, 6, 7]};
    var e_l = {2: [1, 3, 4]};
@ -77,4 +77,4 @@
        }
    };
    $.fritteli.uhr.register('it', layout);
-}());
+}(jQuery));
--- a/manifest.appcache
+++ b/manifest.appcache
@ -1,5 +1,5 @@
 CACHE MANIFEST
-# 6.3.1
+# 6.3.3

 css/uhr.css
 css/uhr-black.css
@ -27,7 +27,6 @@ resources/close.png
 resources/favicon.png
 resources/settings.png
 resources/uhr.woff
-showcase/index.html
 COPYING
 README.md
 VERSION
--- a/showcase/index.html
+++ b/showcase/index.html
@ -1,64 +0,0 @@
-<!DOCTYPE html>
-<!--
-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 <http://www.gnu.org/licenses/>.
-->
-<html manifest="../manifest.appcache">
-<head>
-    <title>Bärneruhr - Die Zeit im Wort: Showcase</title>
-    <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
-    <meta name="apple-mobile-web-app-capable" content="yes"/>
-    <meta name="apple-mobile-web-app-status-bar-style" content="black"/>
-    <meta name="apple-mobile-web-app-title" content="Bärneruhr"/>
-    <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1"/>
-    <link rel="stylesheet" type="text/css" href="../css/uhr.css"/>
-    <link rel="stylesheet" type="text/css" href="../css/uhr-black.css" data-class="black" data-name="Schwarz"/>
-    <link rel="stylesheet" type="text/css" href="../css/uhr-white.css" data-class="white" data-name="Weiss"/>
-    <link rel="stylesheet" type="text/css" href="../css/uhr-red.css" data-class="red" data-name="Rot"/>
-    <link rel="stylesheet" type="text/css" href="../css/uhr-green.css" data-class="green" data-name="Grün"/>
-    <link rel="stylesheet" type="text/css" href="../css/uhr-yellow.css" data-class="yellow" data-name="Gelb"/>
-    <link rel="stylesheet" type="text/css" href="../css/uhr-blue.css" data-class="blue" data-name="Blau"/>
-    <link rel="stylesheet" type="text/css" href="../css/uhr-pink.css" data-class="pink" data-name="Pink"/>
-    <link rel="shortcut icon" type="image/png" href="../resources/favicon.png"/>
-    <link rel="apple-touch-icon-precomposed" href="../resources/apple-touch-icon-precomposed.png"/>
-    <script type="text/javascript" src="../lib/jquery-2.1.0.min.js"></script>
-    <script type="text/javascript" src="../lib/jquery-ui-1.10.4.custom.min.js"></script>
-    <script type="text/javascript" src="../lib/jquery-cookie-1.4.0.js"></script>
-    <script type="text/javascript" src="../js/uhr.js"></script>
-</head>
-<body style="padding:0;margin:0;">
-<div id="uhr"></div>
-<p><a href="..">Go back to the main page</a></p>
-<script type="text/javascript" src="../js/uhr-de_CH.js"></script>
-<script type="text/javascript" src="../js/uhr-de_CH_genau.js"></script>
-<script type="text/javascript" src="../js/uhr-de_CH-seconds.js"></script>
-<script type="text/javascript" src="../js/uhr-de.js"></script>
-<script type="text/javascript" src="../js/uhr-en.js"></script>
-<script type="text/javascript" src="../js/uhr-fr.js"></script>
-<script type="text/javascript" src="../js/uhr-it.js"></script>
-<script type="text/javascript">
-    (function($) {
-        var width = $(window).width();
-        var height = $(window).height() - 150;
-        var size = Math.min(width, height);
-        if (size < 200) {
-            size = 200;
-        }
-        $('#uhr').uhr({
-            width: size + 'px',
-            language: 'de_CH'
-        });
-    })(jQuery);
-</script>
-</body>
-</html>
 @ -1 +1 @@
 .3.1
 .3.3