Accept Merge Request #130 修复比赛顺序问题 : (virusdefender-dev -> dev)

Merge Request: 修复比赛顺序问题
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/130

.gitignore

@@ -55,6 +55,9 @@ db.db
 db.sqlite3
 .DS_Store
 log/
-release/
+static/release/css
+static/release/js
+static/release/img
+build.txt
 tmp/
 test_case/

admin/views.py

@@ -7,7 +7,7 @@ from rest_framework.views import APIView
 
 class AdminTemplateView(APIView):
     def get(self, request, template_dir, template_name):
-        path = settings.TEMPLATE_DIRS[0] + "/admin/" + template_dir + "/" + template_name + ".html"
+        path = settings.TEMPLATES[0]["DIRS"][0] + "/admin/" + template_dir + "/" + template_name + ".html"
         try:
             return HttpResponse(open(path).read(), content_type="text/html")
         except IOError:

contest/views.py

@@ -338,7 +338,7 @@ def contest_list_page(request, page=1):
     所有比赛的列表页
     """
     # 正常情况
-    contests = Contest.objects.filter(visible=True)
+    contests = Contest.objects.filter(visible=True).order_by("-create_time")
 
     # 搜索的情况
     keyword = request.GET.get("keyword", None)

oj/settings.py

@@ -78,7 +78,7 @@ ROOT_URLCONF = 'oj.urls'
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [os.path.join(BASE_DIR, 'template')],
+        'DIRS': [os.path.join(BASE_DIR, 'template/src')],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
@@ -116,7 +116,7 @@ STATIC_URL = '/static/'
 STATICFILES_DIRS = (os.path.join(BASE_DIR, "static/src/"),)
 
 TEMPLATE_DIRS = (
-    os.path.join(BASE_DIR, "template"),
+    os.path.join(BASE_DIR, "template/src"),
 )
 
 AUTH_USER_MODEL = 'account.User'

static/release/fis-conf.js

@@ -0,0 +1,3 @@
+/**
+ * Created by virusdefender on 8/25/15.
+ */