Merge branch 'dev' into hohoTT-dev

Conflicts:
	template/src/oj/submission/my_submissions_list.html

template/src/oj/group/group.html

@@ -0,0 +1,40 @@
+{% extends 'oj_base.html' %}
+
+{% block body %}
+<div class="container main">
+    <ul class="nav nav-tabs nav-tabs-google">
+        <li role="presentation" class="active">
+            <a href="/group/{{ group.id }}/">详细信息</a></li>
+        <li role="presentation"><a href="/group/{{ group.id }}/applications/">我的申请</a></li>
+    </ul>
+    <h2 class="text-center">{{ group.name }}</h2>
+
+    <p class="text-muted text-center">发布时间 : {{ group.create_time }}&nbsp;&nbsp;
+        创建者 : {{ group.admin }}
+    </p>
+
+    <div>
+        <div class="group-section">
+            <label class="group-label">描述</label>
+
+            <p class="group-detail">{{ group.description|safe }}</p>
+        </div>
+    </div>
+    <hr>
+    <div>
+        {% if group.join_group_setting %}
+        <div class="form-group">
+            <input id="groupId" value="{{ group.id }" type="hidden">
+            <label>申请信息</label>
+            <textarea class="form-control" id="applyMessage" rows="10"></textarea>
+        </div>
+        {% endif %}
+        <div class="form-group">
+            <button class="btn btn-primary" id="sendApplication">申请加入</button>
+        </div>
+    </div>
+</div>
+{% endblock %}
+{% block js_block %}
+<script src="/static/js/app/oj/group/group.js"></script>
+{% endblock %}

template/src/oj/group/my_application.html

@@ -0,0 +1,26 @@
+{% extends 'oj_base.html' %}
+
+{% block body %}
+
+<div class="container main">
+    <ul class="nav nav-tabs nav-tabs-google">
+        <li role="presentation">
+            <a href="/group/{{ application.group.id }}/">详细信息</a></li>
+        <li role="presentation" class="active">
+            <a href="/group/{{ application.group.id }}/applications/">我的申请</a>
+        </li>
+    </ul>
+    <label>内容</label>
+    <p>{{ application.message|safe }}</p>
+    <label>结果</label>
+    {% if application.status %}
+        {% if application.accepted %}
+            <p>管理员接受了你的请求</p>
+        {% else %}
+            <p>管理员拒绝了你的请求</p>
+        {% endif %}
+    {% else %}
+        <p>待审核</p>
+    {% endif %}
+</div>
+{% endblock %}

template/src/oj/group/my_application_list.html

@@ -0,0 +1,44 @@
+{% extends 'oj_base.html' %}
+
+{% block body %}
+
+<div class="container main">
+    <ul class="nav nav-tabs nav-tabs-google">
+        <li role="presentation">
+            <a href="/group/{{ group.id }}/">详细信息</a></li>
+        <li role="presentation" class="active">
+            <a href="/group/{{ group.id }}/applications/">我的申请</a></li>
+    </ul>
+    {% if applications %}
+    <table class="table table-bordered">
+        <thead>
+        <tr>
+            <th>#</th>
+            <th>提交时间</th>
+            <th>结果</th>
+        </tr>
+        </thead>
+        <tbody>
+        {% for item in applications %}
+        <tr>
+            <th scope="row"><a href="/group/application/{{ item.id }}/">{{ forloop.counter }}</a></th>
+            <td>{{ item.create_time }}</td>
+            {% if item.status %}
+                {% if item.accepted %}
+                    <td class="alert-success">通过</td>
+                {% else %}
+                    <td class="alert-danger">拒绝</td>
+                {% endif %}
+            {% else %}
+                <td class="alert-warning">未处理</td>
+            {% endif %}
+        </tr>
+        {% endfor %}
+
+        </tbody>
+    </table>
+    {% else %}
+    <p>你还没有申请该小组</p>
+    {% endif %}
+</div>
+{% endblock %}

template/src/oj/index.html

@@ -8,71 +8,65 @@
     <link rel="stylesheet" type="text/css" href="/static/css/fullpage/jquery.fullPage.css">
     <style>
         html, textarea, input, option, select, button {
-        font: 1em "Helvetica Neue", Helvetica, "Lantinghei SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑",
-        "STHeiti", "WenQuanYi Micro Hei", SimSun, sans-serif;
-        color: #FFF;
+            font: 1em "Helvetica Neue", Helvetica, "Lantinghei SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑",
+            "STHeiti", "WenQuanYi Micro Hei", SimSun, sans-serif;
+            color: #FFF;
         }
 
         a {
-        text-decoration: none;
-        color: #FFF;
+            text-decoration: none;
+            color: #FFF;
         }
 
         #header {
-        position: fixed;
-        height: 30px;
-        display: block;
-        width: 100%;
-        background: transparent;
-        z-index: 10;
-        padding: 20px 20px 0 20px;
+            position: fixed;
+            height: 30px;
+            display: block;
+            width: 100%;
+            background: transparent;
+            z-index: 10;
+            padding: 20px 20px 0 20px;
         }
 
         #name {
-        font-size: 45px;
-        margin-right: 20px;
+            font-size: 45px;
+            margin-right: 20px;
         }
 
-        #nav-left{
-        display: inline;
-        position:relative;
-        float: right;
-        margin-right: 28px;
-        }
         .section {
-        position: relative;
+            position: relative;
         }
 
         .section h1 {
-        font-size: 60px;
+            font-size: 60px;
         }
 
         .section h3 {
-        font-size: 30px;
-        font-weight: normal;
+            font-size: 30px;
+            font-weight: normal;
         }
 
         .bottom-pointer {
-        top: auto;
-        bottom: 20px;
-        position: absolute;
-        left: 48%;
+            top: auto;
+            bottom: 20px;
+            position: absolute;
+            left: 48%;
         }
 
         .index-section-text {
-        position: absolute;
-        top: 30%;
-        width: 100%;
-        text-align: center;
+            position: absolute;
+            top: 30%;
+            width: 100%;
+            text-align: center;
         }
 
         .section-text {
-        text-align: center;
+            text-align: center;
         }
 
         .icon {
-        max-height: 300px;
-        max-width: 300px;
+            max-height: 300px;
+            max-width: 300px;
         }
 
     </style>
@@ -103,20 +97,7 @@
     <a href="/submissions/">提交</a>&nbsp;&nbsp;
     <a href="/contests/">比赛</a>&nbsp;&nbsp;
     <a href="/groups/">小组</a>&nbsp;&nbsp;
-    <a href="/about/">关于</a>&nbsp;&nbsp;
-    <div id="nav-left">
-        {% if request.user.is_authenticated %}
-        <a href="#">{{ request.user.username }}</a>
-        <a href="/logout/">退出</a>
-        {% else %}
-        <a href="/login/">
-            登录
-        </a>
-        <a href="/register/">
-            注册
-        </a>
-        {% endif %}
-    </div>
+    <a href="/about/">关于</a>
 
 
 </div>
@@ -124,9 +105,9 @@
 <div id="fullpage">
     <div class="section" id="section0">
         <div class="index-section-text animated bounceInUp">
-            <h1>青岛大学在线评测平台</h1>
+            <h1>青岛大学 Online Judge</h1>
 
-            <h3>全新面貌，新的开始~</h3>
+            <h3>新的面貌，新的开始~</h3>
         </div>
         <div class="bottom-pointer">↓继续滚动~</div>
     </div>
@@ -156,7 +137,7 @@
         <div class="section-text">
             <img class="icon" id="img3" src="/static/img/index/m.png">
 
-            <h1>自由举办小组赛</h1>
+            <h1>自由举办小组赛(10月上线)</h1>
 
             <h3>内部比赛，日常作业，期末考试，通通搞定</h3>
         </div>

template/src/oj/problem/problem.html

@@ -23,7 +23,7 @@
             <div class="problem-section">
                 <label class="problem-label">输出</label>
 
-                <p class="problem-detail">{{ problem.output_description }}k</p>
+                <p class="problem-detail">{{ problem.output_description }}</p>
             </div>
             {% for item in samples %}
                 <div class="problem-section">

template/src/oj/submission/my_submissions_list.html

@@ -46,7 +46,7 @@
             </thead>
             <tbody>
             {% for item in submissions %}
-            <tr class="{{ item.result|translate_result_class }}">
+            <tr>
                 <th scope="row"><a href="/submission/{{ item.id }}/" id="id_{{ forloop.counter }}">
                     {{ forloop.counter |add:start_id }}</a></th>
                 <td>{{ item.create_time }}</td>

template/src/oj_base.html

@@ -56,7 +56,7 @@
                         {{ request.user.username }}
                         <span class="caret"></span></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/submission/">我的提交</a></li>
+                        <li><a href="/submissions/">我的提交</a></li>
                         <li><a href="#">我的资料</a></li>
                         <li role="separator" class="divider"></li>
                         <li><a href="/logout/">退出</a></li>