Merge branch 'master' into 2.0

.github/issue_template.md

@@ -1,6 +1,6 @@
 在提交issue之前请
 
-  - 认真阅读文档 http://qingdaou.github.io/OnlineJudge/
+  - 认真阅读文档 https://github.com/QingdaoU/OnlineJudge/wiki
   - 搜索和查看历史issues
  
 然后提交issue请写清楚下列事项

static/src/js/app/oj/problem/problem.js

@@ -126,7 +126,7 @@ require(["jquery", "codeMirror", "csrfToken", "bsAlert", "ZeroClipboard"],
                     }
                 },
                 error: function(){
-                    bsAlert("额 好像出错了，请刷新页面重试。如还有问题，请填写页面导航栏上的反馈。")
+                    bsAlert("额 好像出错了，请刷新页面重试。")
                 }
             })
         }
@@ -261,7 +261,10 @@ require(["jquery", "codeMirror", "csrfToken", "bsAlert", "ZeroClipboard"],
             success: function (data) {
                 if (data.code) {
                     $("#submit-code-button").attr("disabled", "disabled");
-                    $("#result").html('<div class="alert alert-danger" role="alert"><div class="alert-link">请先<a href="/login/" target="_blank">登录</a>!</div> </div>');
+                    $("#result").html('<div class="alert alert-danger" role="alert">' +
+                        '<div class="alert-link">请先' +
+                        '<a href="/login/?__from=' + location.pathname + '" target="_blank">' +
+                        '登录</a>!</div> </div>');
                 }
                 else{
                     userId = data.data.id;

template/src/oj/problem/problem_list.html

@@ -9,7 +9,7 @@
             <div class="col-md-9 col-lg-9">
                 <div class="row">
                     <div class="right">
-                        <form class="form-inline" method="get">
+                        <form class="form-inline" method="get" action="/problems/">
                             <div class="form-group-sm">
                                 <input name="keyword" class="form-control" value="{{ keyword }}" placeholder="请输入关键词">
                                 <input type="submit" value="搜索" class="btn btn-primary">