mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix pair complete alert combining

Browse source 
The pairing complete alert had been conbining with some other alert, fixed
this and now it's displayed once xmpp pairing is complete on both sides.
This commit is contained in:
Joey Hess 2013-03-05 16:23:56 -04:00
parent c03fdf5a15
commit f8f4de45d5
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Assistant/Alert.hs
View file

@ -313,6 +313,7 @@ pairRequestAcknowledgedAlert :: String -> Maybe AlertButton -> Alert
pairRequestAcknowledgedAlert who button = baseActivityAlert
{ alertData = ["Pairing with", UnTensed (T.pack who), Tensed "in progress" "complete"]
, alertPriority = High
, alertName = Just $ PairAlert who
, alertCombiner = Just $ dataCombiner $ \_old new -> new
, alertButton = button
}

4
templates/configurators/pairing/xmpp/end.hamlet
View file

@ -1,10 +1,10 @@
<div .span9 .hero-unit>
$if inprogress
<h2>
Pairing in progress ...
Pair request sent ...
<p>
$maybe name <- friend
A pair request has been sent to #{name}. It's up to them #
A pair request has been sent to #{name}. Now it's up to them #
to accept it and finish pairing.
$nothing
A pair request has been sent to all other devices that #