summaryrefslogtreecommitdiff
path: root/Assistant
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-04-09 16:27:24 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-04-09 16:27:24 -0400
commitdb4897aaff83f33e049cbe731ae16da96f340297 (patch)
tree421674f7d08fc3e93a1a2cbb2fd45698c0570367 /Assistant
parentdd4916514507cc59a2fc59a87758ea50e43ae536 (diff)
webapp: Rework xmpp nudge to prompt for either xmpp or a ssh remote be set up.
This commit was sponsored by Nathan Howell.
Diffstat (limited to 'Assistant')
-rw-r--r--Assistant/Alert.hs8
-rw-r--r--Assistant/Types/Alert.hs4
2 files changed, 6 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