From 9409b9db9c9936f86350a08bea148a51dca2aa2b Mon Sep 17 00:00:00 2001 From: Ghighi Eftimie Date: Fri, 21 Oct 2022 21:52:04 +0200 Subject: [PATCH] fixes for 946, 2284 caliblur --- cps/static/css/caliBlur.css | 32 -------------------------------- cps/static/js/caliBlur.js | 21 +++++---------------- cps/templates/layout.html | 30 +++++++++++++++++++++++++----- cps/templates/login.html | 8 ++++++++ 4 files changed, 38 insertions(+), 53 deletions(-) diff --git a/cps/static/css/caliBlur.css b/cps/static/css/caliBlur.css index b2b35423..287500c4 100644 --- a/cps/static/css/caliBlur.css +++ b/cps/static/css/caliBlur.css @@ -4423,38 +4423,6 @@ body.advanced_search > div.container-fluid > div.row-fluid > div.col-sm-10 > div left: 49px; margin-top: 5px } - - body:not(.blur) > .navbar > .container-fluid > .navbar-header:after, body:not(.blur) > .navbar > .container-fluid > .navbar-header:before { - color: hsla(0, 0%, 100%, .7); - cursor: pointer; - display: block; - font-family: plex-icons-new, serif; - font-size: 20px; - font-stretch: 100%; - font-style: normal; - font-variant-caps: normal; - font-variant-east-asian: normal; - font-variant-numeric: normal; - font-weight: 400; - height: 60px; - letter-spacing: normal; - line-height: 60px; - position: absolute - } - - body:not(.blur) > .navbar > .container-fluid > .navbar-header:before { - content: "\EA30"; - -webkit-font-variant-ligatures: normal; - font-variant-ligatures: normal; - left: 20px - } - - body:not(.blur) > .navbar > .container-fluid > .navbar-header:after { - content: "\EA2F"; - -webkit-font-variant-ligatures: normal; - font-variant-ligatures: normal; - left: 60px - } } body.admin > div.container-fluid > div > div.col-sm-10 > div.container-fluid > div.row:first-of-type > div.col > h2:before, body.admin > div.container-fluid > div > div.col-sm-10 > div.discover > h2:first-of-type:before, body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.discover > h1:before, body.newuser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.discover > h1:before { diff --git a/cps/static/js/caliBlur.js b/cps/static/js/caliBlur.js index 0f179645..d9309aeb 100755 --- a/cps/static/js/caliBlur.js +++ b/cps/static/js/caliBlur.js @@ -16,7 +16,6 @@ */ // Move advanced search to side-menu $("a[href*='advanced']").parent().insertAfter("#nav_new"); -$("body").addClass("blur"); $("body.stat").addClass("stats"); $("body.config").addClass("admin"); $("body.uiconfig").addClass("admin"); @@ -29,8 +28,8 @@ $("body > div.container-fluid > div > div.col-sm-10 > div.filterheader").attr("s // Back button curHref = window.location.href.split("/"); prevHref = document.referrer.split("/"); -$(".navbar-form.navbar-left") - .before('
'); +$(".plexBack a").attr('href', encodeURI(document.referrer)); + if (history.length === 1 || curHref[0] + curHref[1] + @@ -44,14 +43,9 @@ if (history.length === 1 || //Weird missing a after pressing back from edit. setTimeout(function () { - if ($(".plexBack a").length < 1) { - $(".plexBack").append(''); - } + $(".plexBack a").attr('href', encodeURI(document.referrer)); }, 10); -// Home button -$(".plexBack").before('
'); -$("a.navbar-brand").clone().appendTo(".home-btn").empty().removeClass("navbar-brand"); ///////////////////////////////// // Start of Book Details Work // /////////////////////////////// @@ -326,13 +320,8 @@ url = window.location.pathname // Move create shelf $("#nav_createshelf").prependTo(".your-shelves"); -// Create drop-down for profile and move elements to it -$("#main-nav") - .prepend(''); -$("#top_user").parent().addClass("dropdown").appendTo(".profileDropli"); -$("#nav_about").addClass("dropdown").appendTo(".profileDropli"); -$("#register").parent().addClass("dropdown").appendTo(".profileDropli"); -$("#logout").parent().addClass("dropdown").appendTo(".profileDropli"); +// Move About link it the profile dropdown +$(".profileDropli #top_user").parent().after($("#nav_about").addClass("dropdown")) // Remove the modals except from some areas where they are needed bodyClass = $("body").attr("class").split(" "); diff --git a/cps/templates/layout.html b/cps/templates/layout.html index 7502514a..00923a6e 100644 --- a/cps/templates/layout.html +++ b/cps/templates/layout.html @@ -27,7 +27,7 @@ - +