Merge test

ChriZ982 · Dec 4, 2014 · 26df53c · 26df53c
2 parents 0bce05d + 69e7e68
commit 26df53c
Show file tree

Hide file tree

Showing 94 changed files with 18,609 additions and 902 deletions.
diff --git a/Data/TEMPLATE heute morgen.html b/Data/TEMPLATE heute morgen.html
@@ -15,11 +15,11 @@
                 else
                 {
                     window.scrollTo(0, 0);
-                    if (reloadcounter < 4)
+                    if (reloadcounter < 5)
                         reloadcounter = reloadcounter + 1;
                     else
                     {
-                        window.history.go(0);
+                        location.reload(true);
                         reloadcounter = 0;
                     }
                 }
@@ -35,18 +35,18 @@
 
         <title>Vertretungsplan</title>
         <link rel="stylesheet" type="text/css" href="style.css">
-        <meta charset="utf-8">
+        <meta charset="ISO-8859-1">
     </head>
     <body class="body1" onLoad="start()">
 
         <script type="text/javascript">
             body();
-            
-            window.scrollBy(0,10);
-            
-            if(window.pageYOffset != 0)
+
+            window.scrollBy(0, 10);
+
+            if (window.pageYOffset != 0)
                 body();
-            
+
             function body()
             {
                 document.open();
@@ -58,7 +58,7 @@
                         '</table>' +
                         '' +
                         VERTRETUNGEN
-                        'generated of a program made by Christopher Zinda and Mirko Rüther <br/><br/>' +
+                        'generated of a program made by Christopher Zinda and Mirko Rüther <br/><br/>' +
                         '');
                 document.close();
             }

diff --git a/Data/TEMPLATE laufschrift.html b/Data/TEMPLATE laufschrift.html
@@ -2,7 +2,7 @@
     <head>
         <title>Vertretungsplan - Laufschrift</title>
         <link rel="stylesheet" type="text/css" href="style.css">
-        <meta charset="utf-8">
+        <meta charset="ISO-8859-1">
     </head>
     <body class="body2">
     <marquee scrollamount="GESCHW" scrolldelay="1">

diff --git a/Data/VERTRETUNGSPLAN.html b/Data/VERTRETUNGSPLAN.html
@@ -2,7 +2,7 @@
     <head>
         <title>Vertretungsplan - Gymnasium Antonianum</title>
         <link rel="stylesheet" type="text/css" href="style.css">
-        <meta charset="utf-8">
+        <meta charset="ISO-8859-1">
     </head>
     <frameset class="frames" frameborder="0" rows="90%,10%">
         <frameset cols="50%,50%">