diff --git a/dev/releases/3.2.yml b/dev/releases/3.2.yml index f416adc..e356eb7 100644 --- a/dev/releases/3.2.yml +++ b/dev/releases/3.2.yml @@ -9,6 +9,7 @@ minor_release_name: "Nicole" - "[Feature] Added inline UI for association and merging in chart lists" - "[Feature] Added UI selector for including associated artists" - "[Performance] Improved image rendering" + - "[Performance] Optimized several database calls" - "[Bugfix] Fixed configuration of time format" - "[Bugfix] Fixed search on manual scrobble page" - "[Bugfix] Disabled DB maintenance while not running main server" diff --git a/maloja/thirdparty/spotify.py b/maloja/thirdparty/spotify.py index 8fedb77..3a8e55f 100644 --- a/maloja/thirdparty/spotify.py +++ b/maloja/thirdparty/spotify.py @@ -46,7 +46,7 @@ class Spotify(MetadataInterface): else: expire = responsedata.get("expires_in",3600) self.settings["token"] = responsedata["access_token"] - log("Successfully authenticated with Spotify") + #log("Successfully authenticated with Spotify") Timer(expire,self.authorize).start() except Exception as e: log("Error while authenticating with Spotify: " + repr(e)) diff --git a/maloja/web/jinja/abstracts/base.jinja b/maloja/web/jinja/abstracts/base.jinja index dd6cc5c..be9c746 100644 --- a/maloja/web/jinja/abstracts/base.jinja +++ b/maloja/web/jinja/abstracts/base.jinja @@ -67,22 +67,17 @@ + <div id="footer"> + <div id="left-side"> + <a href="/about">About</a> + </div> + <div id="notch"> + <a href="/"><img style="display:block;" src="/favicon.png" /></a> + </div> + <div id="right-side"> + <span><input id="searchinput" placeholder="Search for an artist or track..." oninput="search(this)" onblur="clearresults()" /></span> + </div> - <div class="footer"> - <div> - <!--<span>Get your own charts on - <a target="_blank" rel="noopener noreferrer" href="https://github.com/krateng/maloja">GitHub</a>, - <a target="_blank" rel="noopener noreferrer" href="https://pypi.org/project/malojaserver/">PyPI</a> or - <a target="_blank" rel="noopener noreferrer" href="https://hub.docker.com/r/krateng/maloja">Dockerhub</a> - </span>--> - <span><a href="/about">About</a></span> - </div> - <div> - <a href="/"><span style="font-weight:bold;">Maloja {% if settings["DEV_MODE"] %}[Developer Mode]{% endif %}</span></a> - </div> - <div> - <span><input id="searchinput" placeholder="Search for an artist or track..." oninput="search(this)" onblur="clearresults()" /></span> - </div> <div id="resultwrap" class="hide"> <div class="searchresults"> diff --git a/maloja/web/static/css/maloja.css b/maloja/web/static/css/maloja.css index bcf3a55..7c8a508 100644 --- a/maloja/web/static/css/maloja.css +++ b/maloja/web/static/css/maloja.css @@ -209,45 +209,67 @@ we want icons to not be displayed in list rows, but show them with reduced opaci Footer **/ -div.footer { +div#footer { position:fixed; + bottom:0; + left:0; + right:0; + padding-left:20px; + padding-right:20px; height:20px; - /**width:100%;**/ + background-color: var(--base-color-dark); - bottom:0px; - left:0px; - right:0px; + + display: flex; + align-items: center; + padding:10px; opacity:1; } -div.footer div:nth-child(1) { - display:inline-block; - width:40%; - text-align:left; -} -div.footer div:nth-child(2) { - display:inline-block; - width:19%; - text-align:center; - color:gold; - font-size:110%; -} -div.footer div:nth-child(3) { - display:inline-block; - width:40%; - text-align:right; +#left-side, #right-side { + flex: 1; } -div.footer span a { - /*padding-left:20px;*/ - background-repeat:no-repeat; - background-size:contain; - background-position:left; - /*background-image:url("https://github.com/favicon.ico");*/ +#left-side { + text-align: left; + padding-left: 10px; } -div.footer input { +#right-side { + text-align: right; + padding-right: 10px; +} + +#notch { + + --notch-size: 80px; + background-color: var(--base-color-dark); + width: var(--notch-size); + height: var(--notch-size); + position: relative; + margin-top: -5px; + z-index: 1; + + border-radius: 50%; + transform: translate(0%, -30%); +} + +#notch img { + position: absolute; + top: calc((var(--notch-size) - 100px) / 2); + left: calc((var(--notch-size) - 100px) / 2); + + width: 100px; + height: auto; + +} +#notch img:hover { + transform: scale(1.1); +} + + +div#footer input { background-color:inherit; border:0px; border-bottom:1px solid beige; @@ -261,7 +283,7 @@ div.footer input { font-family:"Ubuntu"; } -div.footer input:focus { +div#footer input:focus { outline:none; /**background-color:rgba(245,245,220,0.05);**/ @@ -341,39 +363,13 @@ div#notification_area div.notification:hover { @media (max-width: 1000px) { - div.footer { - position:fixed; - /*height:30px;*/ - /**width:100%;**/ - background-color: var(--base-color-dark); - bottom:0px; - left:0px; - right:0px; - padding:3px; - opacity:1; - } - - div.footer div:nth-child(1) { + div#footer #left-side { display:none; } - div.footer div:nth-child(2) { - display:inline-block; - width:20%; - text-align:center; - color:gold; - } - div.footer div:nth-child(3) { - display:inline-block; - width:70%; + div#footer #right-side { text-align:right; } - div.footer input { - - width:90%; - } - - }