Merge branch 'dev' into dev-sxw

Nothing~

oj/local_settings.py

@@ -5,7 +5,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 
 # 下面是需要自己修改的
-LOG_PATH = "LOG/"
+LOG_PATH = "log/"
 
 # 注意这是web 服务器访问的地址，判题端访问的地址不一定一样，因为可能不在一台机器上
 DATABASES = {
@@ -18,7 +18,7 @@ DATABASES = {
         'NAME': 'oj_submission',
         'ENGINE': 'django.db.backends.mysql',
         'HOST': "121.42.32.129",
-        'POST': 3306,
+        'PORT': 3306,
         'USER': 'root',
         'PASSWORD': 'mypwd'
     }
@@ -29,5 +29,5 @@ DEBUG = True
 # 同理 这是 web 服务器的上传路径
 TEST_CASE_DIR = os.path.join(BASE_DIR, 'test_case/')
 
-DATABASE_ROUTERS = ['oj.db_router.DBRouter']
+ALLOWED_HOSTS = []
 

oj/server_settings.py

@@ -1 +1,37 @@
 # coding=utf-8
+import os
+
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
+
+# 下面是需要自己修改的
+LOG_PATH = "/var/log/oj/"
+
+# 注意这是web 服务器访问的地址，判题端访问的地址不一定一样，因为可能不在一台机器上
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.mysql',
+        'NAME': "oj",
+        'CONN_MAX_AGE': 0.3,
+        'HOST': '127.0.0.1',
+        'PORT': 3306,
+        'USER': 'root',
+        'PASSWORD': 'mypwd'
+    },
+    'submission': {
+        'NAME': 'oj_submission',
+        'ENGINE': 'django.db.backends.mysql',
+        'HOST': "127.0.0.1",
+        'PORT': 3306,
+        'USER': 'root',
+        'PASSWORD': 'mypwd'
+    }
+}
+
+DEBUG = True
+
+# 同理 这是 web 服务器的上传路径
+TEST_CASE_DIR = '/root/test_case/'
+
+ALLOWED_HOSTS = ['*']
+

oj/settings.py

@@ -14,15 +14,13 @@ https://docs.djangoproject.com/en/1.8/ref/settings/
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
 
-# todo 判断运行环境
+# 判断运行环境
 ENV = os.environ.get("oj_env", "local")
 
 if ENV == "local":
     from .local_settings import *
 elif ENV == "server":
     from .server_settings import *
-elif ENV == "daocloud":
-    from .daocloud_settings import *
 
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
@@ -33,7 +31,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 # SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = 'hzfp^8mbgapc&x%$#xv)0=t8s7_ilingw(q3!@h&2fty6v6fxz'
 
-ALLOWED_HOSTS = []
+
 
 
 # Application definition
@@ -171,3 +169,5 @@ LOGGING = {
 REST_FRAMEWORK = {
     'TEST_REQUEST_DEFAULT_FORMAT': 'json'
 }
+
+DATABASE_ROUTERS = ['oj.db_router.DBRouter']

template/src/oj/index.html

@@ -33,12 +33,6 @@
             margin-right: 20px;
         }
 
-        #nav-left{
-        display: inline;
-        position:relative;
-        float: right;
-        margin-right: 28px;
-        }
         .section {
             position: relative;
         }
@@ -103,20 +97,7 @@
     <a href="/submissions/">提交</a>&nbsp;&nbsp;
     <a href="/contests/">比赛</a>&nbsp;&nbsp;
     <a href="/groups/">小组</a>&nbsp;&nbsp;
-    <a href="/about/">关于</a>&nbsp;&nbsp;
-    <div id="nav-left">
-        {% if request.user.is_authenticated %}
-        <a href="#">{{ request.user.username }}</a>
-        <a href="/logout/">退出</a>
-        {% else %}
-        <a href="/login/">
-            登录
-        </a>
-        <a href="/register/">
-            注册
-        </a>
-        {% endif %}
-    </div>
+    <a href="/about/">关于</a>
 
 
 </div>
@@ -124,9 +105,9 @@
 <div id="fullpage">
     <div class="section" id="section0">
         <div class="index-section-text animated bounceInUp">
-            <h1>青岛大学在线评测平台</h1>
+            <h1>青岛大学 Online Judge</h1>
 
-            <h3>全新面貌，新的开始~</h3>
+            <h3>新的面貌，新的开始~</h3>
         </div>
         <div class="bottom-pointer">↓继续滚动~</div>
     </div>
@@ -156,7 +137,7 @@
         <div class="section-text">
             <img class="icon" id="img3" src="/static/img/index/m.png">
 
-            <h1>自由举办小组赛</h1>
+            <h1>自由举办小组赛(10月上线)</h1>
 
             <h3>内部比赛，日常作业，期末考试，通通搞定</h3>
         </div>