From eb977ab3a7820adc0c7bffc4e2891fc6139a3038 Mon Sep 17 00:00:00 2001 From: eikek Date: Sun, 25 Jul 2021 13:37:06 +0200 Subject: [PATCH] Show the number of selected files on upload page Fixes: #896 --- .../webapp/src/main/elm/Page/Upload/View2.elm | 26 +++++++++---------- project/dev-ui-build.sh | 2 +- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/modules/webapp/src/main/elm/Page/Upload/View2.elm b/modules/webapp/src/main/elm/Page/Upload/View2.elm index 5d10e6c1..98f200b4 100644 --- a/modules/webapp/src/main/elm/Page/Upload/View2.elm +++ b/modules/webapp/src/main/elm/Page/Upload/View2.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Page.Upload.View2 exposing (viewContent, viewSidebar) import Comp.Dropzone @@ -229,19 +230,16 @@ renderUploads texts model = [ class "mt-4" , classList [ ( "hidden", List.isEmpty model.files || isSuccessAll model ) ] ] - [ div [ class "sixteen wide column" ] - [ div [ class "ui basic segment" ] - [ h2 [ class S.header2 ] - [ text texts.selectedFiles - ] - , div [ class "ui items" ] <| - if model.singleItem then - List.map (renderFileItem model (Just uploadAllTracker)) model.files - - else - List.map (renderFileItem model Nothing) model.files - ] + [ h2 [ class S.header2 ] + [ text texts.selectedFiles + , text (" (" ++ (List.length model.files |> String.fromInt) ++ ")") ] + , div [] <| + if model.singleItem then + List.map (renderFileItem model (Just uploadAllTracker)) model.files + + else + List.map (renderFileItem model Nothing) model.files ] diff --git a/project/dev-ui-build.sh b/project/dev-ui-build.sh index bb1fedb1..8e153467 100755 --- a/project/dev-ui-build.sh +++ b/project/dev-ui-build.sh @@ -23,7 +23,7 @@ compile_css() { echo "Building css …" local srcs="$wdir/modules/webapp/src/main/styles/index.css" local target="$targetbase/css/styles.css" - cd $wdir && npx postcss "$srcs" -o "$target" --env development && cd - + cd $wdir/modules/webapp && npx postcss "$srcs" -o "$target" --env development && cd - cat "$target" | gzip > "$targetbase/css/styles.css.gz" cp "$targetbase/css/styles.css" "$resourcebase/css/" cp "$targetbase/css/styles.css.gz" "$resourcebase/css/"