implement pair request broadcasts

Pair requests are sent on all network interfaces, and contain the best
available hostname to use to contact the host on that interface.

Added a pairing in progress page.

Revert "reduce some boilerplate using ghc extensions", because it caused
overlapping instances for Text.

2 files changed, 12 insertions, 2 deletions

diff --git a/templates/configurators/inprogresspairing.hamlet b/templates/configurators/inprogresspairing.hamlet
new file mode 100644
index 000000000..7b655b5a9
--- /dev/null
+++ b/templates/configurators/inprogresspairing.hamlet
@@ -0,0 +1,10 @@
+<div .span9 .hero-unit>
+  <h2>
+    Pairing in progress ..
+  <p>
+    Now you should either go tell the owner of the computer you want to pair #
+    with the secret phrase you selected ("#{secret}"), or go enter it into #
+    the computer you want to pair with.
+  <p>
+    You do not need to leave this page open; pairing will finish automatically #
+    as soon as the secret phrase is entered into the other computer.
diff --git a/templates/configurators/pairing.hamlet b/templates/configurators/pairing.hamlet
index 4aa1cdbb0..eb16e5b6d 100644
--- a/templates/configurators/pairing.hamlet
+++ b/templates/configurators/pairing.hamlet
@@ -5,7 +5,7 @@
     $if start
       Pair with a computer on your local network (or VPN), and the #
       two git annex repositories will be combined into one, with changes #
-      kept in sync between all paired devices.
+      kept in sync between them.
     $else
       Pairing with #{username}@#{hostname} will combine the two git annex #
       repositories into one, with changes kept in sync between them.
@@ -46,5 +46,5 @@
           A quotation is one good choice, something like: #
           "#{sampleQuote}"
       $else
-        Only letters and numbers matter; punctuation and white space is #
+        Only letters and numbers matter; punctuation and spaces are #
         ignored.