[前端]修改统一首页和oj_base中导航栏项目,添加首页登录,及登录状态区(这个使用css的float:right方式固定在右侧,可以动态响应窗口大小变化,只是与导航栏位置少不对称了.由于没有引入bootstraps所以没有使用与oj_base里相同的下拉菜单来显示用户登录后的选项

2015-08-29 16:49:07 +08:00
parent f6823d2867
commit a6c33bed36
3 changed files with 68 additions and 29 deletions
--- a/template/src/oj/group/group_list.html
+++ b/template/src/oj/group/group_list.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title></title>
+</head>
+<body>
+
+</body>
+</html>
--- a/template/src/oj/index.html
+++ b/template/src/oj/index.html
@@ -8,7 +8,8 @@
    <link rel="stylesheet" type="text/css" href="/static/css/fullpage/jquery.fullPage.css">
    <style>
        html, textarea, input, option, select, button {
-            font: 1em "Helvetica Neue", Helvetica, "Lantinghei SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", "STHeiti", "WenQuanYi Micro Hei", SimSun, sans-serif;
+        font: 1em "Helvetica Neue", Helvetica, "Lantinghei SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑",
+        "STHeiti", "WenQuanYi Micro Hei", SimSun, sans-serif;
        color: #FFF;
        }

@@ -32,6 +33,12 @@
        margin-right: 20px;
        }

+        #nav-left{
+        display: inline;
+        position:relative;
+        float: right;
+        margin-right: 28px;
+        }
        .section {
        position: relative;
        }
@@ -84,13 +91,34 @@
                loopBottom: true
            });
        });
+
+
    </script>

 </head>
 <body>
 <div id="header">
    <span id="name">qduoj</span>
-    <a href="/problems/">题目</a>&nbsp;&nbsp;<a href="/contests/">比赛</a>&nbsp;&nbsp;<a href="#">小组</a>
+    <a href="/problems/">题目</a>&nbsp;&nbsp;
+    <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>
+
+
 </div>

 <div id="fullpage">
--- a/template/src/oj_base.html
+++ b/template/src/oj_base.html
@@ -45,6 +45,7 @@
                <li><a href="/problems/">题目</a></li>
                <li><a href="/submissions/">提交</a></li>
                <li><a href="/contests/">比赛</a></li>
+                <li><a href="/groups/">小组</a></li>
                <li><a href="/about/">关于</a></li>
            </ul>
            {% if request.user.is_authenticated %}