Merge branch 'dev' into sxw-dev

Conflicts:
	template/admin/admin.html

static/src/css/admin.css

@@ -1,25 +1,15 @@
+@import url("global.css");
 @import url("bootstrap/bootstrap.min.css");
 @import url("bootstrap/todc-bootstrap.min.css");
 @import url("codeMirror/codemirror.css");
 @import url("simditor/simditor.css");
 @import url("webuploader/webuploader.css");
 @import url("datetime_picker/bootstrap-datetimepicker.css");
-html, body {
-    height: 100%;
-}
 
-img {
-    max-width: 100%;
-    height: auto;
-}
-
-.footer {
-    padding-top: 30px;
-    padding-bottom: 30px;
-    float: bottom;
-    bottom: 0;
-}
-
-label {
-    font-size: 16px;
+#loading-gif{
+    width: 40px;
+    height: 40px;
+    margin: auto;
+    position: absolute;
+    top: 0; left: 0; bottom: 0; right: 0;
 }

static/src/css/global.css

@@ -0,0 +1,27 @@
+html{
+    height: 100%;
+}
+
+body{
+    height:100%; /*使内容高度和body一样*/
+    margin-bottom:-80px;/*向上缩减80像素，不至于footer超出屏幕可视范围*/
+}
+
+.main{
+    padding-bottom: 120px;
+}
+
+img {
+    max-width: 100%;
+    height: auto;
+}
+
+.footer {
+    left: 0;
+    right: 0;
+    height: 80px
+}
+
+label {
+    font-size: 16px;
+}

static/src/css/oj.css

@@ -1,25 +1,8 @@
+@import url("global.css");
 @import url("bootstrap/bootstrap.min.css");
 @import url("bootstrap/todc-bootstrap.min.css");
 @import url("codeMirror/codemirror.css");
-html, body {
-    height: 100%;
-}
 
-img {
-    max-width: 100%;
-    height: auto;
-}
-
-.footer {
-    padding-top: 30px;
-    padding-bottom: 30px;
-    float: bottom;
-    bottom: 0;
-}
-
-label {
-    font-size: 16px;
-}
 
 #language-selector {
     width: 130px;
@@ -47,7 +30,6 @@ label {
     font-size: 15px;
 }
 
-/* index css */
 .jumbotron {
     text-align: center;
     background-color: transparent;

static/src/js/app/admin/admin.js

@@ -7,25 +7,36 @@ define("admin", ["jquery", "avalon"], function($, avalon){
         $(".list-group-item").attr("class", "list-group-item");
     }
 
+    function show_template(url){
+        $("#loading-gif").show();
+        vm.template_url = url;
+    }
+
+    var vm = avalon.define({
+        $id: "admin",
+        template_url: "template/index/index.html",
+        hide_loading: function(){
+            $("#loading-gif").hide();
+        }
+    });
+
     var hash = window.location.hash.substring(1);
 
     if(hash){
-        li_active("#li-" + hash);
+        li_active("#li-" + hash.replace("/", "-"));
+        show_template("template/" + hash + ".html");
     }else {
-        li_active("#li-index");
+        li_active("#li-index-index");
     }
 
     window.onhashchange = function() {
         var hash = window.location.hash.substring(1);
         if(hash){
             li_inactive(".list-group-item");
-            li_active("#li-" + hash);
-            vm.template_url = "template/index/" + hash + ".html";
+            li_active("#li-" + hash.replace("/", "-"));
+            show_template("template/" + hash + ".html");
         }
     };
 
-    var vm = avalon.define({
-        $id: "admin",
-        template_url: "template/index/index.html"
-    });
+
 });

static/src/js/app/admin/contest/contest.js

@@ -2,6 +2,7 @@ require(["jquery", "avalon", "editor", "uploader", "datetimepicker",
         "validation"
     ],
     function ($, avalon, editor, uploader) {
+        avalon.vmodels.add_contest = null;
         $("#add-contest-form")
             .formValidation({
                 framework: "bootstrap",