Merge branch 'split' into develop

client/run.py

@@ -0,0 +1,9 @@
+from flask import Flask, render_template
+app = Flask(__name__)
+
+@app.route("/")
+def index():
+    return render_template("index.html")
+
+if __name__ == "__main__":
+    app.run()

static/css/style.less → client/static/css/style.less

@@ -237,60 +237,62 @@ div.room {
 div.room_select {
     border:1px solid @darkish;
 	color: @dark;
+}
+div.listcontainer {
+    background: @light;
+    width:100%;
+    height:100px;
+    margin:10px 0px 10px 0px;
+    overflow-y:auto;
+    border:1px solid @gray;
+
+    .listcontainer_loading {
+        color: @dark;
+        text-align:center;
+        margin:40px auto 0px auto;
+        text-weight:400;
+    }
+}
 
-    div.listcontainer {
-        background: @light;
-        width:100%;
-        height:100px;
-        margin:10px 0px 10px 0px;
-        overflow-y:auto;
-        border:1px solid @gray;
-
-        #loading_list {
-            color: @dark;
-            text-align:center;
-            margin:40px auto 0px auto;
-            text-weight:400;
+table.listcontainer_list {
+    background:@light;
+    width:100%;
+    vertical-align:top;
+    margin:0px;
+    border-spacing:0px;
+
+    tr {
+        td {
+            padding:10px;
+            cursor:pointer;
+            border-bottom:1px solid @gray;
         }
     }
 
-    table.gridlist {
-        background:@light;
-        width:100%;
-        vertical-align:top;
-        margin:0px;
-        border-spacing:0px;
-
-        tr {
-            td {
-                padding:10px;
-                cursor:pointer;
-                border-bottom:1px solid @gray;
-            }
-            td:first-child {
-                width:75%;
-                font-weight:400;
-                font-size:18px;
-            }
-            td:last-child {
-                font-size:12px;
-                color:@darkish;
-                text-align:right;
-            }
-        }
+    tr:last {
+        border-bottom:0px;
+    }
+
+    tr:hover {
+        background:@gray;
+    }
 
-        tr:last {
-            border-bottom:0px;
-        }
-
-        tr:hover {
-            background:@gray;
-        }
+    tr.selected {
+        background:@blue;
+        color:@light;
+    }
+}
 
-        tr:active, tr.selected {
-            background:@blue;
-            color:@light;
-        }
+#gridList {
+    td:first-child {
+        width:75%;
+        font-weight:400;
+        font-size:18px;
+    }
+    td:last-child {
+        font-size:12px;
+        color:@darkish;
+        text-align:right;
     }
 }
 
@@ -313,6 +315,28 @@ div.room_create {
 	}
 }
 
+div.server_browser {
+    z-index: 4;
+
+    .server_browser_other {
+        display: none;
+    }
+}
+
+.connection {
+    position: fixed;
+    bottom: 0px;
+    right: 0px;
+    padding: 5px;
+
+    font-size: 12px;
+    display: none;
+
+    span {
+        font-family: monospace;
+    }
+}
+
 div.screen {
 	background:#000;
 	opacity:.2;

static/js/GameClient.js → client/static/js/GameClient.js

@@ -67,14 +67,9 @@ var GameClient = (function() {
     }
 
     function newGrid(data) {
-        $("#loading_list").hide();
-        $("<tr><td>"+ data['name'] +"</td><td>"+ data['players'] +" players</td></tr>")
-            .appendTo(".gridlist")
-            .data("gid", data['gid'])
-            .data("active", data['active'])
-            .data("name", data['name'])
-            .data("size", data['size']);
-        HomeView.setupList();
+        if(ViewController.current != HomeView) return;
+        ViewController.current.grids[data['gid']] = data;
+        ViewController.current.gridList.addItem([data['name'], data['players'] + " players"], data['gid']);
     }
 
 	return {