xuyue/OnlineJudge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into sxw-dev

Browse Source 
Conflicts:
	template/admin/admin.html
This commit is contained in:
sxw
2015-08-07 19:28:24 +08:00
parent 7375bda40c a1686d4015
commit 76e3188360
17 changed files with 288 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
template/admin/admin.html
View File

@@ -67,23 +67,25 @@
<![endif]-->
<!-- browser happy end -->
<div class="container" ms-controller="admin">
<div class="container main" ms-controller="admin">
<div class="row">
<!-- admin left begin-->
<div class="col-md-2">
<ul class="list-group">
<li class="list-group-header">List header</li>
<li class="list-group-item" id="li-index"><a href="#index">主页</a></li>
<li class="list-group-item" id="li-announcement"><a href="#announcement">公告</a></li>
<li class="list-group-item" id="li-index-index"><a href="#index/index">主页</a></li>
<li class="list-group-item" id="li-announcement-announcement"><a href="#announcement/announcement">公告</a></li>
<li class="list-group-item"><a href="#">Applications</a></li>
<li class="list-group-header">Another list header</li>
<li class="list-group-item"><a href="#">Help</a></li>
<li class="list-group-header">比赛管理</li>
<li class="list-group-item" id="li-contest-add_contest"><a href="#contest/add_contest">创建比赛</a></li>
</ul>
</div>
<!-- admin left end -->
<img src="/static/img/loading.gif" id="loading-gif">
<!-- custom body begin -->
<div class='col-md-8'ms-include-src="template_url"></div>
<div class='col-md-8' ms-include-src="template_url" data-include-rendered="hide_loading"></div>
<!-- custom body end -->
</div>
</div>