diff --git a/Assistant/Alert.hs b/Assistant/Alert.hs index d4770f646f..944da07d96 100644 --- a/Assistant/Alert.hs +++ b/Assistant/Alert.hs @@ -94,6 +94,7 @@ syncAlert rs = baseActivityAlert , alertHeader = Just $ tenseWords [Tensed "Syncing" "Synced", "with", showRemotes rs] , alertPriority = Low + , alertIcon = Just SyncIcon } syncResultAlert :: [Remote] -> [Remote] -> Alert diff --git a/Assistant/Types/Alert.hs b/Assistant/Types/Alert.hs index 34bbc1b08e..1ca8862421 100644 --- a/Assistant/Types/Alert.hs +++ b/Assistant/Types/Alert.hs @@ -50,7 +50,7 @@ data Alert = Alert , alertButton :: Maybe AlertButton } -data AlertIcon = ActivityIcon | SuccessIcon | ErrorIcon | InfoIcon | TheCloud +data AlertIcon = ActivityIcon | SyncIcon | SuccessIcon | ErrorIcon | InfoIcon | TheCloud type AlertMap = M.Map AlertId Alert diff --git a/Assistant/WebApp/SideBar.hs b/Assistant/WebApp/SideBar.hs index 6c8137bd50..bf9d76ab08 100644 --- a/Assistant/WebApp/SideBar.hs +++ b/Assistant/WebApp/SideBar.hs @@ -88,8 +88,9 @@ getClickAlert i = do redirect $ buttonUrl b _ -> redirectBack -htmlIcon :: AlertIcon -> GWidget sub master () -htmlIcon ActivityIcon = bootstrapIcon "refresh" +htmlIcon :: AlertIcon -> GWidget WebApp WebApp () +htmlIcon ActivityIcon = [whamlet||] +htmlIcon SyncIcon = [whamlet||] htmlIcon InfoIcon = bootstrapIcon "info-sign" htmlIcon SuccessIcon = bootstrapIcon "ok" htmlIcon ErrorIcon = bootstrapIcon "exclamation-sign" diff --git a/static/activityicon.gif b/static/activityicon.gif new file mode 100644 index 0000000000..c14d37553e Binary files /dev/null and b/static/activityicon.gif differ diff --git a/static/syncicon.gif b/static/syncicon.gif new file mode 100644 index 0000000000..e192ca895c Binary files /dev/null and b/static/syncicon.gif differ diff --git a/templates/dashboard/transfers.hamlet b/templates/dashboard/transfers.hamlet index f27709a0eb..c787a58528 100644 --- a/templates/dashboard/transfers.hamlet +++ b/templates/dashboard/transfers.hamlet @@ -36,9 +36,10 @@ $else ^{actionButton (StartTransferR transfer) Nothing (Just "continue") "btn" "icon-play"} ^{actionButton (CancelTransferR transfer) Nothing (Just "cancel") "btn" "icon-remove"} + $if scanrunning + # + Scanning for files to transfer $else - $if scanrunning - Scanning for files to transfer - $else + $if (not transfersrunning) (No file transfers running)