removed vue => reverted...

removed vue => reverted def71bd4...80e81b47

languages/de.py

@@ -83,6 +83,7 @@
 'Introduction': 'Einführung',
 'Invalid Query': 'Ungültige Query',
 'invalid request': 'Ungültiger Request',
+'Invalid WebSocket data received': 'Invalid WebSocket data received',
 'Key': 'Schlüssel',
 'Layout': 'Layout',
 'Live Chat': 'Live Chat',
@@ -109,6 +110,8 @@
 'Play': 'Play',
 'Please choose a different name': 'Please choose a different name',
 'Please provide valid values': 'Please provide valid values',
+'Please refresh this website': 'Please refresh this website',
+'Please wait for the game to start': 'Please wait for the game to start',
 'Plugins': 'Plugins',
 'Powered by': 'Unterstützt von',
 'Preface': 'Allgemeines',
@@ -142,6 +145,7 @@
 'Table': 'Tabelle',
 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'Die "query" ist eine Bedingung wie "db.tabelle1.feld1==\'wert\'". So etwas wie "db.tabelle1.feld1==db.tabelle2.feld2" resultiert in einem SQL JOIN.',
 'The Core': 'Der Core',
+'The game has already started': 'The game has already started',
 'The output of the file is a dictionary that was rendered by the view %s': 'Die Ausgabe der Datei ist ein "dictionary", welches vom "view" %s gerendert wurde',
 'The Views': 'Die Views',
 'This App': 'Diese App',
@@ -155,10 +159,14 @@
 'Users': 'Benutzer',
 'Videos': 'Videos',
 'View': 'Ansicht',
+'WebSocket has closed': 'WebSocket has closed',
+'WebSocket is not supported by your browser': 'WebSocket is not supported by your browser',
+'WebSocket server is not responding': 'WebSocket server is not responding',
 'Welcome to web2py!': 'Willkommen bei web2py!',
 'Which called the function %s located in the file %s': 'Welche die Funktion %s in der Datei %s aufrief',
 'Working...': 'Arbeite...',
 'You are successfully running web2py': 'web2py wird erfolgreich ausgeführt',
 'You can modify this application and adapt it to your needs': 'Sie können diese Anwendung verändern und Ihren Bedürfnissen anpassen',
 'You visited the url %s': 'Sie haben die URL %s besucht',
+'Your assigned role has no render target': 'Your assigned role has no render target',
 }

views/default/login.html

 {{include 'include/popup.html'}}
 
-<form id="form_login" @submit.prevent="submitLogin">
-    <input type="text" id="room_code" placeholder="{{=T('Enter Room Code')}}" maxlength="4" v-model="room_code"><br><br>
-    <input type="text" id="user_name" placeholder="{{=T('Enter your Name')}}" maxlength="15" v-model="user_name"><br><br>
+<form id="form_login">
+    <input type="text" id="room_code" placeholder="{{=T('Enter Room Code')}}" maxlength="4"><br><br>
+    <input type="text" id="user_name" placeholder="{{=T('Enter your Name')}}" maxlength="15"><br><br>
     <input type="submit" value="{{=T('Play')}}">
 </form>
 
-<script>
-
+<script type="text/javascript">
+    //Header setzen
     HEADER_SET("", "Lynchburg", "");
-
-    var app = new Vue({
-  el: "#form_login",
-  data: {
-    room_code: "",
-    user_name: "",
-  },
-  methods: {
-    //Bei Klick auf den Submit Button (oder Enter) wird diese Methode ausgeführt.
-    submitLogin() {
-      //Entfernt die Anzeige der bisherigen Fehler
-      set_error();
-      //Die eingegebenen Daten werden in ein Object gepackt, um sie zu versenden
-      var payload = { room_code: this.room_code, user_name: this.user_name };
-      //Es wird eine JSON Anfrage mit den Login Daten gesendet.
+    //Bei Absenden des Formulars...
+    $("#form_login").on("submit", function(){
+        //Entfernt die Anzeige der bisherigen Fehler
+        set_error();
+        //Die eingegebenen Daten werden in ein Object gepackt, um sie zu versenden
+        var payload = {"room_code": $("#room_code").val(), "user_name": $("#user_name").val()}
+        //Es wird eine JSON Anfrage mit den Login Daten gesendet.
       //Falls die Anfrage erfolgreich war, wird der neue Content geladen, sonst eine Fehlermeldung angezeigt.
-      AJAX_JSON("{{=URL('player', 'create')}}", payload, function (_code, _data) {
-        switch (_code) {
-          case 200:
-            content_reload();
-            break;
-          case 404:
-            set_error("{{=T('Room not found or full')}}.");
-            break;
-          case 409:
-            set_error("{{=T('Please choose a different name')}}.");
-            break;
-          case 410:
-            set_info("{{=T('The game has already started')}}.");
-            break;
-          case 422:
-            set_error("{{=T('Please provide valid values')}}.");
-            break;
-          case 500:
-            set_error("500 - Internal Server Error");
-            break;
-          default:
-            set_error("{{=T('Error')}} " + _code);
-        }
-      });
+        AJAX_JSON("{{=URL('player', 'create')}}", payload, function(_code, _data){
+
+            switch(_code){
+                case 200:
+                    content_reload();
+                    break;
+                case 404:
+                    set_error("{{=T('Room not found or full')}}.");
+                    break;
+                case 409:
+                    set_error("{{=T('Please choose a different name')}}.");
+                    break;
+                case 422:
+                    set_error("{{=T('Please provide valid values')}}.");
+                    break;
+                case 500:
+                    set_error("500 - Internal Server Error");
+                    break;
+                default:
+                    set_error("{{=T('Error')}} "+_code);
+            }
 
-      return false;
-    },
-  },
-});
+        });
+        //This is relevant. Do not remove.
+        return false;
+    });
 </script>

views/layout.html

@@ -5,7 +5,6 @@
         <link rel="stylesheet" type="text/css" href="{{=URL('static/css', 'base.css')}}">
         <script src="{{=URL('static','js/jquery.js')}}" type="text/javascript"></script>
         <script src="{{=URL('static','js/ajax.js')}}" type="text/javascript"></script>
-        <script src="{{=URL('static','js/vue.js')}}" type="text/javascript"></script>
         <script type="text/javascript">
             function HEADER_SET(_left, _middle, _right) {
                 $("#header_left").html(_left);