Accept Merge Request #249 修改codeMirror中代码的样式、页面的title、首页跳转的函数名 : (hohoTT-dev -> dev)

Merge Request: 修改codeMirror中代码的样式、页面的title、首页跳转的函数名
Created By: @hohoTT
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/249
This commit is contained in:
virusdefender 2015-09-17 21:25:46 +08:00
commit 20d69dc515
26 changed files with 79 additions and 16 deletions

View File

@ -51,7 +51,7 @@ def logout(request):
return http.HttpResponseRedirect("/")
def page_jump(request):
def index_page(request):
if not request.user.is_authenticated():
return render(request, "oj/index.html")

View File

@ -25,7 +25,8 @@ from contest_submission.views import contest_problem_my_submissions_list_page
urlpatterns = [
url("^$", "account.views.page_jump", name="page_jump_api"),
url(r'^install/$', "install.views.install"),
url("^$", "account.views.index_page", name="index_page"),
url(r'^docs/', include('rest_framework_swagger.urls')),
url(r'^admin/$', TemplateView.as_view(template_name="admin/admin.html"), name="admin_spa_page"),
url(r'^admin/contest/$', TemplateView.as_view(template_name="admin/contest/add_contest.html"),

View File

@ -43,3 +43,8 @@ pre {
font-family: "Consolas", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace;
background-color: white;
}
.CodeMirror-code{
font-family: "Consolas", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace;
background-color: white;
}

View File

@ -1,4 +1,7 @@
{% extends "oj_base.html" %}
{% block title %}
用户修改密码
{% endblock %}
{% block body %}
<div class="container main">
<div class="col-md-6 col-md-offset-3">

View File

@ -1,4 +1,7 @@
{% extends "oj_base.html" %}
{% block title %}
用户登录
{% endblock %}
{% block body %}
<div class="container main">
<div class="col-md-6 col-md-offset-3">

View File

@ -1,4 +1,7 @@
{% extends "oj_base.html" %}
{% block title %}
用户注册
{% endblock %}
{% block body %}
<div class="container main">
<div class="col-md-6 col-md-offset-3">

View File

@ -1,5 +1,7 @@
{% extends "oj_base.html" %}
{% block title %}
{{ announcement.title }}
{% endblock %}
{% block body %}
<div class="container main">
<h1 class="text-center">{{ announcement.title }}</h1>

View File

@ -1,5 +1,7 @@
{% extends 'oj_base.html' %}
{% block title %}
{{ contest.title }}
{% endblock %}
{% block body %}
<div class="container main">
<ul class="nav nav-tabs nav-tabs-google">

View File

@ -1,4 +1,7 @@
{% extends "oj_base.html" %}
{% block title %}
比赛列表
{% endblock %}
{% block body %}
{% load contest %}
<div class="container main">

View File

@ -1,5 +1,7 @@
{% extends 'oj_base.html' %}
{% block title %}
{{ contest_problem.title }}
{% endblock %}
{% block body %}
<div class="container main">
<ul class="nav nav-tabs nav-tabs-google">

View File

@ -1,4 +1,7 @@
{% extends "oj_base.html" %}
{% block title %}
比赛题目列表
{% endblock %}
{% block body %}
{% load problem %}
<div class="container main">

View File

@ -1,4 +1,7 @@
{% extends "oj_base.html" %}
{% block title %}
比赛排名
{% endblock %}
{% block body %}
<div class="container main">

View File

@ -1,4 +1,7 @@
{% extends 'oj_base.html' %}
{% block title %}
我的提交详情
{% endblock %}
{% block css_block %}
<style>
.CodeMirror {

View File

@ -1,5 +1,7 @@
{% extends 'oj_base.html' %}
{% block title %}
我的提交列表
{% endblock %}
{% block body %}
{% load submission %}

View File

@ -1,5 +1,7 @@
{% extends 'oj_base.html' %}
{% block title %}
{{ contest.title }}
{% endblock %}
{% block body %}
<div class="container main">
<ul class="nav nav-tabs nav-tabs-google">

View File

@ -1,5 +1,7 @@
{% extends 'oj_base.html' %}
{% block title %}
比赛提交列表
{% endblock %}
{% block body %}
{% load submission %}

View File

@ -1,5 +1,7 @@
{% extends 'oj_base.html' %}
{% block title %}
{{ group.name }}
{% endblock %}
{% block body %}
<div class="container main">
<ul class="nav nav-tabs nav-tabs-google">

View File

@ -1,4 +1,7 @@
{% extends "oj_base.html" %}
{% block title %}
小组列表
{% endblock %}
{% block body %}
{% load problem %}
<div class="container main">

View File

@ -1,5 +1,7 @@
{% extends 'oj_base.html' %}
{% block title %}
我的申请详情
{% endblock %}
{% block body %}
<div class="container main">

View File

@ -1,5 +1,7 @@
{% extends 'oj_base.html' %}
{% block title %}
我的申请列表
{% endblock %}
{% block body %}
<div class="container main">

View File

@ -1,4 +1,7 @@
{% extends 'oj_base.html' %}
{% block title %}
我的提交详情
{% endblock %}
{% block css_block %}
<style>
.CodeMirror {

View File

@ -1,5 +1,7 @@
{% extends 'oj_base.html' %}
{% block title %}
我的提交列表
{% endblock %}
{% block body %}
{% load submission %}

View File

@ -1,5 +1,7 @@
{% extends 'oj_base.html' %}
{% block title %}
{{ problem.title }}
{% endblock %}
{% block body %}
<div class="container main">
<ul class="nav nav-tabs nav-tabs-google">

View File

@ -1,4 +1,7 @@
{% extends "oj_base.html" %}
{% block title %}
题目列表
{% endblock %}
{% block body %}
{% load problem %}
<div class="container main">

View File

@ -1,5 +1,7 @@
{% extends 'oj_base.html' %}
{% block title %}
我的提交列表
{% endblock %}
{% block body %}
{% load submission %}
<div class="container main">

View File

@ -6,8 +6,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="renderer" content="webkit">
<link rel="shortcut icon" href="/static/img/favicon.ico">
<title>在线评测系统</title>
<title>
{% block title %}
在线评测系统
{% endblock %}
</title>
<!-- global css begin -->
<link href="/static/css/oj.css" rel="stylesheet">