diff options
| -rw-r--r-- | Assistant/Alert.hs | 8 | ||||
| -rw-r--r-- | Assistant/Types/Alert.hs | 4 | ||||
| -rw-r--r-- | debian/changelog | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/Assistant/Alert.hs b/Assistant/Alert.hs index 018fbf583..745694f59 100644 --- a/Assistant/Alert.hs +++ b/Assistant/Alert.hs @@ -329,10 +329,10 @@ pairRequestAcknowledgedAlert who button = baseActivityAlert , alertButtons = maybeToList button } -xmppNeededAlert :: AlertButton -> Alert -xmppNeededAlert button = Alert +connectionNeededAlert :: AlertButton -> Alert +connectionNeededAlert button = Alert { alertHeader = Just "Share with friends, and keep your devices in sync across the cloud." - , alertIcon = Just TheCloud + , alertIcon = Just ConnectionIcon , alertPriority = High , alertButtons = [button] , alertClosable = True @@ -340,7 +340,7 @@ xmppNeededAlert button = Alert , alertMessageRender = renderData , alertCounter = 0 , alertBlockDisplay = True - , alertName = Just $ XMPPNeededAlert + , alertName = Just ConnectionNeededAlert , alertCombiner = Just $ dataCombiner $ \_old new -> new , alertData = [] } diff --git a/Assistant/Types/Alert.hs b/Assistant/Types/Alert.hs index 19fe55e6e..9fd33c7a2 100644 --- a/Assistant/Types/Alert.hs +++ b/Assistant/Types/Alert.hs @@ -26,7 +26,7 @@ data AlertName | SanityCheckFixAlert | WarningAlert String | PairAlert String - | XMPPNeededAlert + | ConnectionNeededAlert | RemoteRemovalAlert String | CloudRepoNeededAlert | SyncAlert @@ -54,7 +54,7 @@ data Alert = Alert , alertButtons :: [AlertButton] } -data AlertIcon = ActivityIcon | SyncIcon | SuccessIcon | ErrorIcon | InfoIcon | UpgradeIcon | TheCloud +data AlertIcon = ActivityIcon | SyncIcon | SuccessIcon | ErrorIcon | InfoIcon | UpgradeIcon | ConnectionIcon type AlertMap = M.Map AlertId Alert diff --git a/debian/changelog b/debian/changelog index ab632935b..31050b9e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ git-annex (5.20140406) UNRELEASED; urgency=medium Requires the remote server have git-annex-shell with notifychanges support. * webapp: Show a network signal icon next to ssh and xmpp remotes that it's currently connected with. + * webapp: Rework xmpp nudge to prompt for either xmpp or a ssh remote be + set up. -- Joey Hess <joeyh@debian.org> Mon, 07 Apr 2014 16:22:02 -0400 |