resolve conflict

3 years ago · 2c062d3607
parent 1ffd607401
commit 2c062d3607
1 changed files with 88 additions and 14 deletions
--- a/app/templates/auth/guidance.html
+++ b/app/templates/auth/guidance.html
@ -1,17 +1,90 @@
 {#Reference: http://www.internetke.com/effects/list_2_11.html#}

-<!DOCTYPE html>
-<html lang="en">
-<head>
-<meta charset="UTF-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge" />
-<title>Guidance</title>
-<link rel='stylesheet' type='text/css' href='../../static/guidance.css'/>
-<script type="text/javascript" src="../../static/js/jquery-1.8.2.js"></script>
-<script type="text/javascript" src="../../static/js/base.js"></script>
-</head>
-<body class="keBody">z
-<h1 class="keTitle">Guidance</h1>
+{% extends "base.html" %}
+{% import "_macros.html" as macros %}
+
+{% block title %}Student Exchange Forum of BJUT{% endblock %}
+
+{% block head %}
+    {{ super() }}
+    <!--     Custom styles for this template -->
+    <link rel='stylesheet' type='text/css' href='../../static/guidance.css'/>
+    <script type="text/javascript" src="../../static/js/jquery-1.8.2.js"></script>
+    <script type="text/javascript" src="../../static/js/base.js"></script>
+{% endblock %}
+
+{#主导航#}
+{% block navbar %}
+    <nav class="navbar navbar-default navbar-fixed-top">
+        <div class="container">
+
+            <div class="navbar-header">
+                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+                    <span class="sr-only">Toggle navigation</span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+                <a class="navbar-brand" href="{{ url_for('main.index') }}">Student Exchange Forum of BJUT</a>
+            </div>
+
+            <div class="navbar-collapse collapse">
+
+                <ul class="nav navbar-nav">
+                    <li><a href="{{ url_for('auth.guidance') }}">Guidance</a></li>
+
+                    <form class="navbar-form navbar-left" role="search" method="post">
+                        <input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
+                        <div class="form-group">
+                            <input name="search" value=" " style="width: 420px;margin-left: 20px;" type="text"
+                                   class="form-control" placeholder="Search">
+                        </div>
+                        <button type="submit" class="btn btn-default">Submit</button>
+                    </form>
+
+                </ul>
+
+                <ul class="nav navbar-nav navbar-right">
+
+                    {% if current_user.is_authenticated %}
+                        {#                            通知#}
+                        <li>
+                            <a href="{{ url_for('main.notification') }}">
+                                <svg viewBox="0 0 1024 1024" width="20" height="20">
+                                    <defs>
+                                        <style type="text/css"></style>
+                                    </defs>
+                                    <path d="M892.343 738.743c7.314 0 21.943 0 29.257 7.314-29.257-21.943-51.2-58.514-51.2-95.086V424.23c0-168.229-117.029-307.2-285.257-343.772v-7.314C585.143 36.57 548.57 0 512 0s-80.457 36.571-80.457 73.143v7.314C270.629 117.03 153.6 256 153.6 424.23V650.97c0 36.572-21.943 73.143-51.2 95.086 7.314-7.314 14.629-7.314 29.257-7.314-29.257 0-51.2 21.943-51.2 51.2s21.943 51.2 51.2 51.2h768c29.257 0 51.2-21.943 51.2-51.2-7.314-21.943-29.257-43.886-58.514-51.2zM512 1024c73.143 0 131.657-58.514 131.657-131.657H380.343C380.343 965.486 438.857 1024 512 1024z"
+                                          fill="#3BA9F6" p-id="1699">
+                                    </path>
+                                </svg>
+                                <span class="badge" style="margin-bottom: 10px"></span>
+                            </a>
+                        </li>
+                        {#                            下拉菜单#}
+                        <li class="dropdown">
+                            <a href="{{ url_for('main.notification') }}" class="dropdown-toggle" data-toggle="dropdown">Account<b
+                                    class="caret"></b></a>
+                            <ul class="dropdown-menu">
+                                <li><a href="{{ url_for('main.user', username=current_user.username) }}">MY Profile</a>
+                                </li>
+                                <li><a href="{{ url_for('auth.change_password') }}">MY Account</a></li>
+                                <li><a href="{{ url_for('auth.logout') }}">Log Out</a></li>
+                            </ul>
+                        </li>
+                    {% else %}
+                        <li><a href="{{ url_for('auth.login') }}">Log In</a></li>
+                    {% endif %}
+                </ul>
+            </div>
+        </div>
+    </nav>
+{% endblock %}
+
+{% block content %}
+
+{#<body class="keBody">#}
+<h1 class="keTitle"></h1>
 <div class="kePublic">
 <!--效果html开始-->
 <div class="item_box box10">
@ -128,5 +201,6 @@
 <!--效果html结束-->
 <div class="clear"></div>
 </div>
-</body>
-</html>
+{#</body>#}
+
+{% endblock %}