From 2d7d1bd9f76176ae81970f64e0ccb9540b9a62d1 Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Sat, 12 Sep 2015 21:56:32 +0800
Subject: [PATCH 01/17] delete debug script

---
 Accessories/__init__.py |  1 -
 Accessories/reJudge.py  | 74 -----------------------------------------
 Accessories/utils.py    | 61 ---------------------------------
 3 files changed, 136 deletions(-)
 delete mode 100644 Accessories/__init__.py
 delete mode 100644 Accessories/reJudge.py
 delete mode 100755 Accessories/utils.py

diff --git a/Accessories/__init__.py b/Accessories/__init__.py
deleted file mode 100644
index 3ed9fd0..0000000
--- a/Accessories/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__author__ = 'root'
diff --git a/Accessories/reJudge.py b/Accessories/reJudge.py
deleted file mode 100644
index dc1ad2e..0000000
--- a/Accessories/reJudge.py
+++ /dev/null
@@ -1,74 +0,0 @@
-import django
-from contest.models import *
-from problem.models import *
-from submission.models import Submission
-
-import redis
-
-from judge.judger_controller.tasks import judge
-from judge.judger_controller.settings import redis_config
-
-django.setup()
-
-
-def rejudge(submission):
-    # for submission in submission:
-    #   submission_id = submission.id
-    #  try:
-    #     command = "%s run -t -i --privileged --rm=true " \
-    #              "-v %s:/var/judger/test_case/ " \
-    #             "-v %s:/var/judger/code/ " \
-    #            "%s " \
-    #           "python judge/judger/run.py " \
-    #          "--solution_id %s --time_limit %s --memory_limit %s --test_case_id %s" % \
-    #         (docker_config["docker_path"],
-    #         test_case_dir,
-    #        source_code_dir,
-    #       docker_config["image_name"],
-    #      submission_id, str(time_limit), str(memory_limit), test_case_id)
-    # subprocess.call(command, shell=docker_config["shell"])
-    # except Exception as e:
-    #     print e
-    return
-
-
-def easy_rejudge(submissions, map_table, user_id, contest_id=None):
-    try:
-        user = User.objects.get(pk=user_id)
-    except User.DoesNotExist:
-        print "User.DoesNotExist!"
-        return
-    problemDict = {}
-    for oldSubmission in submission:
-        problem_id = map_table[oldSubmission.problem_id]
-
-        if problem_id in problemDict:
-            problem = problemDict[problem_id]
-        else:
-            try:
-                p = Problem.objects.get(pk=problem_id)
-            except Problem.DoesNotExist:
-                print " Problem.DoesNotExist!" + str(problem_id)
-                continue
-            problem = p
-            problemDict[problem_id] = p
-
-        submission = Submission.objects.create(
-            user_id=user_id,
-            language=oldSubmission.language,
-            code=oldSubmission.code,
-            contest_id=contest_id,
-            problem_id=problem_id,
-            originResult=oldSubmission.result
-        )
-        try:
-            judge.delay(submission.id, problem.time_limit, problem.memory_limit, problem.test_case_id)
-        except Exception:
-            print "error!"
-            continue
-            
-        r = redis.Redis(host=redis_config["host"], port=redis_config["port"], db=redis_config["db"])
-        r.incr("judge_queue_length")
-
-    return
-
diff --git a/Accessories/utils.py b/Accessories/utils.py
deleted file mode 100755
index 17ab096..0000000
--- a/Accessories/utils.py
+++ /dev/null
@@ -1,61 +0,0 @@
-import django
-from contest.models import *
-from problem.models import *
-django.setup()
-def add_exist_problem_to_contest(problems, contest_id):
-    try:
-        contest = Contest.objects.get(pk=contest_id)
-    except Contest.DoesNotExist:
-        print "Contest Doesn't Exist!"
-        return
-    i = 1
-    for problem in problems:
-        print "Add the problem:"
-        print problem.title
-        print "The sort Index is" + str(i) + " You Can modify it latter as you like~"
-        ContestProblem.objects.create(contest=contest, sort_index=str(i),
-                              title=problem.title, description=problem.description,
-                              input_description=problem.input_description,
-                              output_description=problem.output_description,
-                              samples=problem.samples,
-                              test_case_id=problem.test_case_id,
-                              hint=problem.hint,
-                              created_by=problem.created_by,
-                              time_limit=problem.time_limit,
-                              memory_limit=problem.memory_limit)
-        i += 1
-    return
-def add_contest_problem_to_problem(contest_id):
-    try:
-        contest = Contest.objects.get(pk=contest_id)
-    except Contest.DoesNotExist:
-        print "Contest Doesn't Exist!"
-        return
-    #Get all problems in this contest
-    problems = ContestProblem.objects.filter(contest=contest)
-    
-    #get a tag
-    try:
-        tag = ProblemTag.objects.get(name=contest.title)
-    except ProblemTag.DoesNotExist:
-        tag = ProblemTag.objects.create(name=contest.title)
-        
-    #for each problem
-    for problem in problems:
-        print "Add problem to problem list:"
-        print problem.title
-        p = Problem.objects.create(title=problem.title, 
-                              description=problem.description,
-                              input_description=problem.input_description,
-                              output_description=problem.output_description,
-                              samples=problem.samples,
-                              test_case_id=problem.test_case_id,
-                              hint=problem.hint,
-                              created_by=problem.created_by,
-                              time_limit=problem.time_limit,
-                              memory_limit=problem.memory_limit,
-                              visible = False,
-                              difficulty = 0,
-                              source = contest.title)
-        p.tags.add(tag)
-    return
\ No newline at end of file

From 34246f734592ee3867a10365a2f639f1576d8139 Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Sun, 13 Sep 2015 10:58:48 +0800
Subject: [PATCH 02/17] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=88=B3=E7=9A=84=20Python=20=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/release/fis-conf.js | 13 ----------
 tools/static_md5.py        | 51 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 13 deletions(-)
 delete mode 100644 static/release/fis-conf.js
 create mode 100644 tools/static_md5.py

diff --git a/static/release/fis-conf.js b/static/release/fis-conf.js
deleted file mode 100644
index f0935c3..0000000
--- a/static/release/fis-conf.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * Created by virusdefender on 8/25/15.
- */
-
-fis.match('*.{js,css,png,gif}', {
-    useHash: true // 开启 md5 戳
-});
-
-fis.config.set(
-'roadmap.path',
-[{reg:'*.html',isHtmlLike : true}
-])
-;
\ No newline at end of file
diff --git a/tools/static_md5.py b/tools/static_md5.py
new file mode 100644
index 0000000..db1b281
--- /dev/null
+++ b/tools/static_md5.py
@@ -0,0 +1,51 @@
+# coding=utf-8
+import hashlib
+import re
+import os
+import shutil
+
+template_src_path = "template/src/"
+template_release_path = "template/release/"
+
+static_src_path = "static/src/"
+static_release_path = "static/release/"
+
+# 删除模板的 release 文件夹
+shutil.rmtree(template_release_path)
+# 复制一份模板文件夹到 release
+shutil.copytree(template_src_path, template_release_path)
+
+# 删除静态文件的 release 文件夹
+shutil.rmtree(static_release_path)
+# 复制一份静态文件文件夹到 release
+shutil.copytree(static_src_path, static_release_path)
+
+r = re.compile(r'<script src="(.+)"></script>')
+
+name_map = {}
+
+
+def do(match):
+    js_path = match.group(1).lstrip("/static/")
+
+    if not os.path.exists(static_release_path + js_path):
+        return match.group(0)
+
+    if js_path in name_map:
+        md5 = name_map[js_path]
+    else:
+        # rename
+        md5 = hashlib.md5(open(static_release_path + js_path, "r").read()).hexdigest()
+        os.rename(static_release_path + js_path, static_release_path + js_path + "?v=" + md5)
+    return '<script src="%s"></script>' % (js_path + "?v=" + md5,)
+
+
+for root, dirs, files in os.walk(template_release_path):
+    for name in files:
+        html_path = os.path.join(root, name)
+        html_content = open(html_path, "r").read()
+        replaced_html_content = re.sub(r, do, html_content)
+
+        f = open(html_path, "w")
+        f.write(replaced_html_content)
+        f.close()

From e6c9916a126b2361379123ae64c207f5edd93f9c Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Sun, 13 Sep 2015 11:47:12 +0800
Subject: [PATCH 03/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                 |  3 ++-
 oj/local_settings.py       |  2 +-
 template/src/oj/index.html |  2 +-
 template/src/oj_base.html  |  4 ----
 tools/static_md5.py        | 30 +++++++++++++++++++-----------
 5 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1fbe8ef..31d2215 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,4 +61,5 @@ static/release/img
 static/src/upload_image/*
 build.txt
 tmp/
-test_case/
\ No newline at end of file
+test_case/
+release/
\ No newline at end of file
diff --git a/oj/local_settings.py b/oj/local_settings.py
index 51e9095..e61ec9c 100644
--- a/oj/local_settings.py
+++ b/oj/local_settings.py
@@ -34,7 +34,7 @@ REDIS_CACHE = {
 DEBUG = True
 
 # 同理 这是 web 服务器的上传路径
-TEST_CASE_DIR =    os.path.join(BASE_DIR, 'test_case/')
+TEST_CASE_DIR = os.path.join(BASE_DIR, 'test_case/')
 
 ALLOWED_HOSTS = []
 
diff --git a/template/src/oj/index.html b/template/src/oj/index.html
index c8c1d8f..41f5d23 100644
--- a/template/src/oj/index.html
+++ b/template/src/oj/index.html
@@ -5,7 +5,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <title>青岛大学在线评测平台 - 首页</title>
 
-    <link rel="stylesheet" type="text/css" href="/static/css/fullpage/jquery.fullPage.css">
+    <link href="/static/css/fullpage/jquery.fullPage.css" rel="stylesheet">
     <link rel="shortcut icon" href="/static/img/favicon.ico">
     <style>
         html, textarea, input, option, select, button {
diff --git a/template/src/oj_base.html b/template/src/oj_base.html
index 0b69c63..b398976 100644
--- a/template/src/oj_base.html
+++ b/template/src/oj_base.html
@@ -86,10 +86,6 @@
 <script src="/static/js/require.js"></script>
 <script>
     require(["bootstrap"]);
-
-
-
-
 </script>
 {% block js_block %}{% endblock %}
 <!-- footer begin -->
diff --git a/tools/static_md5.py b/tools/static_md5.py
index db1b281..618863f 100644
--- a/tools/static_md5.py
+++ b/tools/static_md5.py
@@ -20,32 +20,40 @@ shutil.rmtree(static_release_path)
 # 复制一份静态文件文件夹到 release
 shutil.copytree(static_src_path, static_release_path)
 
-r = re.compile(r'<script src="(.+)"></script>')
+js_re = re.compile(r'<script src="(.+)"></script>')
+css_re = re.compile(r'<link href="(.+)" rel="stylesheet">')
 
 name_map = {}
 
 
-def do(match):
-    js_path = match.group(1).lstrip("/static/")
+def process(match):
+    file_path = match.group(1).replace("/static/", "")
+    # print file_path, match.group(), match.group(1)
 
-    if not os.path.exists(static_release_path + js_path):
+    if not os.path.exists(static_release_path + file_path):
         return match.group(0)
 
-    if js_path in name_map:
-        md5 = name_map[js_path]
+    if file_path in name_map:
+        md5 = name_map[file_path]
     else:
         # rename
-        md5 = hashlib.md5(open(static_release_path + js_path, "r").read()).hexdigest()
-        os.rename(static_release_path + js_path, static_release_path + js_path + "?v=" + md5)
-    return '<script src="%s"></script>' % (js_path + "?v=" + md5,)
+        md5 = hashlib.md5(open(static_release_path + file_path, "r").read()).hexdigest()
+        # os.rename(static_release_path + js_path, static_release_path + js_path + "?v=" + md5)
+    if ".js" in file_path:
+        return '<script src="/static/%s"></script>' % (file_path + "?v=" + md5[:6], )
+    elif ".css" in file_path:
+        return '<link rel="stylesheet" type="text/css" href="/static/%s">' % (file_path + "?v=" + md5[:6], )
+    else:
+        return match.group(0)
 
 
 for root, dirs, files in os.walk(template_release_path):
     for name in files:
         html_path = os.path.join(root, name)
         html_content = open(html_path, "r").read()
-        replaced_html_content = re.sub(r, do, html_content)
+        js_replaced_html_content = re.sub(js_re, process, html_content)
+        css_replaced_html_content = re.sub(css_re, process, js_replaced_html_content)
 
         f = open(html_path, "w")
-        f.write(replaced_html_content)
+        f.write(css_replaced_html_content)
         f.close()

From 7f70d46809cd44969d53f0330b908de70d06ca3c Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Sun, 13 Sep 2015 13:01:17 +0800
Subject: [PATCH 04/17] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=AF=94=E8=B5=9B?=
 =?UTF-8?q?=E6=8E=92=E5=90=8D=E9=A1=B5=E9=9D=A2=E5=AE=BD=E5=BA=A6=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/src/oj/contest/contest_rank.html | 60 ++++++++++++-----------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/template/src/oj/contest/contest_rank.html b/template/src/oj/contest/contest_rank.html
index ac2bb15..abd2d92 100644
--- a/template/src/oj/contest/contest_rank.html
+++ b/template/src/oj/contest/contest_rank.html
@@ -2,25 +2,25 @@
 {% block body %}
     {% load submission %}
     <div class="container main">
-        <div class="col-lg-12 contest-tab">
-            <ul class="nav nav-tabs nav-tabs-google">
-                <li role="presentation">
-                    <a href="/contest/{{ contest.id }}/">比赛详情</a>
-                </li>
-                <li role="presentation">
-                    <a href="/contest/{{ contest.id }}/problems/">题目</a>
-                </li>
-                <li role="presentation">
-                    <a href="/contest/{{ contest.id }}/submissions/">提交</a>
-                </li>
-                <li role="presentation" class="active">
-                    <a href="/contest/{{ contest.id }}/rank/">排名</a>
-                </li>
-            </ul>
-        </div>
+
+        <ul class="nav nav-tabs nav-tabs-google contest-tab">
+            <li role="presentation">
+                <a href="/contest/{{ contest.id }}/">比赛详情</a>
+            </li>
+            <li role="presentation">
+                <a href="/contest/{{ contest.id }}/problems/">题目</a>
+            </li>
+            <li role="presentation">
+                <a href="/contest/{{ contest.id }}/submissions/">提交</a>
+            </li>
+            <li role="presentation" class="active">
+                <a href="/contest/{{ contest.id }}/rank/">排名</a>
+            </li>
+        </ul>
+
         <div class="row">
-            <div class="col-lg-12">
-                {% if result %}
+
+            {% if result %}
                 <table class="table table-bordered">
                     <thead>
                     <tr>
@@ -50,22 +50,24 @@
                     {% endfor %}
                     </tbody>
                 </table>
-                    <input type="checkbox" id="auto-refresh" {% if auto_refresh %}checked{% endif %} onchange="if(this.checked){location.href='?auto_refresh=true'}else{location.href=location.href.split('?')[0]}"> 自动刷新
-                {% else %}
-                    <p>还没有结果</p>
-                {% endif %}
-            </div>
+                <input type="checkbox" id="auto-refresh" {% if auto_refresh %}checked{% endif %}
+                       onchange="if(this.checked){location.href='?auto_refresh=true'}else{location.href=location.href.split('?')[0]}">
+                自动刷新
+            {% else %}
+                <p>还没有结果</p>
+            {% endif %}
+
         </div>
     </div>
 {% endblock %}
 
 
 {% block js_block %}
-{% if auto_refresh %}
-    <script>
-    setTimeout(function(){
-        location.reload();
-    }, 5000);
-    </script>
+    {% if auto_refresh %}
+        <script>
+            setTimeout(function () {
+                location.reload();
+            }, 5000);
+        </script>
     {% endif %}
 {% endblock %}
\ No newline at end of file

From 4a506939d1ac6f834f368b2030d85a89197c8d52 Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Sun, 13 Sep 2015 13:01:38 +0800
Subject: [PATCH 05/17] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=AF=A6=E6=83=85=E6=98=BE=E7=A4=BA=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 submission/views.py                        | 3 ---
 template/src/oj/problem/my_submission.html | 3 +--
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/submission/views.py b/submission/views.py
index 19f3c29..e5c1af7 100644
--- a/submission/views.py
+++ b/submission/views.py
@@ -114,9 +114,6 @@ def my_submission(request, submission_id):
     except Submission.DoesNotExist:
         return error_page(request, u"提交不存在")
 
-    if submission.user_id != request.user.id and not submission.shared:
-        return error_page(request, u"提交不存在")
-
     if submission.contest_id:
         try:
             problem = ContestProblem.objects.get(id=submission.problem_id,
diff --git a/template/src/oj/problem/my_submission.html b/template/src/oj/problem/my_submission.html
index 634c789..04d6065 100644
--- a/template/src/oj/problem/my_submission.html
+++ b/template/src/oj/problem/my_submission.html
@@ -62,7 +62,6 @@
         <div id="code-field">
             <textarea id="code-editor">{{ submission.code }}</textarea>
         </div>
-    {% ifequal request.user.id submission.user_id %}
 
         <div id="share-code" class="col-lg-6 col-md-6">
             {% if submission.shared %}
@@ -74,7 +73,7 @@
                       {% if not submission.shared %}style="display: none" {% endif %}>{{ problem.title }}
 {{ request.build_absolute_uri }}</textarea>
         </div>
-    {% endifequal %}
+
 
     </div>
 

From 195761023986468422b2ee3b4336c61692576cd3 Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Sun, 13 Sep 2015 13:14:56 +0800
Subject: [PATCH 06/17] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9=E6=AF=94?=
 =?UTF-8?q?=E8=B5=9B=E6=8F=90=E4=BA=A4=E9=93=BE=E6=8E=A5=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E7=9A=84=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 contest_submission/views.py                   |  15 ++-
 template/src/oj/contest/submissions_list.html | 107 ++++++++--------
 .../oj/contest/submissions_list_admin.html    | 114 ------------------
 3 files changed, 63 insertions(+), 173 deletions(-)
 delete mode 100644 template/src/oj/contest/submissions_list_admin.html

diff --git a/contest_submission/views.py b/contest_submission/views.py
index 765d116..6c0edb3 100644
--- a/contest_submission/views.py
+++ b/contest_submission/views.py
@@ -120,12 +120,15 @@ def contest_problem_submissions_list_page(request, contest_id, page=1):
     except Exception:
         pass
 
-    # 如果该用户是超级管理员那么他可以查看所有的提交记录详情
-    if request.user.admin_type > 1:
-        return render(request, "oj/contest/submissions_list_admin.html",
-                      {"submissions": current_page, "page": int(page),
-                       "previous_page": previous_page, "next_page": next_page, "start_id": int(page) * 20 - 20,
-                       "contest": contest})
+    for item in current_page:
+        if item.user_id == request.user.id:
+            setattr(item, "show_link", True)
+        elif request.user.admin_type == SUPER_ADMIN or request.user:
+            setattr(item, "show_link", True)
+        elif request.user == contest.created_by:
+            setattr(item, "show_link", True)
+        else:
+            setattr(item, "show_link", False)
 
     return render(request, "oj/contest/submissions_list.html",
                   {"submissions": current_page, "page": int(page),
diff --git a/template/src/oj/contest/submissions_list.html b/template/src/oj/contest/submissions_list.html
index 1424bb1..973f2e2 100644
--- a/template/src/oj/contest/submissions_list.html
+++ b/template/src/oj/contest/submissions_list.html
@@ -21,58 +21,59 @@
                 </li>
             </ul>
         </div>
-            <table class="table table-bordered">
-                <thead>
-                <tr class="" success>
-                    <th>#</th>
-                    <th>题目名称</th>
-                    <th>用户</th>
-                    <th>提交时间</th>
-                    <th>
-                        <div class="dropdown">
-                            <a href="#" class="dropdown-toggle" id="languageFilter" data-toggle="dropdown"
-                               aria-haspopup="true" aria-expanded="true">
-                                语言<span class="caret"></span>
-                            </a>
-                            <ul class="dropdown-menu" aria-labelledby="languageFilter">
-                                <li><a href="/contest/{{ contest.id }}/submissions/?language=1">C</a></li>
-                                <li><a href="/contest/{{ contest.id }}/submissions/?language=2">C++</a></li>
-                                <li><a href="/contest/{{ contest.id }}/submissions/?language=3">Java</a></li>
-                                <li><a href="/contest/{{ contest.id }}/submissions/">取消筛选</a></li>
-                            </ul>
-                        </div>
-                    </th>
-                    <th>运行时间</th>
-                    <th>
-                        <div class="dropdown">
-                            <a href="#" class="dropdown-toggle" id="resultFilter" data-toggle="dropdown"
-                               aria-haspopup="true" aria-expanded="true">
-                                结果<span class="caret"></span>
-                            </a>
-                            <ul class="dropdown-menu" aria-labelledby="resultFilter">
-                                <li><a href="/contest/{{ contest.id }}/submissions/?result=0">Accepted</a></li>
-                                <li><a href="/contest/{{ contest.id }}/submissions/?result=6">Wrong Answer</a></li>
-                                <li><a href="/contest/{{ contest.id }}/submissions/?result=1">Runtime Error</a></li>
-                                <li><a href="/contest/{{ contest.id }}/submissions/?result=2">Time Limit Exceeded</a></li>
-                                <li><a href="/contest/{{ contest.id }}/submissions/?result=3">Memory Limit Exceeded</a></li>
-                                <li><a href="/contest/{{ contest.id }}/submissions/?result=4">Compile Error</a></li>
-                                <li><a href="/contest/{{ contest.id }}/submissions/?result=5">Format Error</a></li>
-                                <li><a href="/contest/{{ contest.id }}/submissions/">取消筛选</a></li>
-                            </ul>
-                        </div>
-                    </th>
-                </tr>
-                </thead>
-                {% if submissions %}
+        <table class="table table-bordered">
+            <thead>
+            <tr class="" success>
+                <th>#</th>
+                <th>题目名称</th>
+                <th>用户</th>
+                <th>提交时间</th>
+                <th>
+                    <div class="dropdown">
+                        <a href="#" class="dropdown-toggle" id="languageFilter" data-toggle="dropdown"
+                           aria-haspopup="true" aria-expanded="true">
+                            语言<span class="caret"></span>
+                        </a>
+                        <ul class="dropdown-menu" aria-labelledby="languageFilter">
+                            <li><a href="/contest/{{ contest.id }}/submissions/?language=1">C</a></li>
+                            <li><a href="/contest/{{ contest.id }}/submissions/?language=2">C++</a></li>
+                            <li><a href="/contest/{{ contest.id }}/submissions/?language=3">Java</a></li>
+                            <li><a href="/contest/{{ contest.id }}/submissions/">取消筛选</a></li>
+                        </ul>
+                    </div>
+                </th>
+                <th>运行时间</th>
+                <th>
+                    <div class="dropdown">
+                        <a href="#" class="dropdown-toggle" id="resultFilter" data-toggle="dropdown"
+                           aria-haspopup="true" aria-expanded="true">
+                            结果<span class="caret"></span>
+                        </a>
+                        <ul class="dropdown-menu" aria-labelledby="resultFilter">
+                            <li><a href="/contest/{{ contest.id }}/submissions/?result=0">Accepted</a></li>
+                            <li><a href="/contest/{{ contest.id }}/submissions/?result=6">Wrong Answer</a></li>
+                            <li><a href="/contest/{{ contest.id }}/submissions/?result=1">Runtime Error</a></li>
+                            <li><a href="/contest/{{ contest.id }}/submissions/?result=2">Time Limit Exceeded</a></li>
+                            <li><a href="/contest/{{ contest.id }}/submissions/?result=3">Memory Limit Exceeded</a></li>
+                            <li><a href="/contest/{{ contest.id }}/submissions/?result=4">Compile Error</a></li>
+                            <li><a href="/contest/{{ contest.id }}/submissions/?result=5">Format Error</a></li>
+                            <li><a href="/contest/{{ contest.id }}/submissions/">取消筛选</a></li>
+                        </ul>
+                    </div>
+                </th>
+            </tr>
+            </thead>
+            {% if submissions %}
                 <tbody>
                 {% for item in submissions %}
                     <tr>
-                        {% ifequal item.user_id request.user.id %}
-                            <th scope="row"><a href="/submission/{{ item.id }}/">
-                                {{ forloop.counter |add:start_id }}</a></th>
-                        {% else %}
-                            <th scope="row">{{ forloop.counter |add:start_id }}</th>
-                        {% endifequal %}
+                        <th scope="row">
+                            {% if item.show_link %}
+                                <a href="/submission/{{ item.id }}/">{{ forloop.counter |add:start_id }}</a>
+                            {% else %}
+                                {{ forloop.counter |add:start_id }}
+                            {% endif %}
+                        </th>
                         <th scope="row">
                             <a href="/contest/{{ item.contest_id }}/problem/{{ item.problem_id }}/">{{ item.title }}</a>
                         </th>
@@ -94,10 +95,10 @@
                     </tr>
                 {% endfor %}
                 </tbody>
-                {% else %}
-                    <p>本场比赛还没有提交记录</p>
-                {% endif %}
-            </table>
+            {% else %}
+                <p>本场比赛还没有提交记录</p>
+            {% endif %}
+        </table>
 
         <nav>
             <ul class="pager">
diff --git a/template/src/oj/contest/submissions_list_admin.html b/template/src/oj/contest/submissions_list_admin.html
deleted file mode 100644
index 8f1660b..0000000
--- a/template/src/oj/contest/submissions_list_admin.html
+++ /dev/null
@@ -1,114 +0,0 @@
-{% extends 'oj_base.html' %}
-
-{% block body %}
-
-    {% load submission %}
-    {% load user %}
-    <div class="container main">
-        <div class="contest-tab">
-            <ul class="nav nav-tabs nav-tabs-google">
-                <li role="presentation">
-                    <a href="/contest/{{ contest.id }}/">比赛详情</a>
-                </li>
-                <li role="presentation">
-                    <a href="/contest/{{ contest.id }}/problems/">题目</a>
-                </li>
-                <li role="presentation" class="active">
-                    <a href="/contest/{{ contest.id }}/submissions/">提交</a>
-                </li>
-                <li role="presentation">
-                    <a href="/contest/{{ contest.id }}/rank/">排名</a>
-                </li>
-            </ul>
-        </div>
-            <table class="table table-bordered">
-                <thead>
-                <tr class="" success>
-                    <th>#</th>
-                    <th>题目名称</th>
-                    <th>用户</th>
-                    <th>提交时间</th>
-                    <th>
-                        <div class="dropdown">
-                            <a href="#" class="dropdown-toggle" id="languageFilter" data-toggle="dropdown"
-                               aria-haspopup="true" aria-expanded="true">
-                                语言<span class="caret"></span>
-                            </a>
-                            <ul class="dropdown-menu" aria-labelledby="languageFilter">
-                                <li><a href="/contest/{{ contest.id }}/submissions/?language=1">C</a></li>
-                                <li><a href="/contest/{{ contest.id }}/submissions/?language=2">C++</a></li>
-                                <li><a href="/contest/{{ contest.id }}/submissions/?language=3">Java</a></li>
-                                <li><a href="/contest/{{ contest.id }}/submissions/">取消筛选</a></li>
-                            </ul>
-                        </div>
-                    </th>
-                    <th>运行时间</th>
-                    <th>
-                        <div class="dropdown">
-                            <a href="#" class="dropdown-toggle" id="resultFilter" data-toggle="dropdown"
-                               aria-haspopup="true" aria-expanded="true">
-                                结果<span class="caret"></span>
-                            </a>
-                            <ul class="dropdown-menu" aria-labelledby="resultFilter">
-                                <li><a href="/contest/{{ contest.id }}/submissions/?result=0">Accepted</a></li>
-                                <li><a href="/contest/{{ contest.id }}/submissions/?result=6">Wrong Answer</a></li>
-                                <li><a href="/contest/{{ contest.id }}/submissions/?result=1">Runtime Error</a></li>
-                                <li><a href="/contest/{{ contest.id }}/submissions/?result=2">Time Limit Exceeded</a></li>
-                                <li><a href="/contest/{{ contest.id }}/submissions/?result=3">Memory Limit Exceeded</a></li>
-                                <li><a href="/contest/{{ contest.id }}/submissions/?result=4">Compile Error</a></li>
-                                <li><a href="/contest/{{ contest.id }}/submissions/?result=5">Format Error</a></li>
-                                <li><a href="/contest/{{ contest.id }}/submissions/">取消筛选</a></li>
-                            </ul>
-                        </div>
-                    </th>
-                </tr>
-                </thead>
-                {% if submissions %}
-                <tbody>
-
-                {% for item in submissions %}
-                    <tr>
-                        <th scope="row"><a href="/submission/{{ item.id }}/">
-                                {{ forloop.counter |add:start_id }}</a></th>
-                        <th scope="row">
-                            <a href="/contest/{{ item.contest_id }}/problem/{{ item.problem_id }}/">{{ item.title }}</a>
-                        </th>
-                        <td>{{ item.user_id|get_username }}</td>
-                        <td>{{ item.create_time }}</td>
-                        <td>
-                            {{ item.language|translate_language }}
-                        </td>
-                        <td>
-                            {% if item.accepted_answer_time %}
-                                {{ item.accepted_answer_time }}ms
-                            {% else %}
-                                --
-                            {% endif %}
-                        </td>
-                        <td class="alert-{{ item.result|translate_result_class }}">
-                            <strong>{{ item.result|translate_result }}</strong>
-                        </td>
-                    </tr>
-                {% endfor %}
-                </tbody>
-                {% else %}
-                    <p>本场比赛还没有提交记录</p>
-                {% endif %}
-            </table>
-
-        <nav>
-            <ul class="pager">
-                {% if previous_page %}
-                    <li class="previous"><a
-                            href="/contest/{{ contest.id }}/submissions/{{ previous_page }}/{% if filter %}?{{ filter.name }}={{ filter.content }}{% endif %}">
-                        <span aria-hidden="true">&larr;</span> 上一页</a></li>
-                {% endif %}
-                {% if next_page %}
-                    <li class="next">
-                        <a href="/contest/{{ contest.id }}/submissions/{{ next_page }}/{% if filter %}?{{ filter.name }}={{ filter.content }}{% endif %}">
-                            下一页 <span aria-hidden="true">&rarr;</span></a></li>
-                {% endif %}
-            </ul>
-        </nav>
-    </div>
-{% endblock %}
\ No newline at end of file

From 59e22c723bc9d1308d0dd3835e710eea45f3cf69 Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Sun, 13 Sep 2015 14:10:06 +0800
Subject: [PATCH 07/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=AC=E5=91=8A?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 announcement/views.py | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/announcement/views.py b/announcement/views.py
index 818aa0a..6790e8c 100644
--- a/announcement/views.py
+++ b/announcement/views.py
@@ -16,8 +16,21 @@ def announcement_page(request, announcement_id):
     try:
         announcement = Announcement.objects.get(id=announcement_id, visible=True)
     except Announcement.DoesNotExist:
-        return error_page(request, u"模板不存在")
-    return render(request, "oj/announcement/announcement.html", {"announcement": announcement})
+        return error_page(request, u"公告不存在")
+    # 公开的公告
+    if announcement.is_global == 0:
+        return render(request, "oj/announcement/announcement.html", {"announcement": announcement})
+    else:
+        if not request.user.is_authenticated():
+            return error_page(request, u"公告不存在")
+        # 判断是不是在组里面
+        if request.user.admin_type == SUPER_ADMIN or request.user == announcement.created_by:
+            return render(request, "oj/announcement/announcement.html", {"announcement": announcement})
+        else:
+            if request.user.groups.filter(id__in=[item.id for item in announcement.groups.all()]).exists():
+                return render(request, "oj/announcement/announcement.html", {"announcement": announcement})
+            else:
+                return error_page(request, u"公告不存在")
 
 
 class AnnouncementAdminAPIView(APIView):

From 63d0cc37f8cb9558f42522546cd14a2891415d36 Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Sun, 13 Sep 2015 14:10:42 +0800
Subject: [PATCH 08/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=AF=94=E8=B5=9B?=
 =?UTF-8?q?=E9=A2=98=E7=9B=AE=E6=8F=90=E4=BA=A4=E5=88=97=E8=A1=A8=E7=9A=84?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 contest_submission/views.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/contest_submission/views.py b/contest_submission/views.py
index 6c0edb3..2358b07 100644
--- a/contest_submission/views.py
+++ b/contest_submission/views.py
@@ -121,14 +121,12 @@ def contest_problem_submissions_list_page(request, contest_id, page=1):
         pass
 
     for item in current_page:
-        if item.user_id == request.user.id:
-            setattr(item, "show_link", True)
-        elif request.user.admin_type == SUPER_ADMIN or request.user:
-            setattr(item, "show_link", True)
-        elif request.user == contest.created_by:
-            setattr(item, "show_link", True)
+        # 自己提交的 管理员和创建比赛的可以看到所有的提交链接
+        if item["user_id"] == request.user.id or request.user.admin_type == SUPER_ADMIN or \
+                        request.user == contest.created_by:
+            item["show_link"] = True
         else:
-            setattr(item, "show_link", False)
+            item["show_link"] = False
 
     return render(request, "oj/contest/submissions_list.html",
                   {"submissions": current_page, "page": int(page),

From ee4782b474c26be5fe47ac47856245caf0f30e93 Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Sun, 13 Sep 2015 16:29:48 +0800
Subject: [PATCH 09/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=BC=E5=86=99=20PA?=
 =?UTF-8?q?SSWORD=5FPUBLIC=5FCONTEST=20->=20PASSWORD=5FPROTECTED=5FCONTEST?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 contest/models.py |  3 +--
 contest/tests.py  | 45 +++++++++++++++++++++------------------------
 contest/views.py  | 27 ++++++++++++---------------
 3 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/contest/models.py b/contest/models.py
index 258ee19..d345c16 100644
--- a/contest/models.py
+++ b/contest/models.py
@@ -6,10 +6,9 @@ from account.models import User
 from problem.models import AbstractProblem
 from group.models import Group
 
-
 GROUP_CONTEST = 0
 PUBLIC_CONTEST = 1
-PASSWORD_PUBLIC_CONTEST = 2
+PASSWORD_PROTECTED_CONTEST = 2
 
 
 class Contest(models.Model):
diff --git a/contest/tests.py b/contest/tests.py
index 990913d..8875997 100644
--- a/contest/tests.py
+++ b/contest/tests.py
@@ -1,19 +1,16 @@
 # coding=utf-8
 import json
+
 from django.core.urlresolvers import reverse
 from django.test import TestCase, Client
-from django.http import HttpResponse
-
 from rest_framework.test import APITestCase, APIClient
 
 from account.models import User
 from group.models import Group
 from contest.models import Contest, ContestProblem
 from .models import ContestSubmission
-from .models import GROUP_CONTEST, PUBLIC_CONTEST, PASSWORD_PUBLIC_CONTEST
-from announcement.models import Announcement
+from .models import GROUP_CONTEST, PASSWORD_PROTECTED_CONTEST
 from account.models import REGULAR_USER, ADMIN, SUPER_ADMIN
-from decorators import check_user_contest_permission
 
 
 class ContestAdminAPITest(APITestCase):
@@ -36,13 +33,13 @@ class ContestAdminAPITest(APITestCase):
                                            join_group_setting=0, visible=True,
                                            admin=user1)
         self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1,
-                                                     contest_type=PASSWORD_PUBLIC_CONTEST, show_rank=True,
+                                                     contest_type=PASSWORD_PROTECTED_CONTEST, show_rank=True,
                                                      show_user_submission=True,
                                                      start_time="2015-08-15T10:00:00.000Z",
                                                      end_time="2015-08-15T12:00:00.000Z",
                                                      password="aacc", created_by=User.objects.get(username="test1"))
         self.group_contest = Contest.objects.create(title="titley", description="descriptiony", mode=1,
-                                                    contest_type=PASSWORD_PUBLIC_CONTEST, show_rank=True,
+                                                    contest_type=PASSWORD_PROTECTED_CONTEST, show_rank=True,
                                                     show_user_submission=True,
                                                     start_time="2015-08-15T10:00:00.000Z",
                                                     end_time="2015-08-15T12:00:00.000Z",
@@ -57,7 +54,7 @@ class ContestAdminAPITest(APITestCase):
 
     def test_global_contest_does_not_has_privileges(self):
         self.client.login(username="test2", password="testbb")
-        data = {"title": "title0", "description": "description0", "mode": 1, "contest_type": PASSWORD_PUBLIC_CONTEST,
+        data = {"title": "title0", "description": "description0", "mode": 1, "contest_type": PASSWORD_PROTECTED_CONTEST,
                 "show_rank": True, "show_user_submission": True, "start_time": "2015-08-15T10:00:00.000Z",
                 "end_time": "2015-08-15T12:00:00.000Z", "password": "aabb", "visible": True}
         response = self.client.post(self.url, data=data)
@@ -65,7 +62,7 @@ class ContestAdminAPITest(APITestCase):
 
     def test_global_contest_password_exists(self):
         self.client.login(username="test1", password="testaa")
-        data = {"title": "title0", "description": "description0", "mode": 1, "contest_type": PASSWORD_PUBLIC_CONTEST,
+        data = {"title": "title0", "description": "description0", "mode": 1, "contest_type": PASSWORD_PROTECTED_CONTEST,
                 "show_rank": True, "show_user_submission": True, "start_time": "2015-08-15T10:00:00.000Z",
                 "end_time": "2015-08-15T12:00:00.000Z", "visible": True}
         response = self.client.post(self.url, data=data)
@@ -81,7 +78,7 @@ class ContestAdminAPITest(APITestCase):
 
     def test_global_contest_successfully(self):
         self.client.login(username="test1", password="testaa")
-        data = {"title": "title1", "description": "description1", "mode": 1, "contest_type": PASSWORD_PUBLIC_CONTEST,
+        data = {"title": "title1", "description": "description1", "mode": 1, "contest_type": PASSWORD_PROTECTED_CONTEST,
                 "show_rank": True, "show_user_submission": True, "start_time": "2015-08-15T10:00:00.000Z",
                 "end_time": "2015-08-15T12:00:00.000Z", "password": "aabb", "visible": True}
         response = self.client.post(self.url, data=data)
@@ -105,7 +102,7 @@ class ContestAdminAPITest(APITestCase):
 
     def test_time_error(self):
         self.client.login(username="test1", password="testaa")
-        data = {"title": "title2", "description": "description2", "mode": 1, "contest_type": PASSWORD_PUBLIC_CONTEST,
+        data = {"title": "title2", "description": "description2", "mode": 1, "contest_type": PASSWORD_PROTECTED_CONTEST,
                 "show_rank": True, "show_user_submission": True, "start_time": "2015-08-15T12:00:00.000Z",
                 "end_time": "2015-08-15T10:00:00.000Z", "password": "aabb", "visible": True}
         response = self.client.post(self.url, data=data)
@@ -113,7 +110,7 @@ class ContestAdminAPITest(APITestCase):
 
     def test_contest_has_exists(self):
         self.client.login(username="test1", password="testaa")
-        data = {"title": "titlex", "description": "descriptionx", "mode": 1, "contest_type": PASSWORD_PUBLIC_CONTEST,
+        data = {"title": "titlex", "description": "descriptionx", "mode": 1, "contest_type": PASSWORD_PROTECTED_CONTEST,
                 "show_rank": True, "show_user_submission": True, "start_time": "2015-08-15T10:00:00.000Z",
                 "end_time": "2015-08-15T12:00:00.000Z", "password": "aabb", "visible": True}
         response = self.client.post(self.url, data=data)
@@ -129,7 +126,7 @@ class ContestAdminAPITest(APITestCase):
     def test_contest_does_not_exist(self):
         self.client.login(username="test1", password="testaa")
         data = {"id": self.global_contest.id + 10, "title": "title2", "description": "description2", "mode": 1,
-                "contest_type": PASSWORD_PUBLIC_CONTEST, "show_rank": True, "show_user_submission": True,
+                "contest_type": PASSWORD_PROTECTED_CONTEST, "show_rank": True, "show_user_submission": True,
                 "start_time": "2015-08-15T10:00:00.000Z", "end_time": "2015-08-15T12:00:00.000Z", "password": "aabb",
                 "visible": True}
         response = self.client.put(self.url, data=data)
@@ -138,7 +135,7 @@ class ContestAdminAPITest(APITestCase):
     def test_edit_global_contest_successfully(self):
         self.client.login(username="test1", password="testaa")
         data = {"id": self.global_contest.id, "title": "titlez", "description": "descriptionz", "mode": 1,
-                "contest_type": PASSWORD_PUBLIC_CONTEST, "show_rank": True, "show_user_submission": True,
+                "contest_type": PASSWORD_PROTECTED_CONTEST, "show_rank": True, "show_user_submission": True,
                 "start_time": "2015-08-15T10:00:00.000Z", "end_time": "2015-08-15T13:00:00.000Z", "password": "aabb",
                 "visible": True}
         response = self.client.put(self.url, data=data)
@@ -178,7 +175,7 @@ class ContestAdminAPITest(APITestCase):
     def test_edit_contest_has_exists(self):
         self.client.login(username="test1", password="testaa")
         data = {"id": self.global_contest.id, "title": "titley", "description": "descriptiony", "mode": 1,
-                "contest_type": PASSWORD_PUBLIC_CONTEST, "show_rank": True, "show_user_submission": True,
+                "contest_type": PASSWORD_PROTECTED_CONTEST, "show_rank": True, "show_user_submission": True,
                 "start_time": "2015-08-15T10:00:00.000Z", "end_time": "2015-08-15T12:00:00.000Z", "password": "aabb",
                 "visible": True}
         response = self.client.put(self.url, data=data)
@@ -187,7 +184,7 @@ class ContestAdminAPITest(APITestCase):
     def test_edit_global_contest_does_not_has_privileges(self):
         self.client.login(username="test2", password="testbb")
         data = {"id": self.global_contest.id, "title": "titlexxxxxxxxx", "description": "descriptionxxxxxx", "mode": 1,
-                "contest_type": PASSWORD_PUBLIC_CONTEST, "show_rank": True, "show_user_submission": True,
+                "contest_type": PASSWORD_PROTECTED_CONTEST, "show_rank": True, "show_user_submission": True,
                 "start_time": "2015-08-15T10:00:00.000Z", "end_time": "2015-08-15T12:00:00.000Z", "password": "aabb",
                 "visible": True}
         response = self.client.put(self.url, data=data)
@@ -196,7 +193,7 @@ class ContestAdminAPITest(APITestCase):
     def test_edit_global_contest_password_exists(self):
         self.client.login(username="test1", password="testaa")
         data = {"id": self.global_contest.id, "title": "title0", "description": "description0", "mode": 1,
-                "contest_type": PASSWORD_PUBLIC_CONTEST, "show_rank": True, "show_user_submission": True, "start_time": "2015-08-15T10:00:00.000Z",
+                "contest_type": PASSWORD_PROTECTED_CONTEST, "show_rank": True, "show_user_submission": True, "start_time": "2015-08-15T10:00:00.000Z",
                 "end_time": "2015-08-15T12:00:00.000Z", "visible": True}
         response = self.client.put(self.url, data=data)
         self.assertEqual(response.data, {"code": 1, "data": u"此比赛为有密码的公开赛，密码不可为空"})
@@ -204,7 +201,7 @@ class ContestAdminAPITest(APITestCase):
     def test_edit_time_error(self):
         self.client.login(username="test1", password="testaa")
         data = {"id": self.global_contest.id, "title": "titleaaaa", "description": "descriptionaaaaa", "mode": 1,
-                "contest_type": PASSWORD_PUBLIC_CONTEST, "show_rank": True, "show_user_submission": True,
+                "contest_type": PASSWORD_PROTECTED_CONTEST, "show_rank": True, "show_user_submission": True,
                 "start_time": "2015-08-15T12:00:00.000Z", "end_time": "2015-08-15T10:00:00.000Z", "password": "aabb",
                 "visible": True}
         response = self.client.put(self.url, data=data)
@@ -247,7 +244,7 @@ class ContestProblemAdminAPItEST(APITestCase):
         self.user3.save()
         self.client.login(username="test1", password="testaa")
         self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1,
-                                                     contest_type=PASSWORD_PUBLIC_CONTEST, show_rank=True,
+                                                     contest_type=PASSWORD_PROTECTED_CONTEST, show_rank=True,
                                                      show_user_submission=True,
                                                      start_time="2015-08-15T10:00:00.000Z",
                                                      end_time="2015-08-15T12:00:00.000Z",
@@ -417,7 +414,7 @@ class ContestPasswordVerifyAPITest(APITestCase):
         self.user2.save()
         self.client.login(username="test1", password="testaa")
         self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1,
-                                                     contest_type=PASSWORD_PUBLIC_CONTEST, show_rank=True,
+                                                     contest_type=PASSWORD_PROTECTED_CONTEST, show_rank=True,
                                                      show_user_submission=True,
                                                      start_time="2015-08-15T10:00:00.000Z",
                                                      end_time="2015-08-15T12:00:00.000Z",
@@ -457,7 +454,7 @@ class ContestPageTest(TestCase):
         self.user1.save()
         self.client.login(username="test1", password="testaa")
         self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1,
-                                                     contest_type=PASSWORD_PUBLIC_CONTEST, show_rank=True,
+                                                     contest_type=PASSWORD_PROTECTED_CONTEST, show_rank=True,
                                                      show_user_submission=True,
                                                      start_time="2015-08-15T10:00:00.000Z",
                                                      end_time="2015-08-15T12:00:00.000Z",
@@ -481,7 +478,7 @@ class ContestProblemPageTest(TestCase):
         self.user1.save()
         self.client.login(username="test1", password="testaa")
         self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1,
-                                                     contest_type=PASSWORD_PUBLIC_CONTEST, show_rank=True,
+                                                     contest_type=PASSWORD_PROTECTED_CONTEST, show_rank=True,
                                                      show_user_submission=True,
                                                      start_time="2015-08-15T10:00:00.000Z",
                                                      end_time="2015-08-15T12:00:00.000Z",
@@ -525,7 +522,7 @@ class ContestProblemListPageTest(TestCase):
         self.user1.save()
         self.client.login(username="test1", password="testaa")
         self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1,
-                                                     contest_type=PASSWORD_PUBLIC_CONTEST, show_rank=True,
+                                                     contest_type=PASSWORD_PROTECTED_CONTEST, show_rank=True,
                                                      show_user_submission=True,
                                                      start_time="2015-08-15T10:00:00.000Z",
                                                      end_time="2015-08-15T12:00:00.000Z",
@@ -562,7 +559,7 @@ class ContestListPageTest(TestCase):
         self.url = reverse('contest_list_page')
         self.client.login(username="test1", password="testaa")
         self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1,
-                                                     contest_type=PASSWORD_PUBLIC_CONTEST, show_rank=True,
+                                                     contest_type=PASSWORD_PROTECTED_CONTEST, show_rank=True,
                                                      show_user_submission=True,
                                                      start_time="2015-08-15T10:00:00.000Z",
                                                      end_time="2015-08-15T12:00:00.000Z",
diff --git a/contest/views.py b/contest/views.py
index ad5ccf7..9f2eab8 100644
--- a/contest/views.py
+++ b/contest/views.py
@@ -1,28 +1,25 @@
 # coding=utf-8
 import json
 import datetime
-from functools import wraps
-from django.utils.timezone import now
+
 from django.shortcuts import render
 from django.db import IntegrityError
 from django.utils import dateparse
-from django.db.models import Q, Count, Sum
+from django.db.models import Q, Sum
 from django.core.paginator import Paginator
 from rest_framework.views import APIView
-from utils.shortcuts import (serializer_invalid_response, error_response,
-                             success_response, paginate, rand_str, error_page)
 
-from account.models import REGULAR_USER, ADMIN, SUPER_ADMIN, User
+from utils.shortcuts import (serializer_invalid_response, error_response,
+                             success_response, paginate, error_page)
+from account.models import SUPER_ADMIN, User
 from account.decorators import login_required
 from group.models import Group
-from announcement.models import Announcement
-
 from .models import Contest, ContestProblem, ContestSubmission
-from .models import GROUP_CONTEST, PUBLIC_CONTEST, PASSWORD_PUBLIC_CONTEST
+from .models import GROUP_CONTEST, PUBLIC_CONTEST, PASSWORD_PROTECTED_CONTEST
 from .decorators import check_user_contest_permission
 from .serializers import (CreateContestSerializer, ContestSerializer, EditContestSerializer,
                           CreateContestProblemSerializer, ContestProblemSerializer,
-                          EditContestProblemSerializer, ContestPasswordVerifySerializer,
+                          ContestPasswordVerifySerializer,
                           EditContestProblemSerializer)
 
 
@@ -41,10 +38,10 @@ class ContestAdminAPIView(APIView):
             # 首先判断比赛的类型： 0 即为是小组赛(GROUP_CONTEST)，1 即为是无密码的公开赛(PUBLIC_CONTEST)，
             # 2 即为是有密码的公开赛(PASSWORD_PUBLIC_CONTEST)
             # 此时为有密码的公开赛，并且此时只能超级管理员才有权限此创建比赛
-            if data["contest_type"] in [PUBLIC_CONTEST, PASSWORD_PUBLIC_CONTEST]:
+            if data["contest_type"] in [PUBLIC_CONTEST, PASSWORD_PROTECTED_CONTEST]:
                 if request.user.admin_type != SUPER_ADMIN:
                     return error_response(u"只有超级管理员才可创建公开赛")
-            if data["contest_type"] == PASSWORD_PUBLIC_CONTEST:
+            if data["contest_type"] == PASSWORD_PROTECTED_CONTEST:
                 if not data["password"]:
                     return error_response(u"此比赛为有密码的公开赛，密码不可为空")
 
@@ -94,10 +91,10 @@ class ContestAdminAPIView(APIView):
                     return error_response(u"该比赛名称已经存在")
             except Contest.DoesNotExist:
                 pass
-            if data["contest_type"] in [PUBLIC_CONTEST, PASSWORD_PUBLIC_CONTEST]:
+            if data["contest_type"] in [PUBLIC_CONTEST, PASSWORD_PROTECTED_CONTEST]:
                 if request.user.admin_type != SUPER_ADMIN:
                     return error_response(u"只有超级管理员才可创建公开赛")
-            if data["contest_type"] == PASSWORD_PUBLIC_CONTEST:
+            if data["contest_type"] == PASSWORD_PROTECTED_CONTEST:
                 if not data["password"]:
                     return error_response(u"此比赛为有密码的公开赛，密码不可为空")
             elif data["contest_type"] == GROUP_CONTEST:
@@ -258,7 +255,7 @@ class ContestPasswordVerifyAPIView(APIView):
         if serializer.is_valid():
             data = request.data
             try:
-                contest = Contest.objects.get(id=data["contest_id"], contest_type=PASSWORD_PUBLIC_CONTEST)
+                contest = Contest.objects.get(id=data["contest_id"], contest_type=PASSWORD_PROTECTED_CONTEST)
             except Contest.DoesNotExist:
                 return error_response(u"比赛不存在")
 

From 8ab30a14665fd84dabce59fedeac5179d74b7273 Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Sun, 13 Sep 2015 16:30:09 +0800
Subject: [PATCH 10/17] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/src/utils/about.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/template/src/utils/about.html b/template/src/utils/about.html
index 8404beb..d917dc8 100644
--- a/template/src/utils/about.html
+++ b/template/src/utils/about.html
@@ -20,8 +20,7 @@
             </p>
 
             <p>
-                青岛大学 ACM 队是一支优秀的队伍，一支充满活力与激情的队伍，它满载着光辉与荣誉。在过去的几年里，集训队的队员曾代表我校多次
-                参加竞赛，获得了佳绩。
+                青岛大学 ACM 队是一支优秀的队伍，一支充满活力与激情的队伍，它满载着光辉与荣誉。在过去的几年里，集训队的队员曾代表我校多次参加竞赛，获得了佳绩。
             </p>
 
             <p>

From 228d8e05e74a2ba2413214272a823c0a7fb46895 Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Sun, 13 Sep 2015 16:30:40 +0800
Subject: [PATCH 11/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=BC=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 contest_submission/tests.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/contest_submission/tests.py b/contest_submission/tests.py
index a957619..cb44331 100644
--- a/contest_submission/tests.py
+++ b/contest_submission/tests.py
@@ -1,14 +1,15 @@
 # coding=utf-8
 import json
+
 from django.test import TestCase, Client
 from django.core.urlresolvers import reverse
-from account.models import User, REGULAR_USER, ADMIN, SUPER_ADMIN
-from problem.models import Problem
-from contest.models import Contest, ContestProblem
-from contest.models import GROUP_CONTEST, PUBLIC_CONTEST, PASSWORD_PUBLIC_CONTEST
-from submission.models import Submission
 from rest_framework.test import APITestCase, APIClient
 
+from account.models import User, REGULAR_USER, ADMIN, SUPER_ADMIN
+from contest.models import Contest, ContestProblem
+from contest.models import PUBLIC_CONTEST, PASSWORD_PROTECTED_CONTEST
+from submission.models import Submission
+
 
 class ContestSubmissionAPITest(APITestCase):
     def setUp(self):
@@ -107,7 +108,7 @@ class SubmissionAPITest(APITestCase):
         self.userS.set_password("testbb")
         self.userS.save()
         self.global_contest = Contest.objects.create(title="titlex", description="descriptionx", mode=1,
-                                                     contest_type=PASSWORD_PUBLIC_CONTEST, show_rank=True,
+                                                     contest_type=PASSWORD_PROTECTED_CONTEST, show_rank=True,
                                                      show_user_submission=True,
                                                      start_time="2015-08-15T10:00:00.000Z",
                                                      end_time="2015-08-15T12:00:00.000Z",

From 53098946fbd639598f747472224597af305301c5 Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Sun, 13 Sep 2015 19:43:49 +0800
Subject: [PATCH 12/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20js=20=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oj/account/{change_password.js => changePassword.js}    | 0
 .../oj/contest/{contest_password.js => contestPassword.js}  | 0
 static/src/js/app/oj/problem/problem_list.js                | 6 ------
 template/src/oj/account/change_password.html                | 2 +-
 template/src/oj/contest/contest_problems_list.html          | 2 +-
 template/src/oj/contest/no_contest_permission.html          | 2 +-
 template/src/oj/problem/problem_list.html                   | 2 +-
 7 files changed, 4 insertions(+), 10 deletions(-)
 rename static/src/js/app/oj/account/{change_password.js => changePassword.js} (100%)
 rename static/src/js/app/oj/contest/{contest_password.js => contestPassword.js} (100%)
 delete mode 100644 static/src/js/app/oj/problem/problem_list.js

diff --git a/static/src/js/app/oj/account/change_password.js b/static/src/js/app/oj/account/changePassword.js
similarity index 100%
rename from static/src/js/app/oj/account/change_password.js
rename to static/src/js/app/oj/account/changePassword.js
diff --git a/static/src/js/app/oj/contest/contest_password.js b/static/src/js/app/oj/contest/contestPassword.js
similarity index 100%
rename from static/src/js/app/oj/contest/contest_password.js
rename to static/src/js/app/oj/contest/contestPassword.js
diff --git a/static/src/js/app/oj/problem/problem_list.js b/static/src/js/app/oj/problem/problem_list.js
deleted file mode 100644
index 2219946..0000000
--- a/static/src/js/app/oj/problem/problem_list.js
+++ /dev/null
@@ -1,6 +0,0 @@
-require(["jquery", "avalon"], function($, avalon){
-    var vm = avalon.define({
-        $id: "problem_list",
-        problem_list: []
-    })
-});
\ No newline at end of file
diff --git a/template/src/oj/account/change_password.html b/template/src/oj/account/change_password.html
index d8099f5..ab9200d 100644
--- a/template/src/oj/account/change_password.html
+++ b/template/src/oj/account/change_password.html
@@ -34,5 +34,5 @@
     </div>
 {% endblock %}
 {% block js_block %}
-    <script src="/static/js/app/oj/account/change_password.js"></script>
+    <script src="/static/js/app/oj/account/changePassword.js"></script>
 {% endblock %}
\ No newline at end of file
diff --git a/template/src/oj/contest/contest_problems_list.html b/template/src/oj/contest/contest_problems_list.html
index 0d953b2..9457271 100644
--- a/template/src/oj/contest/contest_problems_list.html
+++ b/template/src/oj/contest/contest_problems_list.html
@@ -78,5 +78,5 @@
 {% endblock %}
 
 {% block js_block %}
-<script src="/static/js/app/oj/problem/problem_list.js"></script>
+
 {% endblock %}
\ No newline at end of file
diff --git a/template/src/oj/contest/no_contest_permission.html b/template/src/oj/contest/no_contest_permission.html
index 615db62..07c18b6 100644
--- a/template/src/oj/contest/no_contest_permission.html
+++ b/template/src/oj/contest/no_contest_permission.html
@@ -37,5 +37,5 @@
     </div>
 {% endblock %}
 {% block js_block %}
-    <script src="/static/js/app/oj/contest/contest_password.js"></script>
+    <script src="/static/js/app/oj/contest/contestPassword.js"></script>
 {% endblock %}
\ No newline at end of file
diff --git a/template/src/oj/problem/problem_list.html b/template/src/oj/problem/problem_list.html
index 0af942d..7a9b1dc 100644
--- a/template/src/oj/problem/problem_list.html
+++ b/template/src/oj/problem/problem_list.html
@@ -89,5 +89,5 @@
 {% endblock %}
 
 {% block js_block %}
-    <script src="/static/js/app/oj/problem/problem_list.js"></script>
+
 {% endblock %}
\ No newline at end of file

From fa5ae9c7ceeb3effcf827d1958548588c184c619 Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Sun, 13 Sep 2015 19:44:02 +0800
Subject: [PATCH 13/17] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20js=20=E5=8E=8B?=
 =?UTF-8?q?=E7=BC=A9=E5=92=8C=E8=AF=86=E5=88=AB=E5=B7=A5=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tools/{static_md5.py => release_static.py} |  0
 tools/template_js_path.py                  | 38 ++++++++++++++++++++++
 2 files changed, 38 insertions(+)
 rename tools/{static_md5.py => release_static.py} (100%)
 create mode 100644 tools/template_js_path.py

diff --git a/tools/static_md5.py b/tools/release_static.py
similarity index 100%
rename from tools/static_md5.py
rename to tools/release_static.py
diff --git a/tools/template_js_path.py b/tools/template_js_path.py
new file mode 100644
index 0000000..1b92be5
--- /dev/null
+++ b/tools/template_js_path.py
@@ -0,0 +1,38 @@
+# coding=utf-8
+import hashlib
+import re
+import os
+import shutil
+
+template_src_path = "template/src/"
+
+total_file = []
+module_list = []
+
+print "\n\n-------------\n\n"
+print u"        //以下都是页面 script 标签引用的js"
+for root, dirs, files in os.walk(template_src_path):
+    for name in files:
+        html_path = os.path.join(root, name)
+        html_content = open(html_path, "r").read()
+        r = re.search(re.compile('<script src="(.*)"></script>'), html_content)
+
+        if r:
+            for item in r.groups():
+                if item and "app" in item:
+                    total_file.append(item)
+
+i = 0
+for item in set(total_file):
+    module_name = item.replace("/static/js/", "").split("/")[-1].replace(".js", "") + "_" + str(i)
+
+    module_list.append(module_name)
+    print "        " + module_name + "_pack" + ": \"" + item.replace("/static/js/", "").replace(".js", "") + "\","
+    i += 1
+
+print "\n\n-------------\n\n"
+
+for item in module_list:
+    print "        {"
+    print "            name: \"" + item + "_pack\""
+    print "        },"

From 9ad52b5c5f375ea6dff6c1340f79c047250073ef Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Sun, 13 Sep 2015 20:08:33 +0800
Subject: [PATCH 14/17] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20js=20=E6=89=93?=
 =?UTF-8?q?=E5=8C=85=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/src/js/build.js  | 83 +++++++++++++++++++++++++++++++++++++----
 static/src/js/config.js | 25 ++++++++++++-
 tools/release_static.py |  4 +-
 3 files changed, 100 insertions(+), 12 deletions(-)

diff --git a/static/src/js/build.js b/static/src/js/build.js
index ddd9bb3..7bbdaf4 100644
--- a/static/src/js/build.js
+++ b/static/src/js/build.js
@@ -1,9 +1,8 @@
 ({
 	// RequireJS 通过一个相对的路径 baseUrl来加载所有代码。baseUrl通常被设置成data-main属性指定脚本的同级目录。
-	baseUrl: "/static/js/",
+	baseUrl: "./js",
 	// 第三方脚本模块的别名,jquery比libs/jquery-1.11.1.min.js简洁明了；
     paths: {
-
         jquery: "lib/jquery/jquery",
         avalon: "lib/avalon/avalon",
         editor: "utils/editor",
@@ -21,6 +20,7 @@
         bootstrap: "lib/bootstrap/bootstrap",
         datetimePicker: "lib/datetime_picker/bootstrap-datetimepicker.zh-CN",
         validator: "lib/validator/validator",
+        ZeroClipboard: "lib/ZeroClipboard/ZeroClipboard",
 
 
         // ------ 下面写的都不要直接用，而是使用上面的封装版本 ------
@@ -37,7 +37,29 @@
         //百度webuploader -> uploader
         webUploader: "lib/webuploader/webuploader",
 
-        "_datetimePicker": "lib/datetime_picker/bootstrap-datetimepicker"
+        "_datetimePicker": "lib/datetime_picker/bootstrap-datetimepicker",
+
+        //以下都是页面 script 标签引用的js
+        addProblem_0_pack: "app/admin/problem/addProblem",
+        addContest_1_pack: "app/admin/contest/addContest",
+        problem_2_pack: "app/admin/problem/problem",
+        register_3_pack: "app/oj/account/register",
+        contestList_4_pack: "app/admin/contest/contestList",
+        group_5_pack: "app/oj/group/group",
+        editProblem_6_pack: "app/admin/problem/editProblem",
+        announcement_7_pack: "app/admin/announcement/announcement",
+        monitor_8_pack: "app/admin/monitor/monitor",
+        groupDetail_9_pack: "app/admin/group/groupDetail",
+        problem_10_pack: "app/oj/problem/problem",
+        submissionList_11_pack: "app/admin/problem/submissionList",
+        editProblem_12_pack: "app/admin/contest/editProblem",
+        joinGroupRequestList_13_pack: "app/admin/group/joinGroupRequestList",
+        changePassword_14_pack: "app/oj/account/changePassword",
+        group_15_pack: "app/admin/group/group",
+        submissionList_16_pack: "app/admin/contest/submissionList",
+        login_17_pack: "app/oj/account/login",
+        contestPassword_18_pack: "app/oj/contest/contestPassword",
+        userList_19_pack: "app/admin/user/userList",
     },
     shim: {
         bootstrap: {deps: ["jquery"]},
@@ -50,19 +72,64 @@
     dir: "../../release/",
     modules: [
         {
-            name: "submit_code"
+            name: "addProblem_0_pack"
         },
         {
-            name: "validation"
+            name: "addContest_1_pack"
         },
         {
-            name: "editor"
+            name: "problem_2_pack"
         },
         {
-            name: "code_mirror"
+            name: "register_3_pack"
         },
         {
-            name: "datetimepicker"
+            name: "contestList_4_pack"
+        },
+        {
+            name: "group_5_pack"
+        },
+        {
+            name: "editProblem_6_pack"
+        },
+        {
+            name: "announcement_7_pack"
+        },
+        {
+            name: "monitor_8_pack"
+        },
+        {
+            name: "groupDetail_9_pack"
+        },
+        {
+            name: "problem_10_pack"
+        },
+        {
+            name: "submissionList_11_pack"
+        },
+        {
+            name: "editProblem_12_pack"
+        },
+        {
+            name: "joinGroupRequestList_13_pack"
+        },
+        {
+            name: "changePassword_14_pack"
+        },
+        {
+            name: "group_15_pack"
+        },
+        {
+            name: "submissionList_16_pack"
+        },
+        {
+            name: "login_17_pack"
+        },
+        {
+            name: "contestPassword_18_pack"
+        },
+        {
+            name: "userList_19_pack"
         }
     ]
 })
\ No newline at end of file
diff --git a/static/src/js/config.js b/static/src/js/config.js
index 0d25b3d..8a4c51e 100644
--- a/static/src/js/config.js
+++ b/static/src/js/config.js
@@ -2,7 +2,6 @@ var require = {
     // RequireJS 通过一个相对的路径 baseUrl来加载所有代码。baseUrl通常被设置成data-main属性指定脚本的同级目录。
     baseUrl: "/static/js/",
     paths: {
-
         jquery: "lib/jquery/jquery",
         avalon: "lib/avalon/avalon",
         editor: "utils/editor",
@@ -37,7 +36,29 @@ var require = {
         //百度webuploader -> uploader
         webUploader: "lib/webuploader/webuploader",
 
-        "_datetimePicker": "lib/datetime_picker/bootstrap-datetimepicker"
+        "_datetimePicker": "lib/datetime_picker/bootstrap-datetimepicker",
+
+        //以下都是页面 script 标签引用的js
+        addProblem_0_pack: "app/admin/problem/addProblem",
+        addContest_1_pack: "app/admin/contest/addContest",
+        problem_2_pack: "app/admin/problem/problem",
+        register_3_pack: "app/oj/account/register",
+        contestList_4_pack: "app/admin/contest/contestList",
+        group_5_pack: "app/oj/group/group",
+        editProblem_6_pack: "app/admin/problem/editProblem",
+        announcement_7_pack: "app/admin/announcement/announcement",
+        monitor_8_pack: "app/admin/monitor/monitor",
+        groupDetail_9_pack: "app/admin/group/groupDetail",
+        problem_10_pack: "app/oj/problem/problem",
+        submissionList_11_pack: "app/admin/problem/submissionList",
+        editProblem_12_pack: "app/admin/contest/editProblem",
+        joinGroupRequestList_13_pack: "app/admin/group/joinGroupRequestList",
+        changePassword_14_pack: "app/oj/account/changePassword",
+        group_15_pack: "app/admin/group/group",
+        submissionList_16_pack: "app/admin/contest/submissionList",
+        login_17_pack: "app/oj/account/login",
+        contestPassword_18_pack: "app/oj/contest/contestPassword",
+        userList_19_pack: "app/admin/user/userList"
     },
     shim: {
         bootstrap: {deps: ["jquery"]},
diff --git a/tools/release_static.py b/tools/release_static.py
index 618863f..ffee461 100644
--- a/tools/release_static.py
+++ b/tools/release_static.py
@@ -16,9 +16,9 @@ shutil.rmtree(template_release_path)
 shutil.copytree(template_src_path, template_release_path)
 
 # 删除静态文件的 release 文件夹
-shutil.rmtree(static_release_path)
+# shutil.rmtree(static_release_path)
 # 复制一份静态文件文件夹到 release
-shutil.copytree(static_src_path, static_release_path)
+# shutil.copytree(static_src_path, static_release_path)
 
 js_re = re.compile(r'<script src="(.+)"></script>')
 css_re = re.compile(r'<link href="(.+)" rel="stylesheet">')

From 1d087089edfa92fb4ed8c9430fbee82f156aabc8 Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Mon, 14 Sep 2015 01:06:31 +0800
Subject: [PATCH 15/17] =?UTF-8?q?=E5=B0=86=E6=97=A7=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E6=94=B9=E5=86=99=E4=B8=BA=20AMD=20=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/src/js/app/admin/admin.js          |    2 +-
 static/src/js/lib/bootstrap/bootstrap.js  | 2364 +--------------------
 static/src/js/lib/bootstrap/dropdown.js   |  168 ++
 static/src/js/lib/bootstrap/modal.js      |  340 +++
 static/src/js/lib/bootstrap/transition.js |   62 +
 static/src/js/lib/validator/validator.js  |   11 +-
 template/src/admin/admin.html             |    4 +-
 7 files changed, 581 insertions(+), 2370 deletions(-)
 create mode 100644 static/src/js/lib/bootstrap/dropdown.js
 create mode 100644 static/src/js/lib/bootstrap/modal.js
 create mode 100644 static/src/js/lib/bootstrap/transition.js

diff --git a/static/src/js/app/admin/admin.js b/static/src/js/app/admin/admin.js
index e3e8545..878b9ca 100644
--- a/static/src/js/app/admin/admin.js
+++ b/static/src/js/app/admin/admin.js
@@ -1,4 +1,4 @@
-define("admin", ["jquery", "avalon"], function ($, avalon) {
+require(["jquery", "avalon", "bootstrap"], function ($, avalon) {
 
     avalon.ready(function () {
 
diff --git a/static/src/js/lib/bootstrap/bootstrap.js b/static/src/js/lib/bootstrap/bootstrap.js
index 5debfd7..fb914ec 100644
--- a/static/src/js/lib/bootstrap/bootstrap.js
+++ b/static/src/js/lib/bootstrap/bootstrap.js
@@ -1,2363 +1 @@
-/*!
- * Bootstrap v3.3.5 (http://getbootstrap.com)
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under the MIT license
- */
-
-if (typeof jQuery === 'undefined') {
-  throw new Error('Bootstrap\'s JavaScript requires jQuery')
-}
-
-+function ($) {
-  'use strict';
-  var version = $.fn.jquery.split(' ')[0].split('.')
-  if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1)) {
-    throw new Error('Bootstrap\'s JavaScript requires jQuery version 1.9.1 or higher')
-  }
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: transition.js v3.3.5
- * http://getbootstrap.com/javascript/#transitions
- * ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
-  // ============================================================
-
-  function transitionEnd() {
-    var el = document.createElement('bootstrap')
-
-    var transEndEventNames = {
-      WebkitTransition : 'webkitTransitionEnd',
-      MozTransition    : 'transitionend',
-      OTransition      : 'oTransitionEnd otransitionend',
-      transition       : 'transitionend'
-    }
-
-    for (var name in transEndEventNames) {
-      if (el.style[name] !== undefined) {
-        return { end: transEndEventNames[name] }
-      }
-    }
-
-    return false // explicit for ie8 (  ._.)
-  }
-
-  // http://blog.alexmaccaw.com/css-transitions
-  $.fn.emulateTransitionEnd = function (duration) {
-    var called = false
-    var $el = this
-    $(this).one('bsTransitionEnd', function () { called = true })
-    var callback = function () { if (!called) $($el).trigger($.support.transition.end) }
-    setTimeout(callback, duration)
-    return this
-  }
-
-  $(function () {
-    $.support.transition = transitionEnd()
-
-    if (!$.support.transition) return
-
-    $.event.special.bsTransitionEnd = {
-      bindType: $.support.transition.end,
-      delegateType: $.support.transition.end,
-      handle: function (e) {
-        if ($(e.target).is(this)) return e.handleObj.handler.apply(this, arguments)
-      }
-    }
-  })
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: alert.js v3.3.5
- * http://getbootstrap.com/javascript/#alerts
- * ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // ALERT CLASS DEFINITION
-  // ======================
-
-  var dismiss = '[data-dismiss="alert"]'
-  var Alert   = function (el) {
-    $(el).on('click', dismiss, this.close)
-  }
-
-  Alert.VERSION = '3.3.5'
-
-  Alert.TRANSITION_DURATION = 150
-
-  Alert.prototype.close = function (e) {
-    var $this    = $(this)
-    var selector = $this.attr('data-target')
-
-    if (!selector) {
-      selector = $this.attr('href')
-      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
-    }
-
-    var $parent = $(selector)
-
-    if (e) e.preventDefault()
-
-    if (!$parent.length) {
-      $parent = $this.closest('.alert')
-    }
-
-    $parent.trigger(e = $.Event('close.bs.alert'))
-
-    if (e.isDefaultPrevented()) return
-
-    $parent.removeClass('in')
-
-    function removeElement() {
-      // detach from parent, fire event then clean up data
-      $parent.detach().trigger('closed.bs.alert').remove()
-    }
-
-    $.support.transition && $parent.hasClass('fade') ?
-      $parent
-        .one('bsTransitionEnd', removeElement)
-        .emulateTransitionEnd(Alert.TRANSITION_DURATION) :
-      removeElement()
-  }
-
-
-  // ALERT PLUGIN DEFINITION
-  // =======================
-
-  function Plugin(option) {
-    return this.each(function () {
-      var $this = $(this)
-      var data  = $this.data('bs.alert')
-
-      if (!data) $this.data('bs.alert', (data = new Alert(this)))
-      if (typeof option == 'string') data[option].call($this)
-    })
-  }
-
-  var old = $.fn.alert
-
-  $.fn.alert             = Plugin
-  $.fn.alert.Constructor = Alert
-
-
-  // ALERT NO CONFLICT
-  // =================
-
-  $.fn.alert.noConflict = function () {
-    $.fn.alert = old
-    return this
-  }
-
-
-  // ALERT DATA-API
-  // ==============
-
-  $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close)
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: button.js v3.3.5
- * http://getbootstrap.com/javascript/#buttons
- * ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // BUTTON PUBLIC CLASS DEFINITION
-  // ==============================
-
-  var Button = function (element, options) {
-    this.$element  = $(element)
-    this.options   = $.extend({}, Button.DEFAULTS, options)
-    this.isLoading = false
-  }
-
-  Button.VERSION  = '3.3.5'
-
-  Button.DEFAULTS = {
-    loadingText: 'loading...'
-  }
-
-  Button.prototype.setState = function (state) {
-    var d    = 'disabled'
-    var $el  = this.$element
-    var val  = $el.is('input') ? 'val' : 'html'
-    var data = $el.data()
-
-    state += 'Text'
-
-    if (data.resetText == null) $el.data('resetText', $el[val]())
-
-    // push to event loop to allow forms to submit
-    setTimeout($.proxy(function () {
-      $el[val](data[state] == null ? this.options[state] : data[state])
-
-      if (state == 'loadingText') {
-        this.isLoading = true
-        $el.addClass(d).attr(d, d)
-      } else if (this.isLoading) {
-        this.isLoading = false
-        $el.removeClass(d).removeAttr(d)
-      }
-    }, this), 0)
-  }
-
-  Button.prototype.toggle = function () {
-    var changed = true
-    var $parent = this.$element.closest('[data-toggle="buttons"]')
-
-    if ($parent.length) {
-      var $input = this.$element.find('input')
-      if ($input.prop('type') == 'radio') {
-        if ($input.prop('checked')) changed = false
-        $parent.find('.active').removeClass('active')
-        this.$element.addClass('active')
-      } else if ($input.prop('type') == 'checkbox') {
-        if (($input.prop('checked')) !== this.$element.hasClass('active')) changed = false
-        this.$element.toggleClass('active')
-      }
-      $input.prop('checked', this.$element.hasClass('active'))
-      if (changed) $input.trigger('change')
-    } else {
-      this.$element.attr('aria-pressed', !this.$element.hasClass('active'))
-      this.$element.toggleClass('active')
-    }
-  }
-
-
-  // BUTTON PLUGIN DEFINITION
-  // ========================
-
-  function Plugin(option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.button')
-      var options = typeof option == 'object' && option
-
-      if (!data) $this.data('bs.button', (data = new Button(this, options)))
-
-      if (option == 'toggle') data.toggle()
-      else if (option) data.setState(option)
-    })
-  }
-
-  var old = $.fn.button
-
-  $.fn.button             = Plugin
-  $.fn.button.Constructor = Button
-
-
-  // BUTTON NO CONFLICT
-  // ==================
-
-  $.fn.button.noConflict = function () {
-    $.fn.button = old
-    return this
-  }
-
-
-  // BUTTON DATA-API
-  // ===============
-
-  $(document)
-    .on('click.bs.button.data-api', '[data-toggle^="button"]', function (e) {
-      var $btn = $(e.target)
-      if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
-      Plugin.call($btn, 'toggle')
-      if (!($(e.target).is('input[type="radio"]') || $(e.target).is('input[type="checkbox"]'))) e.preventDefault()
-    })
-    .on('focus.bs.button.data-api blur.bs.button.data-api', '[data-toggle^="button"]', function (e) {
-      $(e.target).closest('.btn').toggleClass('focus', /^focus(in)?$/.test(e.type))
-    })
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: carousel.js v3.3.5
- * http://getbootstrap.com/javascript/#carousel
- * ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // CAROUSEL CLASS DEFINITION
-  // =========================
-
-  var Carousel = function (element, options) {
-    this.$element    = $(element)
-    this.$indicators = this.$element.find('.carousel-indicators')
-    this.options     = options
-    this.paused      = null
-    this.sliding     = null
-    this.interval    = null
-    this.$active     = null
-    this.$items      = null
-
-    this.options.keyboard && this.$element.on('keydown.bs.carousel', $.proxy(this.keydown, this))
-
-    this.options.pause == 'hover' && !('ontouchstart' in document.documentElement) && this.$element
-      .on('mouseenter.bs.carousel', $.proxy(this.pause, this))
-      .on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
-  }
-
-  Carousel.VERSION  = '3.3.5'
-
-  Carousel.TRANSITION_DURATION = 600
-
-  Carousel.DEFAULTS = {
-    interval: 5000,
-    pause: 'hover',
-    wrap: true,
-    keyboard: true
-  }
-
-  Carousel.prototype.keydown = function (e) {
-    if (/input|textarea/i.test(e.target.tagName)) return
-    switch (e.which) {
-      case 37: this.prev(); break
-      case 39: this.next(); break
-      default: return
-    }
-
-    e.preventDefault()
-  }
-
-  Carousel.prototype.cycle = function (e) {
-    e || (this.paused = false)
-
-    this.interval && clearInterval(this.interval)
-
-    this.options.interval
-      && !this.paused
-      && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
-
-    return this
-  }
-
-  Carousel.prototype.getItemIndex = function (item) {
-    this.$items = item.parent().children('.item')
-    return this.$items.index(item || this.$active)
-  }
-
-  Carousel.prototype.getItemForDirection = function (direction, active) {
-    var activeIndex = this.getItemIndex(active)
-    var willWrap = (direction == 'prev' && activeIndex === 0)
-                || (direction == 'next' && activeIndex == (this.$items.length - 1))
-    if (willWrap && !this.options.wrap) return active
-    var delta = direction == 'prev' ? -1 : 1
-    var itemIndex = (activeIndex + delta) % this.$items.length
-    return this.$items.eq(itemIndex)
-  }
-
-  Carousel.prototype.to = function (pos) {
-    var that        = this
-    var activeIndex = this.getItemIndex(this.$active = this.$element.find('.item.active'))
-
-    if (pos > (this.$items.length - 1) || pos < 0) return
-
-    if (this.sliding)       return this.$element.one('slid.bs.carousel', function () { that.to(pos) }) // yes, "slid"
-    if (activeIndex == pos) return this.pause().cycle()
-
-    return this.slide(pos > activeIndex ? 'next' : 'prev', this.$items.eq(pos))
-  }
-
-  Carousel.prototype.pause = function (e) {
-    e || (this.paused = true)
-
-    if (this.$element.find('.next, .prev').length && $.support.transition) {
-      this.$element.trigger($.support.transition.end)
-      this.cycle(true)
-    }
-
-    this.interval = clearInterval(this.interval)
-
-    return this
-  }
-
-  Carousel.prototype.next = function () {
-    if (this.sliding) return
-    return this.slide('next')
-  }
-
-  Carousel.prototype.prev = function () {
-    if (this.sliding) return
-    return this.slide('prev')
-  }
-
-  Carousel.prototype.slide = function (type, next) {
-    var $active   = this.$element.find('.item.active')
-    var $next     = next || this.getItemForDirection(type, $active)
-    var isCycling = this.interval
-    var direction = type == 'next' ? 'left' : 'right'
-    var that      = this
-
-    if ($next.hasClass('active')) return (this.sliding = false)
-
-    var relatedTarget = $next[0]
-    var slideEvent = $.Event('slide.bs.carousel', {
-      relatedTarget: relatedTarget,
-      direction: direction
-    })
-    this.$element.trigger(slideEvent)
-    if (slideEvent.isDefaultPrevented()) return
-
-    this.sliding = true
-
-    isCycling && this.pause()
-
-    if (this.$indicators.length) {
-      this.$indicators.find('.active').removeClass('active')
-      var $nextIndicator = $(this.$indicators.children()[this.getItemIndex($next)])
-      $nextIndicator && $nextIndicator.addClass('active')
-    }
-
-    var slidEvent = $.Event('slid.bs.carousel', { relatedTarget: relatedTarget, direction: direction }) // yes, "slid"
-    if ($.support.transition && this.$element.hasClass('slide')) {
-      $next.addClass(type)
-      $next[0].offsetWidth // force reflow
-      $active.addClass(direction)
-      $next.addClass(direction)
-      $active
-        .one('bsTransitionEnd', function () {
-          $next.removeClass([type, direction].join(' ')).addClass('active')
-          $active.removeClass(['active', direction].join(' '))
-          that.sliding = false
-          setTimeout(function () {
-            that.$element.trigger(slidEvent)
-          }, 0)
-        })
-        .emulateTransitionEnd(Carousel.TRANSITION_DURATION)
-    } else {
-      $active.removeClass('active')
-      $next.addClass('active')
-      this.sliding = false
-      this.$element.trigger(slidEvent)
-    }
-
-    isCycling && this.cycle()
-
-    return this
-  }
-
-
-  // CAROUSEL PLUGIN DEFINITION
-  // ==========================
-
-  function Plugin(option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.carousel')
-      var options = $.extend({}, Carousel.DEFAULTS, $this.data(), typeof option == 'object' && option)
-      var action  = typeof option == 'string' ? option : options.slide
-
-      if (!data) $this.data('bs.carousel', (data = new Carousel(this, options)))
-      if (typeof option == 'number') data.to(option)
-      else if (action) data[action]()
-      else if (options.interval) data.pause().cycle()
-    })
-  }
-
-  var old = $.fn.carousel
-
-  $.fn.carousel             = Plugin
-  $.fn.carousel.Constructor = Carousel
-
-
-  // CAROUSEL NO CONFLICT
-  // ====================
-
-  $.fn.carousel.noConflict = function () {
-    $.fn.carousel = old
-    return this
-  }
-
-
-  // CAROUSEL DATA-API
-  // =================
-
-  var clickHandler = function (e) {
-    var href
-    var $this   = $(this)
-    var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) // strip for ie7
-    if (!$target.hasClass('carousel')) return
-    var options = $.extend({}, $target.data(), $this.data())
-    var slideIndex = $this.attr('data-slide-to')
-    if (slideIndex) options.interval = false
-
-    Plugin.call($target, options)
-
-    if (slideIndex) {
-      $target.data('bs.carousel').to(slideIndex)
-    }
-
-    e.preventDefault()
-  }
-
-  $(document)
-    .on('click.bs.carousel.data-api', '[data-slide]', clickHandler)
-    .on('click.bs.carousel.data-api', '[data-slide-to]', clickHandler)
-
-  $(window).on('load', function () {
-    $('[data-ride="carousel"]').each(function () {
-      var $carousel = $(this)
-      Plugin.call($carousel, $carousel.data())
-    })
-  })
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: collapse.js v3.3.5
- * http://getbootstrap.com/javascript/#collapse
- * ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // COLLAPSE PUBLIC CLASS DEFINITION
-  // ================================
-
-  var Collapse = function (element, options) {
-    this.$element      = $(element)
-    this.options       = $.extend({}, Collapse.DEFAULTS, options)
-    this.$trigger      = $('[data-toggle="collapse"][href="#' + element.id + '"],' +
-                           '[data-toggle="collapse"][data-target="#' + element.id + '"]')
-    this.transitioning = null
-
-    if (this.options.parent) {
-      this.$parent = this.getParent()
-    } else {
-      this.addAriaAndCollapsedClass(this.$element, this.$trigger)
-    }
-
-    if (this.options.toggle) this.toggle()
-  }
-
-  Collapse.VERSION  = '3.3.5'
-
-  Collapse.TRANSITION_DURATION = 350
-
-  Collapse.DEFAULTS = {
-    toggle: true
-  }
-
-  Collapse.prototype.dimension = function () {
-    var hasWidth = this.$element.hasClass('width')
-    return hasWidth ? 'width' : 'height'
-  }
-
-  Collapse.prototype.show = function () {
-    if (this.transitioning || this.$element.hasClass('in')) return
-
-    var activesData
-    var actives = this.$parent && this.$parent.children('.panel').children('.in, .collapsing')
-
-    if (actives && actives.length) {
-      activesData = actives.data('bs.collapse')
-      if (activesData && activesData.transitioning) return
-    }
-
-    var startEvent = $.Event('show.bs.collapse')
-    this.$element.trigger(startEvent)
-    if (startEvent.isDefaultPrevented()) return
-
-    if (actives && actives.length) {
-      Plugin.call(actives, 'hide')
-      activesData || actives.data('bs.collapse', null)
-    }
-
-    var dimension = this.dimension()
-
-    this.$element
-      .removeClass('collapse')
-      .addClass('collapsing')[dimension](0)
-      .attr('aria-expanded', true)
-
-    this.$trigger
-      .removeClass('collapsed')
-      .attr('aria-expanded', true)
-
-    this.transitioning = 1
-
-    var complete = function () {
-      this.$element
-        .removeClass('collapsing')
-        .addClass('collapse in')[dimension]('')
-      this.transitioning = 0
-      this.$element
-        .trigger('shown.bs.collapse')
-    }
-
-    if (!$.support.transition) return complete.call(this)
-
-    var scrollSize = $.camelCase(['scroll', dimension].join('-'))
-
-    this.$element
-      .one('bsTransitionEnd', $.proxy(complete, this))
-      .emulateTransitionEnd(Collapse.TRANSITION_DURATION)[dimension](this.$element[0][scrollSize])
-  }
-
-  Collapse.prototype.hide = function () {
-    if (this.transitioning || !this.$element.hasClass('in')) return
-
-    var startEvent = $.Event('hide.bs.collapse')
-    this.$element.trigger(startEvent)
-    if (startEvent.isDefaultPrevented()) return
-
-    var dimension = this.dimension()
-
-    this.$element[dimension](this.$element[dimension]())[0].offsetHeight
-
-    this.$element
-      .addClass('collapsing')
-      .removeClass('collapse in')
-      .attr('aria-expanded', false)
-
-    this.$trigger
-      .addClass('collapsed')
-      .attr('aria-expanded', false)
-
-    this.transitioning = 1
-
-    var complete = function () {
-      this.transitioning = 0
-      this.$element
-        .removeClass('collapsing')
-        .addClass('collapse')
-        .trigger('hidden.bs.collapse')
-    }
-
-    if (!$.support.transition) return complete.call(this)
-
-    this.$element
-      [dimension](0)
-      .one('bsTransitionEnd', $.proxy(complete, this))
-      .emulateTransitionEnd(Collapse.TRANSITION_DURATION)
-  }
-
-  Collapse.prototype.toggle = function () {
-    this[this.$element.hasClass('in') ? 'hide' : 'show']()
-  }
-
-  Collapse.prototype.getParent = function () {
-    return $(this.options.parent)
-      .find('[data-toggle="collapse"][data-parent="' + this.options.parent + '"]')
-      .each($.proxy(function (i, element) {
-        var $element = $(element)
-        this.addAriaAndCollapsedClass(getTargetFromTrigger($element), $element)
-      }, this))
-      .end()
-  }
-
-  Collapse.prototype.addAriaAndCollapsedClass = function ($element, $trigger) {
-    var isOpen = $element.hasClass('in')
-
-    $element.attr('aria-expanded', isOpen)
-    $trigger
-      .toggleClass('collapsed', !isOpen)
-      .attr('aria-expanded', isOpen)
-  }
-
-  function getTargetFromTrigger($trigger) {
-    var href
-    var target = $trigger.attr('data-target')
-      || (href = $trigger.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') // strip for ie7
-
-    return $(target)
-  }
-
-
-  // COLLAPSE PLUGIN DEFINITION
-  // ==========================
-
-  function Plugin(option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.collapse')
-      var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option)
-
-      if (!data && options.toggle && /show|hide/.test(option)) options.toggle = false
-      if (!data) $this.data('bs.collapse', (data = new Collapse(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  var old = $.fn.collapse
-
-  $.fn.collapse             = Plugin
-  $.fn.collapse.Constructor = Collapse
-
-
-  // COLLAPSE NO CONFLICT
-  // ====================
-
-  $.fn.collapse.noConflict = function () {
-    $.fn.collapse = old
-    return this
-  }
-
-
-  // COLLAPSE DATA-API
-  // =================
-
-  $(document).on('click.bs.collapse.data-api', '[data-toggle="collapse"]', function (e) {
-    var $this   = $(this)
-
-    if (!$this.attr('data-target')) e.preventDefault()
-
-    var $target = getTargetFromTrigger($this)
-    var data    = $target.data('bs.collapse')
-    var option  = data ? 'toggle' : $this.data()
-
-    Plugin.call($target, option)
-  })
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: dropdown.js v3.3.5
- * http://getbootstrap.com/javascript/#dropdowns
- * ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // DROPDOWN CLASS DEFINITION
-  // =========================
-
-  var backdrop = '.dropdown-backdrop'
-  var toggle   = '[data-toggle="dropdown"]'
-  var Dropdown = function (element) {
-    $(element).on('click.bs.dropdown', this.toggle)
-  }
-
-  Dropdown.VERSION = '3.3.5'
-
-  function getParent($this) {
-    var selector = $this.attr('data-target')
-
-    if (!selector) {
-      selector = $this.attr('href')
-      selector = selector && /#[A-Za-z]/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
-    }
-
-    var $parent = selector && $(selector)
-
-    return $parent && $parent.length ? $parent : $this.parent()
-  }
-
-  function clearMenus(e) {
-    if (e && e.which === 3) return
-    $(backdrop).remove()
-    $(toggle).each(function () {
-      var $this         = $(this)
-      var $parent       = getParent($this)
-      var relatedTarget = { relatedTarget: this }
-
-      if (!$parent.hasClass('open')) return
-
-      if (e && e.type == 'click' && /input|textarea/i.test(e.target.tagName) && $.contains($parent[0], e.target)) return
-
-      $parent.trigger(e = $.Event('hide.bs.dropdown', relatedTarget))
-
-      if (e.isDefaultPrevented()) return
-
-      $this.attr('aria-expanded', 'false')
-      $parent.removeClass('open').trigger('hidden.bs.dropdown', relatedTarget)
-    })
-  }
-
-  Dropdown.prototype.toggle = function (e) {
-    var $this = $(this)
-
-    if ($this.is('.disabled, :disabled')) return
-
-    var $parent  = getParent($this)
-    var isActive = $parent.hasClass('open')
-
-    clearMenus()
-
-    if (!isActive) {
-      if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) {
-        // if mobile we use a backdrop because click events don't delegate
-        $(document.createElement('div'))
-          .addClass('dropdown-backdrop')
-          .insertAfter($(this))
-          .on('click', clearMenus)
-      }
-
-      var relatedTarget = { relatedTarget: this }
-      $parent.trigger(e = $.Event('show.bs.dropdown', relatedTarget))
-
-      if (e.isDefaultPrevented()) return
-
-      $this
-        .trigger('focus')
-        .attr('aria-expanded', 'true')
-
-      $parent
-        .toggleClass('open')
-        .trigger('shown.bs.dropdown', relatedTarget)
-    }
-
-    return false
-  }
-
-  Dropdown.prototype.keydown = function (e) {
-    if (!/(38|40|27|32)/.test(e.which) || /input|textarea/i.test(e.target.tagName)) return
-
-    var $this = $(this)
-
-    e.preventDefault()
-    e.stopPropagation()
-
-    if ($this.is('.disabled, :disabled')) return
-
-    var $parent  = getParent($this)
-    var isActive = $parent.hasClass('open')
-
-    if (!isActive && e.which != 27 || isActive && e.which == 27) {
-      if (e.which == 27) $parent.find(toggle).trigger('focus')
-      return $this.trigger('click')
-    }
-
-    var desc = ' li:not(.disabled):visible a'
-    var $items = $parent.find('.dropdown-menu' + desc)
-
-    if (!$items.length) return
-
-    var index = $items.index(e.target)
-
-    if (e.which == 38 && index > 0)                 index--         // up
-    if (e.which == 40 && index < $items.length - 1) index++         // down
-    if (!~index)                                    index = 0
-
-    $items.eq(index).trigger('focus')
-  }
-
-
-  // DROPDOWN PLUGIN DEFINITION
-  // ==========================
-
-  function Plugin(option) {
-    return this.each(function () {
-      var $this = $(this)
-      var data  = $this.data('bs.dropdown')
-
-      if (!data) $this.data('bs.dropdown', (data = new Dropdown(this)))
-      if (typeof option == 'string') data[option].call($this)
-    })
-  }
-
-  var old = $.fn.dropdown
-
-  $.fn.dropdown             = Plugin
-  $.fn.dropdown.Constructor = Dropdown
-
-
-  // DROPDOWN NO CONFLICT
-  // ====================
-
-  $.fn.dropdown.noConflict = function () {
-    $.fn.dropdown = old
-    return this
-  }
-
-
-  // APPLY TO STANDARD DROPDOWN ELEMENTS
-  // ===================================
-
-  $(document)
-    .on('click.bs.dropdown.data-api', clearMenus)
-    .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
-    .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
-    .on('keydown.bs.dropdown.data-api', toggle, Dropdown.prototype.keydown)
-    .on('keydown.bs.dropdown.data-api', '.dropdown-menu', Dropdown.prototype.keydown)
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: modal.js v3.3.5
- * http://getbootstrap.com/javascript/#modals
- * ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // MODAL CLASS DEFINITION
-  // ======================
-
-  var Modal = function (element, options) {
-    this.options             = options
-    this.$body               = $(document.body)
-    this.$element            = $(element)
-    this.$dialog             = this.$element.find('.modal-dialog')
-    this.$backdrop           = null
-    this.isShown             = null
-    this.originalBodyPad     = null
-    this.scrollbarWidth      = 0
-    this.ignoreBackdropClick = false
-
-    if (this.options.remote) {
-      this.$element
-        .find('.modal-content')
-        .load(this.options.remote, $.proxy(function () {
-          this.$element.trigger('loaded.bs.modal')
-        }, this))
-    }
-  }
-
-  Modal.VERSION  = '3.3.5'
-
-  Modal.TRANSITION_DURATION = 300
-  Modal.BACKDROP_TRANSITION_DURATION = 150
-
-  Modal.DEFAULTS = {
-    backdrop: true,
-    keyboard: true,
-    show: true
-  }
-
-  Modal.prototype.toggle = function (_relatedTarget) {
-    return this.isShown ? this.hide() : this.show(_relatedTarget)
-  }
-
-  Modal.prototype.show = function (_relatedTarget) {
-    var that = this
-    var e    = $.Event('show.bs.modal', { relatedTarget: _relatedTarget })
-
-    this.$element.trigger(e)
-
-    if (this.isShown || e.isDefaultPrevented()) return
-
-    this.isShown = true
-
-    this.checkScrollbar()
-    this.setScrollbar()
-    this.$body.addClass('modal-open')
-
-    this.escape()
-    this.resize()
-
-    this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this))
-
-    this.$dialog.on('mousedown.dismiss.bs.modal', function () {
-      that.$element.one('mouseup.dismiss.bs.modal', function (e) {
-        if ($(e.target).is(that.$element)) that.ignoreBackdropClick = true
-      })
-    })
-
-    this.backdrop(function () {
-      var transition = $.support.transition && that.$element.hasClass('fade')
-
-      if (!that.$element.parent().length) {
-        that.$element.appendTo(that.$body) // don't move modals dom position
-      }
-
-      that.$element
-        .show()
-        .scrollTop(0)
-
-      that.adjustDialog()
-
-      if (transition) {
-        that.$element[0].offsetWidth // force reflow
-      }
-
-      that.$element.addClass('in')
-
-      that.enforceFocus()
-
-      var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget })
-
-      transition ?
-        that.$dialog // wait for modal to slide in
-          .one('bsTransitionEnd', function () {
-            that.$element.trigger('focus').trigger(e)
-          })
-          .emulateTransitionEnd(Modal.TRANSITION_DURATION) :
-        that.$element.trigger('focus').trigger(e)
-    })
-  }
-
-  Modal.prototype.hide = function (e) {
-    if (e) e.preventDefault()
-
-    e = $.Event('hide.bs.modal')
-
-    this.$element.trigger(e)
-
-    if (!this.isShown || e.isDefaultPrevented()) return
-
-    this.isShown = false
-
-    this.escape()
-    this.resize()
-
-    $(document).off('focusin.bs.modal')
-
-    this.$element
-      .removeClass('in')
-      .off('click.dismiss.bs.modal')
-      .off('mouseup.dismiss.bs.modal')
-
-    this.$dialog.off('mousedown.dismiss.bs.modal')
-
-    $.support.transition && this.$element.hasClass('fade') ?
-      this.$element
-        .one('bsTransitionEnd', $.proxy(this.hideModal, this))
-        .emulateTransitionEnd(Modal.TRANSITION_DURATION) :
-      this.hideModal()
-  }
-
-  Modal.prototype.enforceFocus = function () {
-    $(document)
-      .off('focusin.bs.modal') // guard against infinite focus loop
-      .on('focusin.bs.modal', $.proxy(function (e) {
-        if (this.$element[0] !== e.target && !this.$element.has(e.target).length) {
-          this.$element.trigger('focus')
-        }
-      }, this))
-  }
-
-  Modal.prototype.escape = function () {
-    if (this.isShown && this.options.keyboard) {
-      this.$element.on('keydown.dismiss.bs.modal', $.proxy(function (e) {
-        e.which == 27 && this.hide()
-      }, this))
-    } else if (!this.isShown) {
-      this.$element.off('keydown.dismiss.bs.modal')
-    }
-  }
-
-  Modal.prototype.resize = function () {
-    if (this.isShown) {
-      $(window).on('resize.bs.modal', $.proxy(this.handleUpdate, this))
-    } else {
-      $(window).off('resize.bs.modal')
-    }
-  }
-
-  Modal.prototype.hideModal = function () {
-    var that = this
-    this.$element.hide()
-    this.backdrop(function () {
-      that.$body.removeClass('modal-open')
-      that.resetAdjustments()
-      that.resetScrollbar()
-      that.$element.trigger('hidden.bs.modal')
-    })
-  }
-
-  Modal.prototype.removeBackdrop = function () {
-    this.$backdrop && this.$backdrop.remove()
-    this.$backdrop = null
-  }
-
-  Modal.prototype.backdrop = function (callback) {
-    var that = this
-    var animate = this.$element.hasClass('fade') ? 'fade' : ''
-
-    if (this.isShown && this.options.backdrop) {
-      var doAnimate = $.support.transition && animate
-
-      this.$backdrop = $(document.createElement('div'))
-        .addClass('modal-backdrop ' + animate)
-        .appendTo(this.$body)
-
-      this.$element.on('click.dismiss.bs.modal', $.proxy(function (e) {
-        if (this.ignoreBackdropClick) {
-          this.ignoreBackdropClick = false
-          return
-        }
-        if (e.target !== e.currentTarget) return
-        this.options.backdrop == 'static'
-          ? this.$element[0].focus()
-          : this.hide()
-      }, this))
-
-      if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
-
-      this.$backdrop.addClass('in')
-
-      if (!callback) return
-
-      doAnimate ?
-        this.$backdrop
-          .one('bsTransitionEnd', callback)
-          .emulateTransitionEnd(Modal.BACKDROP_TRANSITION_DURATION) :
-        callback()
-
-    } else if (!this.isShown && this.$backdrop) {
-      this.$backdrop.removeClass('in')
-
-      var callbackRemove = function () {
-        that.removeBackdrop()
-        callback && callback()
-      }
-      $.support.transition && this.$element.hasClass('fade') ?
-        this.$backdrop
-          .one('bsTransitionEnd', callbackRemove)
-          .emulateTransitionEnd(Modal.BACKDROP_TRANSITION_DURATION) :
-        callbackRemove()
-
-    } else if (callback) {
-      callback()
-    }
-  }
-
-  // these following methods are used to handle overflowing modals
-
-  Modal.prototype.handleUpdate = function () {
-    this.adjustDialog()
-  }
-
-  Modal.prototype.adjustDialog = function () {
-    var modalIsOverflowing = this.$element[0].scrollHeight > document.documentElement.clientHeight
-
-    this.$element.css({
-      paddingLeft:  !this.bodyIsOverflowing && modalIsOverflowing ? this.scrollbarWidth : '',
-      paddingRight: this.bodyIsOverflowing && !modalIsOverflowing ? this.scrollbarWidth : ''
-    })
-  }
-
-  Modal.prototype.resetAdjustments = function () {
-    this.$element.css({
-      paddingLeft: '',
-      paddingRight: ''
-    })
-  }
-
-  Modal.prototype.checkScrollbar = function () {
-    var fullWindowWidth = window.innerWidth
-    if (!fullWindowWidth) { // workaround for missing window.innerWidth in IE8
-      var documentElementRect = document.documentElement.getBoundingClientRect()
-      fullWindowWidth = documentElementRect.right - Math.abs(documentElementRect.left)
-    }
-    this.bodyIsOverflowing = document.body.clientWidth < fullWindowWidth
-    this.scrollbarWidth = this.measureScrollbar()
-  }
-
-  Modal.prototype.setScrollbar = function () {
-    var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10)
-    this.originalBodyPad = document.body.style.paddingRight || ''
-    if (this.bodyIsOverflowing) this.$body.css('padding-right', bodyPad + this.scrollbarWidth)
-  }
-
-  Modal.prototype.resetScrollbar = function () {
-    this.$body.css('padding-right', this.originalBodyPad)
-  }
-
-  Modal.prototype.measureScrollbar = function () { // thx walsh
-    var scrollDiv = document.createElement('div')
-    scrollDiv.className = 'modal-scrollbar-measure'
-    this.$body.append(scrollDiv)
-    var scrollbarWidth = scrollDiv.offsetWidth - scrollDiv.clientWidth
-    this.$body[0].removeChild(scrollDiv)
-    return scrollbarWidth
-  }
-
-
-  // MODAL PLUGIN DEFINITION
-  // =======================
-
-  function Plugin(option, _relatedTarget) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.modal')
-      var options = $.extend({}, Modal.DEFAULTS, $this.data(), typeof option == 'object' && option)
-
-      if (!data) $this.data('bs.modal', (data = new Modal(this, options)))
-      if (typeof option == 'string') data[option](_relatedTarget)
-      else if (options.show) data.show(_relatedTarget)
-    })
-  }
-
-  var old = $.fn.modal
-
-  $.fn.modal             = Plugin
-  $.fn.modal.Constructor = Modal
-
-
-  // MODAL NO CONFLICT
-  // =================
-
-  $.fn.modal.noConflict = function () {
-    $.fn.modal = old
-    return this
-  }
-
-
-  // MODAL DATA-API
-  // ==============
-
-  $(document).on('click.bs.modal.data-api', '[data-toggle="modal"]', function (e) {
-    var $this   = $(this)
-    var href    = $this.attr('href')
-    var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) // strip for ie7
-    var option  = $target.data('bs.modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data())
-
-    if ($this.is('a')) e.preventDefault()
-
-    $target.one('show.bs.modal', function (showEvent) {
-      if (showEvent.isDefaultPrevented()) return // only register focus restorer if modal will actually get shown
-      $target.one('hidden.bs.modal', function () {
-        $this.is(':visible') && $this.trigger('focus')
-      })
-    })
-    Plugin.call($target, option, this)
-  })
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: tooltip.js v3.3.5
- * http://getbootstrap.com/javascript/#tooltip
- * Inspired by the original jQuery.tipsy by Jason Frame
- * ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // TOOLTIP PUBLIC CLASS DEFINITION
-  // ===============================
-
-  var Tooltip = function (element, options) {
-    this.type       = null
-    this.options    = null
-    this.enabled    = null
-    this.timeout    = null
-    this.hoverState = null
-    this.$element   = null
-    this.inState    = null
-
-    this.init('tooltip', element, options)
-  }
-
-  Tooltip.VERSION  = '3.3.5'
-
-  Tooltip.TRANSITION_DURATION = 150
-
-  Tooltip.DEFAULTS = {
-    animation: true,
-    placement: 'top',
-    selector: false,
-    template: '<div class="tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',
-    trigger: 'hover focus',
-    title: '',
-    delay: 0,
-    html: false,
-    container: false,
-    viewport: {
-      selector: 'body',
-      padding: 0
-    }
-  }
-
-  Tooltip.prototype.init = function (type, element, options) {
-    this.enabled   = true
-    this.type      = type
-    this.$element  = $(element)
-    this.options   = this.getOptions(options)
-    this.$viewport = this.options.viewport && $($.isFunction(this.options.viewport) ? this.options.viewport.call(this, this.$element) : (this.options.viewport.selector || this.options.viewport))
-    this.inState   = { click: false, hover: false, focus: false }
-
-    if (this.$element[0] instanceof document.constructor && !this.options.selector) {
-      throw new Error('`selector` option must be specified when initializing ' + this.type + ' on the window.document object!')
-    }
-
-    var triggers = this.options.trigger.split(' ')
-
-    for (var i = triggers.length; i--;) {
-      var trigger = triggers[i]
-
-      if (trigger == 'click') {
-        this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
-      } else if (trigger != 'manual') {
-        var eventIn  = trigger == 'hover' ? 'mouseenter' : 'focusin'
-        var eventOut = trigger == 'hover' ? 'mouseleave' : 'focusout'
-
-        this.$element.on(eventIn  + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
-        this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
-      }
-    }
-
-    this.options.selector ?
-      (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
-      this.fixTitle()
-  }
-
-  Tooltip.prototype.getDefaults = function () {
-    return Tooltip.DEFAULTS
-  }
-
-  Tooltip.prototype.getOptions = function (options) {
-    options = $.extend({}, this.getDefaults(), this.$element.data(), options)
-
-    if (options.delay && typeof options.delay == 'number') {
-      options.delay = {
-        show: options.delay,
-        hide: options.delay
-      }
-    }
-
-    return options
-  }
-
-  Tooltip.prototype.getDelegateOptions = function () {
-    var options  = {}
-    var defaults = this.getDefaults()
-
-    this._options && $.each(this._options, function (key, value) {
-      if (defaults[key] != value) options[key] = value
-    })
-
-    return options
-  }
-
-  Tooltip.prototype.enter = function (obj) {
-    var self = obj instanceof this.constructor ?
-      obj : $(obj.currentTarget).data('bs.' + this.type)
-
-    if (!self) {
-      self = new this.constructor(obj.currentTarget, this.getDelegateOptions())
-      $(obj.currentTarget).data('bs.' + this.type, self)
-    }
-
-    if (obj instanceof $.Event) {
-      self.inState[obj.type == 'focusin' ? 'focus' : 'hover'] = true
-    }
-
-    if (self.tip().hasClass('in') || self.hoverState == 'in') {
-      self.hoverState = 'in'
-      return
-    }
-
-    clearTimeout(self.timeout)
-
-    self.hoverState = 'in'
-
-    if (!self.options.delay || !self.options.delay.show) return self.show()
-
-    self.timeout = setTimeout(function () {
-      if (self.hoverState == 'in') self.show()
-    }, self.options.delay.show)
-  }
-
-  Tooltip.prototype.isInStateTrue = function () {
-    for (var key in this.inState) {
-      if (this.inState[key]) return true
-    }
-
-    return false
-  }
-
-  Tooltip.prototype.leave = function (obj) {
-    var self = obj instanceof this.constructor ?
-      obj : $(obj.currentTarget).data('bs.' + this.type)
-
-    if (!self) {
-      self = new this.constructor(obj.currentTarget, this.getDelegateOptions())
-      $(obj.currentTarget).data('bs.' + this.type, self)
-    }
-
-    if (obj instanceof $.Event) {
-      self.inState[obj.type == 'focusout' ? 'focus' : 'hover'] = false
-    }
-
-    if (self.isInStateTrue()) return
-
-    clearTimeout(self.timeout)
-
-    self.hoverState = 'out'
-
-    if (!self.options.delay || !self.options.delay.hide) return self.hide()
-
-    self.timeout = setTimeout(function () {
-      if (self.hoverState == 'out') self.hide()
-    }, self.options.delay.hide)
-  }
-
-  Tooltip.prototype.show = function () {
-    var e = $.Event('show.bs.' + this.type)
-
-    if (this.hasContent() && this.enabled) {
-      this.$element.trigger(e)
-
-      var inDom = $.contains(this.$element[0].ownerDocument.documentElement, this.$element[0])
-      if (e.isDefaultPrevented() || !inDom) return
-      var that = this
-
-      var $tip = this.tip()
-
-      var tipId = this.getUID(this.type)
-
-      this.setContent()
-      $tip.attr('id', tipId)
-      this.$element.attr('aria-describedby', tipId)
-
-      if (this.options.animation) $tip.addClass('fade')
-
-      var placement = typeof this.options.placement == 'function' ?
-        this.options.placement.call(this, $tip[0], this.$element[0]) :
-        this.options.placement
-
-      var autoToken = /\s?auto?\s?/i
-      var autoPlace = autoToken.test(placement)
-      if (autoPlace) placement = placement.replace(autoToken, '') || 'top'
-
-      $tip
-        .detach()
-        .css({ top: 0, left: 0, display: 'block' })
-        .addClass(placement)
-        .data('bs.' + this.type, this)
-
-      this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
-      this.$element.trigger('inserted.bs.' + this.type)
-
-      var pos          = this.getPosition()
-      var actualWidth  = $tip[0].offsetWidth
-      var actualHeight = $tip[0].offsetHeight
-
-      if (autoPlace) {
-        var orgPlacement = placement
-        var viewportDim = this.getPosition(this.$viewport)
-
-        placement = placement == 'bottom' && pos.bottom + actualHeight > viewportDim.bottom ? 'top'    :
-                    placement == 'top'    && pos.top    - actualHeight < viewportDim.top    ? 'bottom' :
-                    placement == 'right'  && pos.right  + actualWidth  > viewportDim.width  ? 'left'   :
-                    placement == 'left'   && pos.left   - actualWidth  < viewportDim.left   ? 'right'  :
-                    placement
-
-        $tip
-          .removeClass(orgPlacement)
-          .addClass(placement)
-      }
-
-      var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight)
-
-      this.applyPlacement(calculatedOffset, placement)
-
-      var complete = function () {
-        var prevHoverState = that.hoverState
-        that.$element.trigger('shown.bs.' + that.type)
-        that.hoverState = null
-
-        if (prevHoverState == 'out') that.leave(that)
-      }
-
-      $.support.transition && this.$tip.hasClass('fade') ?
-        $tip
-          .one('bsTransitionEnd', complete)
-          .emulateTransitionEnd(Tooltip.TRANSITION_DURATION) :
-        complete()
-    }
-  }
-
-  Tooltip.prototype.applyPlacement = function (offset, placement) {
-    var $tip   = this.tip()
-    var width  = $tip[0].offsetWidth
-    var height = $tip[0].offsetHeight
-
-    // manually read margins because getBoundingClientRect includes difference
-    var marginTop = parseInt($tip.css('margin-top'), 10)
-    var marginLeft = parseInt($tip.css('margin-left'), 10)
-
-    // we must check for NaN for ie 8/9
-    if (isNaN(marginTop))  marginTop  = 0
-    if (isNaN(marginLeft)) marginLeft = 0
-
-    offset.top  += marginTop
-    offset.left += marginLeft
-
-    // $.fn.offset doesn't round pixel values
-    // so we use setOffset directly with our own function B-0
-    $.offset.setOffset($tip[0], $.extend({
-      using: function (props) {
-        $tip.css({
-          top: Math.round(props.top),
-          left: Math.round(props.left)
-        })
-      }
-    }, offset), 0)
-
-    $tip.addClass('in')
-
-    // check to see if placing tip in new offset caused the tip to resize itself
-    var actualWidth  = $tip[0].offsetWidth
-    var actualHeight = $tip[0].offsetHeight
-
-    if (placement == 'top' && actualHeight != height) {
-      offset.top = offset.top + height - actualHeight
-    }
-
-    var delta = this.getViewportAdjustedDelta(placement, offset, actualWidth, actualHeight)
-
-    if (delta.left) offset.left += delta.left
-    else offset.top += delta.top
-
-    var isVertical          = /top|bottom/.test(placement)
-    var arrowDelta          = isVertical ? delta.left * 2 - width + actualWidth : delta.top * 2 - height + actualHeight
-    var arrowOffsetPosition = isVertical ? 'offsetWidth' : 'offsetHeight'
-
-    $tip.offset(offset)
-    this.replaceArrow(arrowDelta, $tip[0][arrowOffsetPosition], isVertical)
-  }
-
-  Tooltip.prototype.replaceArrow = function (delta, dimension, isVertical) {
-    this.arrow()
-      .css(isVertical ? 'left' : 'top', 50 * (1 - delta / dimension) + '%')
-      .css(isVertical ? 'top' : 'left', '')
-  }
-
-  Tooltip.prototype.setContent = function () {
-    var $tip  = this.tip()
-    var title = this.getTitle()
-
-    $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title)
-    $tip.removeClass('fade in top bottom left right')
-  }
-
-  Tooltip.prototype.hide = function (callback) {
-    var that = this
-    var $tip = $(this.$tip)
-    var e    = $.Event('hide.bs.' + this.type)
-
-    function complete() {
-      if (that.hoverState != 'in') $tip.detach()
-      that.$element
-        .removeAttr('aria-describedby')
-        .trigger('hidden.bs.' + that.type)
-      callback && callback()
-    }
-
-    this.$element.trigger(e)
-
-    if (e.isDefaultPrevented()) return
-
-    $tip.removeClass('in')
-
-    $.support.transition && $tip.hasClass('fade') ?
-      $tip
-        .one('bsTransitionEnd', complete)
-        .emulateTransitionEnd(Tooltip.TRANSITION_DURATION) :
-      complete()
-
-    this.hoverState = null
-
-    return this
-  }
-
-  Tooltip.prototype.fixTitle = function () {
-    var $e = this.$element
-    if ($e.attr('title') || typeof $e.attr('data-original-title') != 'string') {
-      $e.attr('data-original-title', $e.attr('title') || '').attr('title', '')
-    }
-  }
-
-  Tooltip.prototype.hasContent = function () {
-    return this.getTitle()
-  }
-
-  Tooltip.prototype.getPosition = function ($element) {
-    $element   = $element || this.$element
-
-    var el     = $element[0]
-    var isBody = el.tagName == 'BODY'
-
-    var elRect    = el.getBoundingClientRect()
-    if (elRect.width == null) {
-      // width and height are missing in IE8, so compute them manually; see https://github.com/twbs/bootstrap/issues/14093
-      elRect = $.extend({}, elRect, { width: elRect.right - elRect.left, height: elRect.bottom - elRect.top })
-    }
-    var elOffset  = isBody ? { top: 0, left: 0 } : $element.offset()
-    var scroll    = { scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop() }
-    var outerDims = isBody ? { width: $(window).width(), height: $(window).height() } : null
-
-    return $.extend({}, elRect, scroll, outerDims, elOffset)
-  }
-
-  Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) {
-    return placement == 'bottom' ? { top: pos.top + pos.height,   left: pos.left + pos.width / 2 - actualWidth / 2 } :
-           placement == 'top'    ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } :
-           placement == 'left'   ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } :
-        /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width }
-
-  }
-
-  Tooltip.prototype.getViewportAdjustedDelta = function (placement, pos, actualWidth, actualHeight) {
-    var delta = { top: 0, left: 0 }
-    if (!this.$viewport) return delta
-
-    var viewportPadding = this.options.viewport && this.options.viewport.padding || 0
-    var viewportDimensions = this.getPosition(this.$viewport)
-
-    if (/right|left/.test(placement)) {
-      var topEdgeOffset    = pos.top - viewportPadding - viewportDimensions.scroll
-      var bottomEdgeOffset = pos.top + viewportPadding - viewportDimensions.scroll + actualHeight
-      if (topEdgeOffset < viewportDimensions.top) { // top overflow
-        delta.top = viewportDimensions.top - topEdgeOffset
-      } else if (bottomEdgeOffset > viewportDimensions.top + viewportDimensions.height) { // bottom overflow
-        delta.top = viewportDimensions.top + viewportDimensions.height - bottomEdgeOffset
-      }
-    } else {
-      var leftEdgeOffset  = pos.left - viewportPadding
-      var rightEdgeOffset = pos.left + viewportPadding + actualWidth
-      if (leftEdgeOffset < viewportDimensions.left) { // left overflow
-        delta.left = viewportDimensions.left - leftEdgeOffset
-      } else if (rightEdgeOffset > viewportDimensions.right) { // right overflow
-        delta.left = viewportDimensions.left + viewportDimensions.width - rightEdgeOffset
-      }
-    }
-
-    return delta
-  }
-
-  Tooltip.prototype.getTitle = function () {
-    var title
-    var $e = this.$element
-    var o  = this.options
-
-    title = $e.attr('data-original-title')
-      || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
-
-    return title
-  }
-
-  Tooltip.prototype.getUID = function (prefix) {
-    do prefix += ~~(Math.random() * 1000000)
-    while (document.getElementById(prefix))
-    return prefix
-  }
-
-  Tooltip.prototype.tip = function () {
-    if (!this.$tip) {
-      this.$tip = $(this.options.template)
-      if (this.$tip.length != 1) {
-        throw new Error(this.type + ' `template` option must consist of exactly 1 top-level element!')
-      }
-    }
-    return this.$tip
-  }
-
-  Tooltip.prototype.arrow = function () {
-    return (this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow'))
-  }
-
-  Tooltip.prototype.enable = function () {
-    this.enabled = true
-  }
-
-  Tooltip.prototype.disable = function () {
-    this.enabled = false
-  }
-
-  Tooltip.prototype.toggleEnabled = function () {
-    this.enabled = !this.enabled
-  }
-
-  Tooltip.prototype.toggle = function (e) {
-    var self = this
-    if (e) {
-      self = $(e.currentTarget).data('bs.' + this.type)
-      if (!self) {
-        self = new this.constructor(e.currentTarget, this.getDelegateOptions())
-        $(e.currentTarget).data('bs.' + this.type, self)
-      }
-    }
-
-    if (e) {
-      self.inState.click = !self.inState.click
-      if (self.isInStateTrue()) self.enter(self)
-      else self.leave(self)
-    } else {
-      self.tip().hasClass('in') ? self.leave(self) : self.enter(self)
-    }
-  }
-
-  Tooltip.prototype.destroy = function () {
-    var that = this
-    clearTimeout(this.timeout)
-    this.hide(function () {
-      that.$element.off('.' + that.type).removeData('bs.' + that.type)
-      if (that.$tip) {
-        that.$tip.detach()
-      }
-      that.$tip = null
-      that.$arrow = null
-      that.$viewport = null
-    })
-  }
-
-
-  // TOOLTIP PLUGIN DEFINITION
-  // =========================
-
-  function Plugin(option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.tooltip')
-      var options = typeof option == 'object' && option
-
-      if (!data && /destroy|hide/.test(option)) return
-      if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  var old = $.fn.tooltip
-
-  $.fn.tooltip             = Plugin
-  $.fn.tooltip.Constructor = Tooltip
-
-
-  // TOOLTIP NO CONFLICT
-  // ===================
-
-  $.fn.tooltip.noConflict = function () {
-    $.fn.tooltip = old
-    return this
-  }
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: popover.js v3.3.5
- * http://getbootstrap.com/javascript/#popovers
- * ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // POPOVER PUBLIC CLASS DEFINITION
-  // ===============================
-
-  var Popover = function (element, options) {
-    this.init('popover', element, options)
-  }
-
-  if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
-
-  Popover.VERSION  = '3.3.5'
-
-  Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
-    placement: 'right',
-    trigger: 'click',
-    content: '',
-    template: '<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
-  })
-
-
-  // NOTE: POPOVER EXTENDS tooltip.js
-  // ================================
-
-  Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype)
-
-  Popover.prototype.constructor = Popover
-
-  Popover.prototype.getDefaults = function () {
-    return Popover.DEFAULTS
-  }
-
-  Popover.prototype.setContent = function () {
-    var $tip    = this.tip()
-    var title   = this.getTitle()
-    var content = this.getContent()
-
-    $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
-    $tip.find('.popover-content').children().detach().end()[ // we use append for html objects to maintain js events
-      this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text'
-    ](content)
-
-    $tip.removeClass('fade top bottom left right in')
-
-    // IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do
-    // this manually by checking the contents.
-    if (!$tip.find('.popover-title').html()) $tip.find('.popover-title').hide()
-  }
-
-  Popover.prototype.hasContent = function () {
-    return this.getTitle() || this.getContent()
-  }
-
-  Popover.prototype.getContent = function () {
-    var $e = this.$element
-    var o  = this.options
-
-    return $e.attr('data-content')
-      || (typeof o.content == 'function' ?
-            o.content.call($e[0]) :
-            o.content)
-  }
-
-  Popover.prototype.arrow = function () {
-    return (this.$arrow = this.$arrow || this.tip().find('.arrow'))
-  }
-
-
-  // POPOVER PLUGIN DEFINITION
-  // =========================
-
-  function Plugin(option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.popover')
-      var options = typeof option == 'object' && option
-
-      if (!data && /destroy|hide/.test(option)) return
-      if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  var old = $.fn.popover
-
-  $.fn.popover             = Plugin
-  $.fn.popover.Constructor = Popover
-
-
-  // POPOVER NO CONFLICT
-  // ===================
-
-  $.fn.popover.noConflict = function () {
-    $.fn.popover = old
-    return this
-  }
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: scrollspy.js v3.3.5
- * http://getbootstrap.com/javascript/#scrollspy
- * ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // SCROLLSPY CLASS DEFINITION
-  // ==========================
-
-  function ScrollSpy(element, options) {
-    this.$body          = $(document.body)
-    this.$scrollElement = $(element).is(document.body) ? $(window) : $(element)
-    this.options        = $.extend({}, ScrollSpy.DEFAULTS, options)
-    this.selector       = (this.options.target || '') + ' .nav li > a'
-    this.offsets        = []
-    this.targets        = []
-    this.activeTarget   = null
-    this.scrollHeight   = 0
-
-    this.$scrollElement.on('scroll.bs.scrollspy', $.proxy(this.process, this))
-    this.refresh()
-    this.process()
-  }
-
-  ScrollSpy.VERSION  = '3.3.5'
-
-  ScrollSpy.DEFAULTS = {
-    offset: 10
-  }
-
-  ScrollSpy.prototype.getScrollHeight = function () {
-    return this.$scrollElement[0].scrollHeight || Math.max(this.$body[0].scrollHeight, document.documentElement.scrollHeight)
-  }
-
-  ScrollSpy.prototype.refresh = function () {
-    var that          = this
-    var offsetMethod  = 'offset'
-    var offsetBase    = 0
-
-    this.offsets      = []
-    this.targets      = []
-    this.scrollHeight = this.getScrollHeight()
-
-    if (!$.isWindow(this.$scrollElement[0])) {
-      offsetMethod = 'position'
-      offsetBase   = this.$scrollElement.scrollTop()
-    }
-
-    this.$body
-      .find(this.selector)
-      .map(function () {
-        var $el   = $(this)
-        var href  = $el.data('target') || $el.attr('href')
-        var $href = /^#./.test(href) && $(href)
-
-        return ($href
-          && $href.length
-          && $href.is(':visible')
-          && [[$href[offsetMethod]().top + offsetBase, href]]) || null
-      })
-      .sort(function (a, b) { return a[0] - b[0] })
-      .each(function () {
-        that.offsets.push(this[0])
-        that.targets.push(this[1])
-      })
-  }
-
-  ScrollSpy.prototype.process = function () {
-    var scrollTop    = this.$scrollElement.scrollTop() + this.options.offset
-    var scrollHeight = this.getScrollHeight()
-    var maxScroll    = this.options.offset + scrollHeight - this.$scrollElement.height()
-    var offsets      = this.offsets
-    var targets      = this.targets
-    var activeTarget = this.activeTarget
-    var i
-
-    if (this.scrollHeight != scrollHeight) {
-      this.refresh()
-    }
-
-    if (scrollTop >= maxScroll) {
-      return activeTarget != (i = targets[targets.length - 1]) && this.activate(i)
-    }
-
-    if (activeTarget && scrollTop < offsets[0]) {
-      this.activeTarget = null
-      return this.clear()
-    }
-
-    for (i = offsets.length; i--;) {
-      activeTarget != targets[i]
-        && scrollTop >= offsets[i]
-        && (offsets[i + 1] === undefined || scrollTop < offsets[i + 1])
-        && this.activate(targets[i])
-    }
-  }
-
-  ScrollSpy.prototype.activate = function (target) {
-    this.activeTarget = target
-
-    this.clear()
-
-    var selector = this.selector +
-      '[data-target="' + target + '"],' +
-      this.selector + '[href="' + target + '"]'
-
-    var active = $(selector)
-      .parents('li')
-      .addClass('active')
-
-    if (active.parent('.dropdown-menu').length) {
-      active = active
-        .closest('li.dropdown')
-        .addClass('active')
-    }
-
-    active.trigger('activate.bs.scrollspy')
-  }
-
-  ScrollSpy.prototype.clear = function () {
-    $(this.selector)
-      .parentsUntil(this.options.target, '.active')
-      .removeClass('active')
-  }
-
-
-  // SCROLLSPY PLUGIN DEFINITION
-  // ===========================
-
-  function Plugin(option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.scrollspy')
-      var options = typeof option == 'object' && option
-
-      if (!data) $this.data('bs.scrollspy', (data = new ScrollSpy(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  var old = $.fn.scrollspy
-
-  $.fn.scrollspy             = Plugin
-  $.fn.scrollspy.Constructor = ScrollSpy
-
-
-  // SCROLLSPY NO CONFLICT
-  // =====================
-
-  $.fn.scrollspy.noConflict = function () {
-    $.fn.scrollspy = old
-    return this
-  }
-
-
-  // SCROLLSPY DATA-API
-  // ==================
-
-  $(window).on('load.bs.scrollspy.data-api', function () {
-    $('[data-spy="scroll"]').each(function () {
-      var $spy = $(this)
-      Plugin.call($spy, $spy.data())
-    })
-  })
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: tab.js v3.3.5
- * http://getbootstrap.com/javascript/#tabs
- * ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // TAB CLASS DEFINITION
-  // ====================
-
-  var Tab = function (element) {
-    // jscs:disable requireDollarBeforejQueryAssignment
-    this.element = $(element)
-    // jscs:enable requireDollarBeforejQueryAssignment
-  }
-
-  Tab.VERSION = '3.3.5'
-
-  Tab.TRANSITION_DURATION = 150
-
-  Tab.prototype.show = function () {
-    var $this    = this.element
-    var $ul      = $this.closest('ul:not(.dropdown-menu)')
-    var selector = $this.data('target')
-
-    if (!selector) {
-      selector = $this.attr('href')
-      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
-    }
-
-    if ($this.parent('li').hasClass('active')) return
-
-    var $previous = $ul.find('.active:last a')
-    var hideEvent = $.Event('hide.bs.tab', {
-      relatedTarget: $this[0]
-    })
-    var showEvent = $.Event('show.bs.tab', {
-      relatedTarget: $previous[0]
-    })
-
-    $previous.trigger(hideEvent)
-    $this.trigger(showEvent)
-
-    if (showEvent.isDefaultPrevented() || hideEvent.isDefaultPrevented()) return
-
-    var $target = $(selector)
-
-    this.activate($this.closest('li'), $ul)
-    this.activate($target, $target.parent(), function () {
-      $previous.trigger({
-        type: 'hidden.bs.tab',
-        relatedTarget: $this[0]
-      })
-      $this.trigger({
-        type: 'shown.bs.tab',
-        relatedTarget: $previous[0]
-      })
-    })
-  }
-
-  Tab.prototype.activate = function (element, container, callback) {
-    var $active    = container.find('> .active')
-    var transition = callback
-      && $.support.transition
-      && ($active.length && $active.hasClass('fade') || !!container.find('> .fade').length)
-
-    function next() {
-      $active
-        .removeClass('active')
-        .find('> .dropdown-menu > .active')
-          .removeClass('active')
-        .end()
-        .find('[data-toggle="tab"]')
-          .attr('aria-expanded', false)
-
-      element
-        .addClass('active')
-        .find('[data-toggle="tab"]')
-          .attr('aria-expanded', true)
-
-      if (transition) {
-        element[0].offsetWidth // reflow for transition
-        element.addClass('in')
-      } else {
-        element.removeClass('fade')
-      }
-
-      if (element.parent('.dropdown-menu').length) {
-        element
-          .closest('li.dropdown')
-            .addClass('active')
-          .end()
-          .find('[data-toggle="tab"]')
-            .attr('aria-expanded', true)
-      }
-
-      callback && callback()
-    }
-
-    $active.length && transition ?
-      $active
-        .one('bsTransitionEnd', next)
-        .emulateTransitionEnd(Tab.TRANSITION_DURATION) :
-      next()
-
-    $active.removeClass('in')
-  }
-
-
-  // TAB PLUGIN DEFINITION
-  // =====================
-
-  function Plugin(option) {
-    return this.each(function () {
-      var $this = $(this)
-      var data  = $this.data('bs.tab')
-
-      if (!data) $this.data('bs.tab', (data = new Tab(this)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  var old = $.fn.tab
-
-  $.fn.tab             = Plugin
-  $.fn.tab.Constructor = Tab
-
-
-  // TAB NO CONFLICT
-  // ===============
-
-  $.fn.tab.noConflict = function () {
-    $.fn.tab = old
-    return this
-  }
-
-
-  // TAB DATA-API
-  // ============
-
-  var clickHandler = function (e) {
-    e.preventDefault()
-    Plugin.call($(this), 'show')
-  }
-
-  $(document)
-    .on('click.bs.tab.data-api', '[data-toggle="tab"]', clickHandler)
-    .on('click.bs.tab.data-api', '[data-toggle="pill"]', clickHandler)
-
-}(jQuery);
-
-/* ========================================================================
- * Bootstrap: affix.js v3.3.5
- * http://getbootstrap.com/javascript/#affix
- * ========================================================================
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- * ======================================================================== */
-
-
-+function ($) {
-  'use strict';
-
-  // AFFIX CLASS DEFINITION
-  // ======================
-
-  var Affix = function (element, options) {
-    this.options = $.extend({}, Affix.DEFAULTS, options)
-
-    this.$target = $(this.options.target)
-      .on('scroll.bs.affix.data-api', $.proxy(this.checkPosition, this))
-      .on('click.bs.affix.data-api',  $.proxy(this.checkPositionWithEventLoop, this))
-
-    this.$element     = $(element)
-    this.affixed      = null
-    this.unpin        = null
-    this.pinnedOffset = null
-
-    this.checkPosition()
-  }
-
-  Affix.VERSION  = '3.3.5'
-
-  Affix.RESET    = 'affix affix-top affix-bottom'
-
-  Affix.DEFAULTS = {
-    offset: 0,
-    target: window
-  }
-
-  Affix.prototype.getState = function (scrollHeight, height, offsetTop, offsetBottom) {
-    var scrollTop    = this.$target.scrollTop()
-    var position     = this.$element.offset()
-    var targetHeight = this.$target.height()
-
-    if (offsetTop != null && this.affixed == 'top') return scrollTop < offsetTop ? 'top' : false
-
-    if (this.affixed == 'bottom') {
-      if (offsetTop != null) return (scrollTop + this.unpin <= position.top) ? false : 'bottom'
-      return (scrollTop + targetHeight <= scrollHeight - offsetBottom) ? false : 'bottom'
-    }
-
-    var initializing   = this.affixed == null
-    var colliderTop    = initializing ? scrollTop : position.top
-    var colliderHeight = initializing ? targetHeight : height
-
-    if (offsetTop != null && scrollTop <= offsetTop) return 'top'
-    if (offsetBottom != null && (colliderTop + colliderHeight >= scrollHeight - offsetBottom)) return 'bottom'
-
-    return false
-  }
-
-  Affix.prototype.getPinnedOffset = function () {
-    if (this.pinnedOffset) return this.pinnedOffset
-    this.$element.removeClass(Affix.RESET).addClass('affix')
-    var scrollTop = this.$target.scrollTop()
-    var position  = this.$element.offset()
-    return (this.pinnedOffset = position.top - scrollTop)
-  }
-
-  Affix.prototype.checkPositionWithEventLoop = function () {
-    setTimeout($.proxy(this.checkPosition, this), 1)
-  }
-
-  Affix.prototype.checkPosition = function () {
-    if (!this.$element.is(':visible')) return
-
-    var height       = this.$element.height()
-    var offset       = this.options.offset
-    var offsetTop    = offset.top
-    var offsetBottom = offset.bottom
-    var scrollHeight = Math.max($(document).height(), $(document.body).height())
-
-    if (typeof offset != 'object')         offsetBottom = offsetTop = offset
-    if (typeof offsetTop == 'function')    offsetTop    = offset.top(this.$element)
-    if (typeof offsetBottom == 'function') offsetBottom = offset.bottom(this.$element)
-
-    var affix = this.getState(scrollHeight, height, offsetTop, offsetBottom)
-
-    if (this.affixed != affix) {
-      if (this.unpin != null) this.$element.css('top', '')
-
-      var affixType = 'affix' + (affix ? '-' + affix : '')
-      var e         = $.Event(affixType + '.bs.affix')
-
-      this.$element.trigger(e)
-
-      if (e.isDefaultPrevented()) return
-
-      this.affixed = affix
-      this.unpin = affix == 'bottom' ? this.getPinnedOffset() : null
-
-      this.$element
-        .removeClass(Affix.RESET)
-        .addClass(affixType)
-        .trigger(affixType.replace('affix', 'affixed') + '.bs.affix')
-    }
-
-    if (affix == 'bottom') {
-      this.$element.offset({
-        top: scrollHeight - height - offsetBottom
-      })
-    }
-  }
-
-
-  // AFFIX PLUGIN DEFINITION
-  // =======================
-
-  function Plugin(option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.affix')
-      var options = typeof option == 'object' && option
-
-      if (!data) $this.data('bs.affix', (data = new Affix(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  var old = $.fn.affix
-
-  $.fn.affix             = Plugin
-  $.fn.affix.Constructor = Affix
-
-
-  // AFFIX NO CONFLICT
-  // =================
-
-  $.fn.affix.noConflict = function () {
-    $.fn.affix = old
-    return this
-  }
-
-
-  // AFFIX DATA-API
-  // ==============
-
-  $(window).on('load', function () {
-    $('[data-spy="affix"]').each(function () {
-      var $spy = $(this)
-      var data = $spy.data()
-
-      data.offset = data.offset || {}
-
-      if (data.offsetBottom != null) data.offset.bottom = data.offsetBottom
-      if (data.offsetTop    != null) data.offset.top    = data.offsetTop
-
-      Plugin.call($spy, data)
-    })
-  })
-
-}(jQuery);
+require(["jquery", "modal", "dropdown", "transition"]);
\ No newline at end of file
diff --git a/static/src/js/lib/bootstrap/dropdown.js b/static/src/js/lib/bootstrap/dropdown.js
new file mode 100644
index 0000000..9c732b4
--- /dev/null
+++ b/static/src/js/lib/bootstrap/dropdown.js
@@ -0,0 +1,168 @@
+define([ 'jquery', 'transition' ], function ( jQuery ) {
+/* ========================================================================
+ * Bootstrap: dropdown.js v3.3.5
+ * http://getbootstrap.com/javascript/#dropdowns
+ * ========================================================================
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+  'use strict';
+
+  // DROPDOWN CLASS DEFINITION
+  // =========================
+
+  var backdrop = '.dropdown-backdrop'
+  var toggle   = '[data-toggle="dropdown"]'
+  var Dropdown = function (element) {
+    $(element).on('click.bs.dropdown', this.toggle)
+  }
+
+  Dropdown.VERSION = '3.3.5'
+
+  function getParent($this) {
+    var selector = $this.attr('data-target')
+
+    if (!selector) {
+      selector = $this.attr('href')
+      selector = selector && /#[A-Za-z]/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
+    }
+
+    var $parent = selector && $(selector)
+
+    return $parent && $parent.length ? $parent : $this.parent()
+  }
+
+  function clearMenus(e) {
+    if (e && e.which === 3) return
+    $(backdrop).remove()
+    $(toggle).each(function () {
+      var $this         = $(this)
+      var $parent       = getParent($this)
+      var relatedTarget = { relatedTarget: this }
+
+      if (!$parent.hasClass('open')) return
+
+      if (e && e.type == 'click' && /input|textarea/i.test(e.target.tagName) && $.contains($parent[0], e.target)) return
+
+      $parent.trigger(e = $.Event('hide.bs.dropdown', relatedTarget))
+
+      if (e.isDefaultPrevented()) return
+
+      $this.attr('aria-expanded', 'false')
+      $parent.removeClass('open').trigger($.Event('hidden.bs.dropdown', relatedTarget))
+    })
+  }
+
+  Dropdown.prototype.toggle = function (e) {
+    var $this = $(this)
+
+    if ($this.is('.disabled, :disabled')) return
+
+    var $parent  = getParent($this)
+    var isActive = $parent.hasClass('open')
+
+    clearMenus()
+
+    if (!isActive) {
+      if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) {
+        // if mobile we use a backdrop because click events don't delegate
+        $(document.createElement('div'))
+          .addClass('dropdown-backdrop')
+          .insertAfter($(this))
+          .on('click', clearMenus)
+      }
+
+      var relatedTarget = { relatedTarget: this }
+      $parent.trigger(e = $.Event('show.bs.dropdown', relatedTarget))
+
+      if (e.isDefaultPrevented()) return
+
+      $this
+        .trigger('focus')
+        .attr('aria-expanded', 'true')
+
+      $parent
+        .toggleClass('open')
+        .trigger($.Event('shown.bs.dropdown', relatedTarget))
+    }
+
+    return false
+  }
+
+  Dropdown.prototype.keydown = function (e) {
+    if (!/(38|40|27|32)/.test(e.which) || /input|textarea/i.test(e.target.tagName)) return
+
+    var $this = $(this)
+
+    e.preventDefault()
+    e.stopPropagation()
+
+    if ($this.is('.disabled, :disabled')) return
+
+    var $parent  = getParent($this)
+    var isActive = $parent.hasClass('open')
+
+    if (!isActive && e.which != 27 || isActive && e.which == 27) {
+      if (e.which == 27) $parent.find(toggle).trigger('focus')
+      return $this.trigger('click')
+    }
+
+    var desc = ' li:not(.disabled):visible a'
+    var $items = $parent.find('.dropdown-menu' + desc)
+
+    if (!$items.length) return
+
+    var index = $items.index(e.target)
+
+    if (e.which == 38 && index > 0)                 index--         // up
+    if (e.which == 40 && index < $items.length - 1) index++         // down
+    if (!~index)                                    index = 0
+
+    $items.eq(index).trigger('focus')
+  }
+
+
+  // DROPDOWN PLUGIN DEFINITION
+  // ==========================
+
+  function Plugin(option) {
+    return this.each(function () {
+      var $this = $(this)
+      var data  = $this.data('bs.dropdown')
+
+      if (!data) $this.data('bs.dropdown', (data = new Dropdown(this)))
+      if (typeof option == 'string') data[option].call($this)
+    })
+  }
+
+  var old = $.fn.dropdown
+
+  $.fn.dropdown             = Plugin
+  $.fn.dropdown.Constructor = Dropdown
+
+
+  // DROPDOWN NO CONFLICT
+  // ====================
+
+  $.fn.dropdown.noConflict = function () {
+    $.fn.dropdown = old
+    return this
+  }
+
+
+  // APPLY TO STANDARD DROPDOWN ELEMENTS
+  // ===================================
+
+  $(document)
+    .on('click.bs.dropdown.data-api', clearMenus)
+    .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
+    .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
+    .on('keydown.bs.dropdown.data-api', toggle, Dropdown.prototype.keydown)
+    .on('keydown.bs.dropdown.data-api', '.dropdown-menu', Dropdown.prototype.keydown)
+
+}(jQuery);
+
+});
\ No newline at end of file
diff --git a/static/src/js/lib/bootstrap/modal.js b/static/src/js/lib/bootstrap/modal.js
new file mode 100644
index 0000000..e5dffc7
--- /dev/null
+++ b/static/src/js/lib/bootstrap/modal.js
@@ -0,0 +1,340 @@
+define([ 'jquery', 'transition' ], function ( jQuery ) {
+/* ========================================================================
+ * Bootstrap: modal.js v3.3.5
+ * http://getbootstrap.com/javascript/#modals
+ * ========================================================================
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+  'use strict';
+
+  // MODAL CLASS DEFINITION
+  // ======================
+
+  var Modal = function (element, options) {
+    this.options             = options
+    this.$body               = $(document.body)
+    this.$element            = $(element)
+    this.$dialog             = this.$element.find('.modal-dialog')
+    this.$backdrop           = null
+    this.isShown             = null
+    this.originalBodyPad     = null
+    this.scrollbarWidth      = 0
+    this.ignoreBackdropClick = false
+
+    if (this.options.remote) {
+      this.$element
+        .find('.modal-content')
+        .load(this.options.remote, $.proxy(function () {
+          this.$element.trigger('loaded.bs.modal')
+        }, this))
+    }
+  }
+
+  Modal.VERSION  = '3.3.5'
+
+  Modal.TRANSITION_DURATION = 300
+  Modal.BACKDROP_TRANSITION_DURATION = 150
+
+  Modal.DEFAULTS = {
+    backdrop: true,
+    keyboard: true,
+    show: true
+  }
+
+  Modal.prototype.toggle = function (_relatedTarget) {
+    return this.isShown ? this.hide() : this.show(_relatedTarget)
+  }
+
+  Modal.prototype.show = function (_relatedTarget) {
+    var that = this
+    var e    = $.Event('show.bs.modal', { relatedTarget: _relatedTarget })
+
+    this.$element.trigger(e)
+
+    if (this.isShown || e.isDefaultPrevented()) return
+
+    this.isShown = true
+
+    this.checkScrollbar()
+    this.setScrollbar()
+    this.$body.addClass('modal-open')
+
+    this.escape()
+    this.resize()
+
+    this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this))
+
+    this.$dialog.on('mousedown.dismiss.bs.modal', function () {
+      that.$element.one('mouseup.dismiss.bs.modal', function (e) {
+        if ($(e.target).is(that.$element)) that.ignoreBackdropClick = true
+      })
+    })
+
+    this.backdrop(function () {
+      var transition = $.support.transition && that.$element.hasClass('fade')
+
+      if (!that.$element.parent().length) {
+        that.$element.appendTo(that.$body) // don't move modals dom position
+      }
+
+      that.$element
+        .show()
+        .scrollTop(0)
+
+      that.adjustDialog()
+
+      if (transition) {
+        that.$element[0].offsetWidth // force reflow
+      }
+
+      that.$element.addClass('in')
+
+      that.enforceFocus()
+
+      var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget })
+
+      transition ?
+        that.$dialog // wait for modal to slide in
+          .one('bsTransitionEnd', function () {
+            that.$element.trigger('focus').trigger(e)
+          })
+          .emulateTransitionEnd(Modal.TRANSITION_DURATION) :
+        that.$element.trigger('focus').trigger(e)
+    })
+  }
+
+  Modal.prototype.hide = function (e) {
+    if (e) e.preventDefault()
+
+    e = $.Event('hide.bs.modal')
+
+    this.$element.trigger(e)
+
+    if (!this.isShown || e.isDefaultPrevented()) return
+
+    this.isShown = false
+
+    this.escape()
+    this.resize()
+
+    $(document).off('focusin.bs.modal')
+
+    this.$element
+      .removeClass('in')
+      .off('click.dismiss.bs.modal')
+      .off('mouseup.dismiss.bs.modal')
+
+    this.$dialog.off('mousedown.dismiss.bs.modal')
+
+    $.support.transition && this.$element.hasClass('fade') ?
+      this.$element
+        .one('bsTransitionEnd', $.proxy(this.hideModal, this))
+        .emulateTransitionEnd(Modal.TRANSITION_DURATION) :
+      this.hideModal()
+  }
+
+  Modal.prototype.enforceFocus = function () {
+    $(document)
+      .off('focusin.bs.modal') // guard against infinite focus loop
+      .on('focusin.bs.modal', $.proxy(function (e) {
+        if (this.$element[0] !== e.target && !this.$element.has(e.target).length) {
+          this.$element.trigger('focus')
+        }
+      }, this))
+  }
+
+  Modal.prototype.escape = function () {
+    if (this.isShown && this.options.keyboard) {
+      this.$element.on('keydown.dismiss.bs.modal', $.proxy(function (e) {
+        e.which == 27 && this.hide()
+      }, this))
+    } else if (!this.isShown) {
+      this.$element.off('keydown.dismiss.bs.modal')
+    }
+  }
+
+  Modal.prototype.resize = function () {
+    if (this.isShown) {
+      $(window).on('resize.bs.modal', $.proxy(this.handleUpdate, this))
+    } else {
+      $(window).off('resize.bs.modal')
+    }
+  }
+
+  Modal.prototype.hideModal = function () {
+    var that = this
+    this.$element.hide()
+    this.backdrop(function () {
+      that.$body.removeClass('modal-open')
+      that.resetAdjustments()
+      that.resetScrollbar()
+      that.$element.trigger('hidden.bs.modal')
+    })
+  }
+
+  Modal.prototype.removeBackdrop = function () {
+    this.$backdrop && this.$backdrop.remove()
+    this.$backdrop = null
+  }
+
+  Modal.prototype.backdrop = function (callback) {
+    var that = this
+    var animate = this.$element.hasClass('fade') ? 'fade' : ''
+
+    if (this.isShown && this.options.backdrop) {
+      var doAnimate = $.support.transition && animate
+
+      this.$backdrop = $(document.createElement('div'))
+        .addClass('modal-backdrop ' + animate)
+        .appendTo(this.$body)
+
+      this.$element.on('click.dismiss.bs.modal', $.proxy(function (e) {
+        if (this.ignoreBackdropClick) {
+          this.ignoreBackdropClick = false
+          return
+        }
+        if (e.target !== e.currentTarget) return
+        this.options.backdrop == 'static'
+          ? this.$element[0].focus()
+          : this.hide()
+      }, this))
+
+      if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
+
+      this.$backdrop.addClass('in')
+
+      if (!callback) return
+
+      doAnimate ?
+        this.$backdrop
+          .one('bsTransitionEnd', callback)
+          .emulateTransitionEnd(Modal.BACKDROP_TRANSITION_DURATION) :
+        callback()
+
+    } else if (!this.isShown && this.$backdrop) {
+      this.$backdrop.removeClass('in')
+
+      var callbackRemove = function () {
+        that.removeBackdrop()
+        callback && callback()
+      }
+      $.support.transition && this.$element.hasClass('fade') ?
+        this.$backdrop
+          .one('bsTransitionEnd', callbackRemove)
+          .emulateTransitionEnd(Modal.BACKDROP_TRANSITION_DURATION) :
+        callbackRemove()
+
+    } else if (callback) {
+      callback()
+    }
+  }
+
+  // these following methods are used to handle overflowing modals
+
+  Modal.prototype.handleUpdate = function () {
+    this.adjustDialog()
+  }
+
+  Modal.prototype.adjustDialog = function () {
+    var modalIsOverflowing = this.$element[0].scrollHeight > document.documentElement.clientHeight
+
+    this.$element.css({
+      paddingLeft:  !this.bodyIsOverflowing && modalIsOverflowing ? this.scrollbarWidth : '',
+      paddingRight: this.bodyIsOverflowing && !modalIsOverflowing ? this.scrollbarWidth : ''
+    })
+  }
+
+  Modal.prototype.resetAdjustments = function () {
+    this.$element.css({
+      paddingLeft: '',
+      paddingRight: ''
+    })
+  }
+
+  Modal.prototype.checkScrollbar = function () {
+    var fullWindowWidth = window.innerWidth
+    if (!fullWindowWidth) { // workaround for missing window.innerWidth in IE8
+      var documentElementRect = document.documentElement.getBoundingClientRect()
+      fullWindowWidth = documentElementRect.right - Math.abs(documentElementRect.left)
+    }
+    this.bodyIsOverflowing = document.body.clientWidth < fullWindowWidth
+    this.scrollbarWidth = this.measureScrollbar()
+  }
+
+  Modal.prototype.setScrollbar = function () {
+    var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10)
+    this.originalBodyPad = document.body.style.paddingRight || ''
+    if (this.bodyIsOverflowing) this.$body.css('padding-right', bodyPad + this.scrollbarWidth)
+  }
+
+  Modal.prototype.resetScrollbar = function () {
+    this.$body.css('padding-right', this.originalBodyPad)
+  }
+
+  Modal.prototype.measureScrollbar = function () { // thx walsh
+    var scrollDiv = document.createElement('div')
+    scrollDiv.className = 'modal-scrollbar-measure'
+    this.$body.append(scrollDiv)
+    var scrollbarWidth = scrollDiv.offsetWidth - scrollDiv.clientWidth
+    this.$body[0].removeChild(scrollDiv)
+    return scrollbarWidth
+  }
+
+
+  // MODAL PLUGIN DEFINITION
+  // =======================
+
+  function Plugin(option, _relatedTarget) {
+    return this.each(function () {
+      var $this   = $(this)
+      var data    = $this.data('bs.modal')
+      var options = $.extend({}, Modal.DEFAULTS, $this.data(), typeof option == 'object' && option)
+
+      if (!data) $this.data('bs.modal', (data = new Modal(this, options)))
+      if (typeof option == 'string') data[option](_relatedTarget)
+      else if (options.show) data.show(_relatedTarget)
+    })
+  }
+
+  var old = $.fn.modal
+
+  $.fn.modal             = Plugin
+  $.fn.modal.Constructor = Modal
+
+
+  // MODAL NO CONFLICT
+  // =================
+
+  $.fn.modal.noConflict = function () {
+    $.fn.modal = old
+    return this
+  }
+
+
+  // MODAL DATA-API
+  // ==============
+
+  $(document).on('click.bs.modal.data-api', '[data-toggle="modal"]', function (e) {
+    var $this   = $(this)
+    var href    = $this.attr('href')
+    var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) // strip for ie7
+    var option  = $target.data('bs.modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data())
+
+    if ($this.is('a')) e.preventDefault()
+
+    $target.one('show.bs.modal', function (showEvent) {
+      if (showEvent.isDefaultPrevented()) return // only register focus restorer if modal will actually get shown
+      $target.one('hidden.bs.modal', function () {
+        $this.is(':visible') && $this.trigger('focus')
+      })
+    })
+    Plugin.call($target, option, this)
+  })
+
+}(jQuery);
+
+});
\ No newline at end of file
diff --git a/static/src/js/lib/bootstrap/transition.js b/static/src/js/lib/bootstrap/transition.js
new file mode 100644
index 0000000..77012ec
--- /dev/null
+++ b/static/src/js/lib/bootstrap/transition.js
@@ -0,0 +1,62 @@
+define([ 'jquery', 'transition' ], function ( jQuery ) {
+/* ========================================================================
+ * Bootstrap: transition.js v3.3.5
+ * http://getbootstrap.com/javascript/#transitions
+ * ========================================================================
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+  'use strict';
+
+  // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
+  // ============================================================
+
+  function transitionEnd() {
+    var el = document.createElement('bootstrap')
+
+    var transEndEventNames = {
+      WebkitTransition : 'webkitTransitionEnd',
+      MozTransition    : 'transitionend',
+      OTransition      : 'oTransitionEnd otransitionend',
+      transition       : 'transitionend'
+    }
+
+    for (var name in transEndEventNames) {
+      if (el.style[name] !== undefined) {
+        return { end: transEndEventNames[name] }
+      }
+    }
+
+    return false // explicit for ie8 (  ._.)
+  }
+
+  // http://blog.alexmaccaw.com/css-transitions
+  $.fn.emulateTransitionEnd = function (duration) {
+    var called = false
+    var $el = this
+    $(this).one('bsTransitionEnd', function () { called = true })
+    var callback = function () { if (!called) $($el).trigger($.support.transition.end) }
+    setTimeout(callback, duration)
+    return this
+  }
+
+  $(function () {
+    $.support.transition = transitionEnd()
+
+    if (!$.support.transition) return
+
+    $.event.special.bsTransitionEnd = {
+      bindType: $.support.transition.end,
+      delegateType: $.support.transition.end,
+      handle: function (e) {
+        if ($(e.target).is(this)) return e.handleObj.handler.apply(this, arguments)
+      }
+    }
+  })
+
+}(jQuery);
+
+});
\ No newline at end of file
diff --git a/static/src/js/lib/validator/validator.js b/static/src/js/lib/validator/validator.js
index 687d983..f6c523a 100644
--- a/static/src/js/lib/validator/validator.js
+++ b/static/src/js/lib/validator/validator.js
@@ -25,8 +25,13 @@
  * THE SOFTWARE.
  * ======================================================================== */
 
-
-+function ($) {
+!function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    define(['jquery'], factory);
+  } else {
+    factory(root.jQuery);
+  }
+}(this, function ($) {
   'use strict';
 
   // VALIDATOR CLASS DEFINITION
@@ -322,4 +327,4 @@
     })
   })
 
-}(jQuery);
+});
diff --git a/template/src/admin/admin.html b/template/src/admin/admin.html
index 67b9163..c7577ba 100644
--- a/template/src/admin/admin.html
+++ b/template/src/admin/admin.html
@@ -127,9 +127,7 @@
 
 <script src="/static/js/config.js"></script>
 <script src="/static/js/require.js"></script>
-<script>
-    require(["bootstrap", "admin"]);
-</script>
+<script src="/static/js/app/admin/admin.js"></script>
 
 <!-- footer begin -->
 <div class="footer">

From e76fc95e44d51a51cb242d29680557bec5a6e65a Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Mon, 14 Sep 2015 01:06:54 +0800
Subject: [PATCH 16/17] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20js=20=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E8=8E=B7=E5=8F=96=E4=B8=8D=E5=85=A8=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tools/template_js_path.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tools/template_js_path.py b/tools/template_js_path.py
index 1b92be5..aaee2d9 100644
--- a/tools/template_js_path.py
+++ b/tools/template_js_path.py
@@ -15,10 +15,9 @@ for root, dirs, files in os.walk(template_src_path):
     for name in files:
         html_path = os.path.join(root, name)
         html_content = open(html_path, "r").read()
-        r = re.search(re.compile('<script src="(.*)"></script>'), html_content)
-
+        r = re.findall(re.compile('<script src="(.*)"></script>'), html_content)
         if r:
-            for item in r.groups():
+            for item in r:
                 if item and "app" in item:
                     total_file.append(item)
 

From f828faa10dfd0335e99607108aae28ac770960f5 Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Mon, 14 Sep 2015 10:37:48 +0800
Subject: [PATCH 17/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20datetimepicker=20?=
 =?UTF-8?q?=E4=B8=BA=20AMD=20=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/src/js/build.js                        | 100 ++++--------------
 static/src/js/config.js                       |  36 +++----
 .../bootstrap-datetimepicker.js               |  24 ++++-
 .../bootstrap-datetimepicker.zh-CN.js         |  10 +-
 4 files changed, 69 insertions(+), 101 deletions(-)

diff --git a/static/src/js/build.js b/static/src/js/build.js
index 7bbdaf4..57e6321 100644
--- a/static/src/js/build.js
+++ b/static/src/js/build.js
@@ -3,7 +3,7 @@
 	baseUrl: "./js",
 	// 第三方脚本模块的别名,jquery比libs/jquery-1.11.1.min.js简洁明了；
     paths: {
-        jquery: "lib/jquery/jquery",
+        jquery: "empty:",
         avalon: "lib/avalon/avalon",
         editor: "utils/editor",
         uploader: "utils/uploader",
@@ -18,11 +18,10 @@
         tagEditor: "lib/tagEditor/jquery.tag-editor.min",
         jqueryUI: "lib/jqueryUI/jquery-ui",
         bootstrap: "lib/bootstrap/bootstrap",
-        datetimePicker: "lib/datetime_picker/bootstrap-datetimepicker.zh-CN",
+        datetimePicker: "lib/datetime_picker/bootstrap-datetimepicker",
         validator: "lib/validator/validator",
         ZeroClipboard: "lib/ZeroClipboard/ZeroClipboard",
 
-
         // ------ 下面写的都不要直接用，而是使用上面的封装版本 ------
         //富文本编辑器simditor -> editor
         simditor: "lib/simditor/simditor",
@@ -34,10 +33,15 @@
         _codeMirror: "lib/codeMirror/codemirror",
         codeMirrorClang: "lib/codeMirror/language/clike",
 
+        // bootstrap组件
+        modal: "lib/bootstrap/modal",
+        dropdown: "lib/bootstrap/dropdown",
+        transition: "lib/bootstrap/transition",
+
         //百度webuploader -> uploader
         webUploader: "lib/webuploader/webuploader",
 
-        "_datetimePicker": "lib/datetime_picker/bootstrap-datetimepicker",
+        //"_datetimePicker": "lib/datetime_picker/bootstrap-datetimepicker",
 
         //以下都是页面 script 标签引用的js
         addProblem_0_pack: "app/admin/problem/addProblem",
@@ -50,86 +54,26 @@
         announcement_7_pack: "app/admin/announcement/announcement",
         monitor_8_pack: "app/admin/monitor/monitor",
         groupDetail_9_pack: "app/admin/group/groupDetail",
-        problem_10_pack: "app/oj/problem/problem",
-        submissionList_11_pack: "app/admin/problem/submissionList",
-        editProblem_12_pack: "app/admin/contest/editProblem",
-        joinGroupRequestList_13_pack: "app/admin/group/joinGroupRequestList",
-        changePassword_14_pack: "app/oj/account/changePassword",
-        group_15_pack: "app/admin/group/group",
-        submissionList_16_pack: "app/admin/contest/submissionList",
-        login_17_pack: "app/oj/account/login",
-        contestPassword_18_pack: "app/oj/contest/contestPassword",
-        userList_19_pack: "app/admin/user/userList",
-    },
-    shim: {
-        bootstrap: {deps: ["jquery"]},
-        _datetimePicker: {dep: ["jquery"]},
-        datetimePicker: {deps: ["_datetimePicker"]},
-        validator: ["jquery"]
+        admin_10_pack: "app/admin/admin",
+        problem_11_pack: "app/oj/problem/problem",
+        submissionList_12_pack: "app/admin/problem/submissionList",
+        editProblem_13_pack: "app/admin/contest/editProblem",
+        joinGroupRequestList_14_pack: "app/admin/group/joinGroupRequestList",
+        changePassword_15_pack: "app/oj/account/changePassword",
+        group_16_pack: "app/admin/group/group",
+        submissionList_17_pack: "app/admin/contest/submissionList",
+        login_18_pack: "app/oj/account/login",
+        contestPassword_19_pack: "app/oj/contest/contestPassword",
+        userList_20_pack: "app/admin/user/userList"
     },
     findNestedDependencies: true,
     appDir: "../",
     dir: "../../release/",
     modules: [
-        {
-            name: "addProblem_0_pack"
-        },
+
         {
             name: "addContest_1_pack"
-        },
-        {
-            name: "problem_2_pack"
-        },
-        {
-            name: "register_3_pack"
-        },
-        {
-            name: "contestList_4_pack"
-        },
-        {
-            name: "group_5_pack"
-        },
-        {
-            name: "editProblem_6_pack"
-        },
-        {
-            name: "announcement_7_pack"
-        },
-        {
-            name: "monitor_8_pack"
-        },
-        {
-            name: "groupDetail_9_pack"
-        },
-        {
-            name: "problem_10_pack"
-        },
-        {
-            name: "submissionList_11_pack"
-        },
-        {
-            name: "editProblem_12_pack"
-        },
-        {
-            name: "joinGroupRequestList_13_pack"
-        },
-        {
-            name: "changePassword_14_pack"
-        },
-        {
-            name: "group_15_pack"
-        },
-        {
-            name: "submissionList_16_pack"
-        },
-        {
-            name: "login_17_pack"
-        },
-        {
-            name: "contestPassword_18_pack"
-        },
-        {
-            name: "userList_19_pack"
         }
-    ]
+    ],
+    optimizeCss: "standard",
 })
\ No newline at end of file
diff --git a/static/src/js/config.js b/static/src/js/config.js
index 8a4c51e..ce6e508 100644
--- a/static/src/js/config.js
+++ b/static/src/js/config.js
@@ -17,7 +17,7 @@ var require = {
         tagEditor: "lib/tagEditor/jquery.tag-editor.min",
         jqueryUI: "lib/jqueryUI/jquery-ui",
         bootstrap: "lib/bootstrap/bootstrap",
-        datetimePicker: "lib/datetime_picker/bootstrap-datetimepicker.zh-CN",
+        datetimePicker: "lib/datetime_picker/bootstrap-datetimepicker",
         validator: "lib/validator/validator",
         ZeroClipboard: "lib/ZeroClipboard/ZeroClipboard",
 
@@ -33,10 +33,15 @@ var require = {
         _codeMirror: "lib/codeMirror/codemirror",
         codeMirrorClang: "lib/codeMirror/language/clike",
 
+        // bootstrap组件
+        modal: "lib/bootstrap/modal",
+        dropdown: "lib/bootstrap/dropdown",
+        transition: "lib/bootstrap/transition",
+
         //百度webuploader -> uploader
         webUploader: "lib/webuploader/webuploader",
 
-        "_datetimePicker": "lib/datetime_picker/bootstrap-datetimepicker",
+        // "_datetimePicker": "lib/datetime_picker/bootstrap-datetimepicker",
 
         //以下都是页面 script 标签引用的js
         addProblem_0_pack: "app/admin/problem/addProblem",
@@ -49,21 +54,16 @@ var require = {
         announcement_7_pack: "app/admin/announcement/announcement",
         monitor_8_pack: "app/admin/monitor/monitor",
         groupDetail_9_pack: "app/admin/group/groupDetail",
-        problem_10_pack: "app/oj/problem/problem",
-        submissionList_11_pack: "app/admin/problem/submissionList",
-        editProblem_12_pack: "app/admin/contest/editProblem",
-        joinGroupRequestList_13_pack: "app/admin/group/joinGroupRequestList",
-        changePassword_14_pack: "app/oj/account/changePassword",
-        group_15_pack: "app/admin/group/group",
-        submissionList_16_pack: "app/admin/contest/submissionList",
-        login_17_pack: "app/oj/account/login",
-        contestPassword_18_pack: "app/oj/contest/contestPassword",
-        userList_19_pack: "app/admin/user/userList"
-    },
-    shim: {
-        bootstrap: {deps: ["jquery"]},
-        _datetimePicker: {dep: ["jquery"]},
-        datetimePicker: {deps: ["_datetimePicker"]},
-        validator: ["jquery"]
+        admin_10_pack: "app/admin/admin",
+        problem_11_pack: "app/oj/problem/problem",
+        submissionList_12_pack: "app/admin/problem/submissionList",
+        editProblem_13_pack: "app/admin/contest/editProblem",
+        joinGroupRequestList_14_pack: "app/admin/group/joinGroupRequestList",
+        changePassword_15_pack: "app/oj/account/changePassword",
+        group_16_pack: "app/admin/group/group",
+        submissionList_17_pack: "app/admin/contest/submissionList",
+        login_18_pack: "app/oj/account/login",
+        contestPassword_19_pack: "app/oj/contest/contestPassword",
+        userList_20_pack: "app/admin/user/userList"
     }
 };
\ No newline at end of file
diff --git a/static/src/js/lib/datetime_picker/bootstrap-datetimepicker.js b/static/src/js/lib/datetime_picker/bootstrap-datetimepicker.js
index b7c76e9..1001fcc 100755
--- a/static/src/js/lib/datetime_picker/bootstrap-datetimepicker.js
+++ b/static/src/js/lib/datetime_picker/bootstrap-datetimepicker.js
@@ -26,8 +26,15 @@
  *
  * Make it work in bootstrap v3
  */
-
-!function ($) {
+(function(factory){
+    if (typeof define === "function" && define.amd) {
+        define(["jquery"], factory);
+    } else if (typeof exports === 'object') {
+        factory(require('jquery'));
+    } else {
+        factory(jQuery);
+    }
+}(function ($, undefined) {
 
 	function UTCDate() {
 		return new Date(Date.UTC.apply(Date, arguments));
@@ -1764,6 +1771,17 @@
 		'</div>';
 	$.fn.datetimepicker.DPGlobal = DPGlobal;
 
+    $.fn.datetimepicker.dates['zh-CN'] = {
+			days: ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六", "星期日"],
+			daysShort: ["周日", "周一", "周二", "周三", "周四", "周五", "周六", "周日"],
+			daysMin:  ["日", "一", "二", "三", "四", "五", "六", "日"],
+			months: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"],
+			monthsShort: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"],
+			today: "今天",
+			suffix: [],
+			meridiem: ["上午", "下午"]
+	};
+
 	/* DATETIMEPICKER NO CONFLICT
 	 * =================== */
 
@@ -1790,4 +1808,4 @@
 		$('[data-provide="datetimepicker-inline"]').datetimepicker();
 	});
 
-}(window.jQuery);
+}));
diff --git a/static/src/js/lib/datetime_picker/bootstrap-datetimepicker.zh-CN.js b/static/src/js/lib/datetime_picker/bootstrap-datetimepicker.zh-CN.js
index 418fb30..d307644 100755
--- a/static/src/js/lib/datetime_picker/bootstrap-datetimepicker.zh-CN.js
+++ b/static/src/js/lib/datetime_picker/bootstrap-datetimepicker.zh-CN.js
@@ -2,7 +2,13 @@
  * Simplified Chinese translation for bootstrap-datetimepicker
  * Yuan Cheung <advanimal@gmail.com>
  */
-;(function($){
+!function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    define(['jquery', '_datetimePicker'], factory);
+  } else {
+    factory(root.jQuery);
+  }
+}(this, function($){
 	$.fn.datetimepicker.dates['zh-CN'] = {
 			days: ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六", "星期日"],
 			daysShort: ["周日", "周一", "周二", "周三", "周四", "周五", "周六", "周日"],
@@ -13,4 +19,4 @@
 			suffix: [],
 			meridiem: ["上午", "下午"]
 	};
-}(jQuery));
+});