From a8966f3c25900b3b3feee81be48afed46bc1f292 Mon Sep 17 00:00:00 2001
From: Alex Xin <Xin_boyan@126.com>
Date: Wed, 10 Jun 2020 00:04:10 +0800
Subject: [PATCH] update UI
minor adjustment of ADMIN page, by LIXIN SHEN & BOYAN XIN
---
web/admin.html | 5 +-
web/css/admin.css | 90 ++++++++++----------
web/css/topbar.css | 4 +
web/js/login_registerScripts.js | 7 +-
web/other-person-project.html | 3 +-
web/person-project.html | 3 +-
web/person.html | 3 +-
web/webpage/admin-related/admin-account.html | 2 +-
8 files changed, 63 insertions(+), 54 deletions(-)
diff --git a/web/admin.html b/web/admin.html
index bde1268..7d38fa1 100644
--- a/web/admin.html
+++ b/web/admin.html
@@ -22,7 +22,6 @@
<link href="css/custom.css" rel="stylesheet">
<script src="js/custom.js"></script>
<script src="js/jquery.metisMenu.js"></script>
- <script src="js/jquery-confirm.js"></script>
<script src="js/login_registerScripts.js"></script>
<!--editor js-->
@@ -48,7 +47,8 @@
<ul class="dropdown-menu">
<li><a class="nav-link" href="person.html">View Profile</a ></li>
<li><a class="nav-link" href="admin.html">My Admin</a ></li>
- <li><a class="nav-link" href="#" onclick="adminLogout()" style="border-top: 1px solid #b1b8bb"><i class="fa fa-power-off"></i> Log Out</a ></li>
+ <li><a class="nav-link" href="#" onclick="adminLogout()" style="padding:0.5rem"><i class="fa fa-power-off"></i> Log Out</a ></li>
+ <li><a class="nav-link" href="#" onclick="accountDeleteConfirm()" style="padding:0.5rem"><i class="fa fa-minus-circle"></i> Delete Account</a ></li>
</ul>
</li>
<li class="nav-item active"><a class="nav-link" href="index.html"><i class="fa fa-home"></i></a ></li>
@@ -125,6 +125,7 @@
<script src="js/scripts.js"></script>
<script src="js/Admin/load-card.js"></script>
+<script src="js/jquery-confirm.js"></script>
</body>
</html>
diff --git a/web/css/admin.css b/web/css/admin.css
index a229a38..dc9fe45 100644
--- a/web/css/admin.css
+++ b/web/css/admin.css
@@ -471,51 +471,51 @@ i.fa.fa-globe {
min-width: 160px;
left:-2em;
}
-.menu1{
- top:172%;
- left: -11em;
- min-width: 325px;
- padding:0;
-}
-.dropdown-menu {
- padding: 0px 0;
-}
-.dropdown-menu li a i{
- color: #B3AEAE;
- font-size: 14px;
- margin-right: 6%;
-}
-.dropdown-menu li a {
- padding: 9px 20px;
- color:#999;
-}
-.dropdown-menu li {
- border-bottom: 1px solid #F7F7F7 ;
-}
-.dropdown-menu li:last-child {
- border-bottom: none;
-}
-.nav>li>a:focus, .nav>li>a:hover {
- background: none;
-}
-.view{
- text-align: center;
-}
-.dropdown-menu>li>a.view:focus, .dropdown-menu>li>a.view:hover{
- background: none;
- color: #d95459;
-}
-.dropdown-menu {
- border: 1px solid #ebeff6;
- border-radius: 4px;
- -webkit-border-radius: 4px;
- -o-border-radius: 4px;
- -moz-border-radius: 4px;
- -ms-border-radius: 4px;
- -webkit-box-shadow: 0 1px 1px rgba(0,0,0,.05);
- box-shadow: 0 1px 1px rgba(0,0,0,.05);
- margin:0;
-}
+/*.menu1{*/
+ /*top:172%;*/
+ /*left: -11em;*/
+ /*min-width: 325px;*/
+ /*padding:0;*/
+/*}*/
+/*.dropdown-menu {*/
+ /*padding: 0px 0;*/
+/*}*/
+/*.dropdown-menu li a i{*/
+ /*color: #B3AEAE;*/
+ /*font-size: 14px;*/
+ /*margin-right: 6%;*/
+/*}*/
+/*.dropdown-menu li a {*/
+ /*padding: 9px 20px;*/
+ /*color:#999;*/
+/*}*/
+/*.dropdown-menu li {*/
+ /*border-bottom: 1px solid #F7F7F7 ;*/
+/*}*/
+/*.dropdown-menu li:last-child {*/
+ /*border-bottom: none;*/
+/*}*/
+/*.nav>li>a:focus, .nav>li>a:hover {*/
+ /*background: none;*/
+/*}*/
+/*.view{*/
+ /*text-align: center;*/
+/*}*/
+/*.dropdown-menu>li>a.view:focus, .dropdown-menu>li>a.view:hover{*/
+ /*background: none;*/
+ /*color: #d95459;*/
+/*}*/
+/*.dropdown-menu {*/
+ /*border: 1px solid #ebeff6;*/
+ /*border-radius: 4px;*/
+ /*-webkit-border-radius: 4px;*/
+ /*-o-border-radius: 4px;*/
+ /*-moz-border-radius: 4px;*/
+ /*-ms-border-radius: 4px;*/
+ /*-webkit-box-shadow: 0 1px 1px rgba(0,0,0,.05);*/
+ /*box-shadow: 0 1px 1px rgba(0,0,0,.05);*/
+ /*margin:0;*/
+/*}*/
/*----*/
.banner {
background: #fff;
diff --git a/web/css/topbar.css b/web/css/topbar.css
index 8112d0c..b8fac6d 100644
--- a/web/css/topbar.css
+++ b/web/css/topbar.css
@@ -45,5 +45,9 @@
font-size:32px;
}
.topbar ul .dropdown-menu li i{
+ color:#5c5c5c;
font-size:18px;
+}
+.nav-right .dropdown-menu li a{
+ color:#5c5c5c;
}
\ No newline at end of file
diff --git a/web/js/login_registerScripts.js b/web/js/login_registerScripts.js
index f4f1435..bfe2523 100644
--- a/web/js/login_registerScripts.js
+++ b/web/js/login_registerScripts.js
@@ -136,7 +136,8 @@ function loadLoginState(){
' <ul class="dropdown-menu">\n' +
' <li><a class="nav-link" href="person.html">View Profile</a ></li>\n' +
' <li><a class="nav-link" href="admin.html">My Admin</a ></li>\n' +
- ' <li><a class="nav-link" href="#" onclick="logout()"><i class="fa fa-power-off"></i> Log Out</a ></li>\n' +
+ ' <li><a class="nav-link" href="#" onclick="logout()" style="padding:0.5rem"><i class="fa fa-power-off"></i> Log Out</a ></li>\n' +
+ ' <li><a class="nav-link" href="#" onclick="accountDeleteConfirm()" style="padding:0.5rem"><i class="fa fa-minus-circle"></i> Delete Account</a ></li>\n' +
' </ul>');
}
}
@@ -155,8 +156,8 @@ function loadIndexLoginState(){
' <ul class="dropdown-menu">\n' +
' <li><a class="nav-link" href="person.html">View Profile</a ></li>\n' +
' <li><a class="nav-link" href="admin.html">My Admin</a ></li>\n' +
- ' <li><a class="nav-link" href="#" onclick="adminLogout()" style="border-top: 1px solid #b1b8bb"><i class="fa fa-minus-circle"></i> Log Out</a ></li>\n' +
- ' <li><a class="nav-link" href="#" onclick="accountDeleteConfirm()" style="border-top: 1px solid #b1b8bb"><i class="fa fa-power-off"></i> Delete Account</a ></li>\n' +
+ ' <li><a class="nav-link" href="#" onclick="adminLogout()" style="padding:0.5rem"><i class="fa fa-power-off"></i> Log Out</a ></li>\n' +
+ ' <li><a class="nav-link" href="#" onclick="accountDeleteConfirm()" style="padding:0.5rem"><i class="fa fa-minus-circle"></i> Delete Account</a ></li>\n' +
' </ul>\n' +
' </li>\n' +
' <li class="nav-item active"><a class="nav-link" href="index.html"><i class="fa fa-home"></i></a ></li>');
diff --git a/web/other-person-project.html b/web/other-person-project.html
index e38e4b4..9a3f140 100644
--- a/web/other-person-project.html
+++ b/web/other-person-project.html
@@ -32,7 +32,8 @@
<ul class="dropdown-menu">
<li><a class="nav-link" href="person.html">View Profile</a ></li>
<li><a class="nav-link" href="admin.html">My Admin</a ></li>
- <li><a class="nav-link" href="#" onclick="logout()"><i class="fa fa-power-off"></i> Log Out</a ></li>
+ <li><a class="nav-link" href="#" onclick="logout()" style="padding:0.5rem"><i class="fa fa-power-off"></i> Log Out</a ></li>
+ <li><a class="nav-link" href="#" onclick="accountDeleteConfirm()" style="padding:0.5rem"><i class="fa fa-minus-circle"></i> Delete Account</a ></li>
</ul>
</div>
<div class="home-icon">
diff --git a/web/person-project.html b/web/person-project.html
index 5877865..8d9d5b7 100644
--- a/web/person-project.html
+++ b/web/person-project.html
@@ -33,7 +33,8 @@
<ul class="dropdown-menu">
<li><a class="nav-link" href="person.html">View Profile</a ></li>
<li><a class="nav-link" href="admin.html">My Admin</a ></li>
- <li><a class="nav-link" href="#" onclick="logout()"><i class="fa fa-power-off"></i> Log Out</a ></li>
+ <li><a class="nav-link" href="#" onclick="logout()" style="padding:0.5rem"><i class="fa fa-power-off"></i> Log Out</a ></li>
+ <li><a class="nav-link" href="#" onclick="accountDeleteConfirm()" style="padding:0.5rem"><i class="fa fa-minus-circle"></i> Delete Account</a ></li>
</ul>
</div>
<div class="home-icon">
diff --git a/web/person.html b/web/person.html
index c055bf0..7de3187 100644
--- a/web/person.html
+++ b/web/person.html
@@ -28,7 +28,8 @@
<ul class="dropdown-menu">
<li><a class="nav-link" href="person.html">View Profile</a ></li>
<li><a class="nav-link" href="admin.html">My Admin</a ></li>
- <li><a class="nav-link" href="#" onclick="logout()"><i class="fa fa-power-off"></i> Log Out</a ></li>
+ <li><a class="nav-link" href="#" onclick="logout()" style="padding:0.5rem"><i class="fa fa-power-off"></i> Log Out</a ></li>
+ <li><a class="nav-link" href="#" onclick="accountDeleteConfirm()" style="padding:0.5rem"><i class="fa fa-minus-circle"></i> Delete Account</a ></li>
</ul>
</div>
<div class="home-icon">
diff --git a/web/webpage/admin-related/admin-account.html b/web/webpage/admin-related/admin-account.html
index acb00da..c9490a4 100644
--- a/web/webpage/admin-related/admin-account.html
+++ b/web/webpage/admin-related/admin-account.html
@@ -21,7 +21,7 @@
<script src="../../js/scripts2.js"></script>
<script src="/js/People/change-personal-Info.js"></script>
<script src="/datepicker/dist/js/bootstrap-datepicker.js"></script>
-
+ <script src="/js/jquery-confirm.js"></script>
</head>
<body>
--
GitLab