From fcb25637d362ce850279e55b2f21a2949ed6bc03 Mon Sep 17 00:00:00 2001 From: eikek Date: Sat, 13 Nov 2021 18:59:29 +0100 Subject: [PATCH] Improve new job count bubble --- .../src/main/scala/docspell/store/JdbcConfig.scala | 2 +- modules/webapp/src/main/elm/App/View2.elm | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/store/src/main/scala/docspell/store/JdbcConfig.scala b/modules/store/src/main/scala/docspell/store/JdbcConfig.scala index 9e494ff1..c0f86478 100644 --- a/modules/store/src/main/scala/docspell/store/JdbcConfig.scala +++ b/modules/store/src/main/scala/docspell/store/JdbcConfig.scala @@ -30,7 +30,7 @@ case class JdbcConfig(url: LenientUri, user: String, password: String) { } override def toString: String = - s"JdbcConfig($url, $user, ***)" + s"JdbcConfig(${url.asString}, $user, ***)" } object JdbcConfig { diff --git a/modules/webapp/src/main/elm/App/View2.elm b/modules/webapp/src/main/elm/App/View2.elm index 6d943e32..6746222a 100644 --- a/modules/webapp/src/main/elm/App/View2.elm +++ b/modules/webapp/src/main/elm/App/View2.elm @@ -75,8 +75,8 @@ topNavUser auth model = [ a [ class S.infoMessageBase , class "my-2 px-1 py-1 rounded-lg inline-block hover:opacity-50" - , classList [ ( "hidden", not model.showNewItemsArrived ) ] - , href "#" + , classList [ ( "hidden", not model.showNewItemsArrived || model.page == HomePage ) ] + , Page.href HomePage , onClick ToggleShowNewItemsArrived ] [ i [ class "fa fa-exclamation-circle mr-1" ] [] @@ -266,11 +266,11 @@ dataMenu texts _ model = [ i [ class "fa fa-cogs" ] [] , div [ class "h-5 w-5 rounded-full text-xs px-1 py-1 absolute top-1 left-1 font-bold" - , class "dark:bg-lightblue-500 dark:border-gray-50 dark:text-gray-800" + , class "dark:bg-lightblue-500 dark:text-gray-200" , class "bg-blue-500 text-gray-50" , classList [ ( "hidden", model.jobsWaiting <= 0 ) ] ] - [ div [ class "-mt-0.5 ml-0.5" ] + [ div [ class "-mt-0.5 mx-auto text-center" ] [ text (String.fromInt model.jobsWaiting) ] ] @@ -317,7 +317,7 @@ dataMenu texts _ model = class "fa fa-tachometer-alt w-6" else - class "fa fa-circle dark:text-lightblue-500 text-blue-500" + class "fa fa-tachometer-alt w-6 animate-pulse dark:text-lightblue-500 text-blue-500" ] [] , span [ class "ml-1" ]