From e2909698968b130891c15d13158e00920fdd9f5a Mon Sep 17 00:00:00 2001
From: Ye Tian <yetian@student.unimelb.edu.au>
Date: Mon, 1 Jun 2020 02:29:29 +0800
Subject: [PATCH] add top bar on search-result page
---
web/css/person-style.css | 2 +-
.../homepage-related/search-result.html | 94 +++++++++++--------
2 files changed, 55 insertions(+), 41 deletions(-)
diff --git a/web/css/person-style.css b/web/css/person-style.css
index 0211712..9d5b329 100644
--- a/web/css/person-style.css
+++ b/web/css/person-style.css
@@ -927,7 +927,7 @@ ul.edu {
.about-img img{
width:100%;
margin-left:10px;
- height:160px;
+ height:220px;
}
.about-content{
diff --git a/web/webpage/homepage-related/search-result.html b/web/webpage/homepage-related/search-result.html
index 14b0fa6..4786bf9 100644
--- a/web/webpage/homepage-related/search-result.html
+++ b/web/webpage/homepage-related/search-result.html
@@ -27,6 +27,7 @@
<link rel="stylesheet" href="../../css/form-elements.css">
<link rel="stylesheet" href="../../css/style2.css">
<link rel="stylesheet" href="../../css/search-result.css">
+ <link rel="stylesheet" href="../../css/topbar.css">
<!-- jQuery Scripts -->
<script type="text/javascript" src="../../js/jquery.min.js"></script>
@@ -36,7 +37,7 @@
<script type="text/javascript" src="../../js/ToolBar/searchbar.js"></script>
<script type="text/javascript" src="/js/People/people-search.js"></script>
-
+ <script type="text/javascript" src="js/login_registerScripts.js"></script>
</head>
@@ -50,43 +51,60 @@
</div>
</div>
-<div class="main-wrapper oh">
-
- <header class="nav-type-1 dark-nav">
-
- <nav class="navbar navbar-fixed-top">
- <div class="navigation">
- <div class="container relative">
+<div class="topbar">
+ <nav class="top-navbar">
+ <div class="navbar-header">
+ <span>Easy Eportfolio</span>
+ </div>
- <div class="row">
+ <div class="nav-right">
+ <div class="collapse navbar-collapse nav-list">
+ <ul id="userIcon" class="navbar-nav ml-auto" style="list-style:none;">
+ <!--Load top bar buttons-->
+ </ul>
+ </div>
+ </div>
- <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>
- </div> <!-- end navbar-header -->
-
- <!-- side menu -->
- <div class="side-menu right mobile-left-align">
- <div class="nav-inner menu-socials social-icons">
- <div class="right">
- <button id="loginbtn" class="launch-modal" data-modal-id="modal-login" onclick="clearTips()"><i class="fa fa-user fa-2x"></i></button>
- <!-- <a href="#" id="toHomepage" onclick="openHomepage()" style="color: #2b669a">HomePageeeeeeeee</a>-->
- <button id="toHomepage" onclick="openHomepage()" ><img src="../../img/profile.jpg" style="height: 30px;width: 30px"></img></button>
- <a href="#" id="logout" onclick="logout()" style="color: #2b669a">Logout</a>
- </div>
- </div>
+ </nav>
+</div>
- </div> <!-- end side menu -->
+<div class="main-wrapper oh">
- </div> <!-- end row -->
- </div> <!-- end container -->
- </div> <!-- end navigation -->
- </nav> <!-- end navbar -->
- </header>
+<!-- <header class="nav-type-1 dark-nav">-->
+
+<!-- <nav class="navbar navbar-fixed-top">-->
+<!-- <div class="navigation">-->
+<!-- <div class="container relative">-->
+
+<!-- <div class="row">-->
+
+<!-- <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>-->
+<!-- </div> <!– end navbar-header –>-->
+
+<!-- <!– side menu –>-->
+<!-- <div class="side-menu right mobile-left-align">-->
+<!-- <div class="nav-inner menu-socials social-icons">-->
+<!-- <div class="right">-->
+<!-- <button id="loginbtn" class="launch-modal" data-modal-id="modal-login" onclick="clearTips()"><i class="fa fa-user fa-2x"></i></button>-->
+<!-- <!– <a href="#" id="toHomepage" onclick="openHomepage()" style="color: #2b669a">HomePageeeeeeeee</a>–>-->
+<!-- <button id="toHomepage" onclick="openHomepage()" ><img src="../../img/profile.jpg" style="height: 30px;width: 30px"></img></button>-->
+<!-- <a href="#" id="logout" onclick="logout()" style="color: #2b669a">Logout</a>-->
+<!-- </div>-->
+<!-- </div>-->
+
+<!-- </div> <!– end side menu –>-->
+
+<!-- </div> <!– end row –>-->
+<!-- </div> <!– end container –>-->
+<!-- </div> <!– end navigation –>-->
+<!-- </nav> <!– end navbar –>-->
+<!-- </header>-->
<section class="header-wrap hero-section bg-light">
<div class="container">
@@ -337,12 +355,8 @@
<!-- Instafeed -->
<script type="text/javascript">
-
- $(window).load(function() {
- //这里判断登录状态还需要进一步处理
- checkLoginState();
-
-
+ $(document).ready(function() {
+ loadIndexLoginState();
});
</script>
--
GitLab