diff --git a/web/admin.html b/web/admin.html index bde126812c68b21a2b56038b78bd0ca8ae64496f..7d38fa18437668a0c782c4bcd1dd85449b7582bc 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 a229a387a393b68e0b68e34d0f0d3c6d10d15f01..dc9fe451aa5de0606d01ae1876ae292b53c69402 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 8112d0c8c969c2ff16a01096fe04f69d0b8d2f6b..b8fac6d73d355f00de7a697e7f2bf2ec9cbdc4fa 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 f4f14355ef3e11934e9115971703ab683aeecef3..bfe252319e134a369778c67b8323ddaa44edd229 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 e38e4b45171a2c663d2903e41e5eca66252fe151..9a3f140becd214bbb478a28b402571bf7e9a5604 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 5877865cc12b9711d869be6e25038159eecea88b..8d9d5b7917e21589d3f484a3474bd5d519993508 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 c055bf0064ac553e06affe852b6c7974e14de90f..7de3187a6d3c9a2bdad40e7fc5f9c40e7c37209c 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 acb00da70b67a6572f096e1dc6a9e9cc899c6261..c9490a47263adf329afbc1e1ca1f42331f4c44f1 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>