webapp: Improved UI for pairing your own devices together using XMPP.

templates/configurators/pairing/xmpp/end.hamlet

@@ -9,8 +9,7 @@
       $nothing
         A pair request has been sent to all other devices that #
         have been configured to use your jabber account. #
-        It will be answered automatically by any that see it; #
-        no action is required on your part.
+        It will be answered automatically by any devices that see it.
   $else
     Pair request accepted.
   <h2>

templates/configurators/pairing/xmpp/friend/confirm.hamlet

@@ -5,7 +5,7 @@
     Pairing with #{name} will combine your two git annex #
     repositories into one, allowing you to share files.
   <p>
-    <a .btn .btn-primary .btn-large href="@{FinishXMPPPairR pairkey}">
+    <a .btn .btn-primary .btn-large href="@{FinishXMPPPairFriendR pairkey}">
       Accept pair request
     <a .btn .btn-large href="@{DashboardR}">
       No thanks

templates/configurators/pairing/xmpp/friend/prompt.hamlet

@@ -0,0 +1,12 @@
+<div .span9 .hero-unit>
+  <h2>
+    Share with a friend
+  <p>
+    You can combine your repository with a friend's repository #
+    to share your files. Your repositories will automatically be kept in #
+    sync. Only do this if you want your friend to see all the files #
+    in this repository!
+  <p>
+    Here are the friends currently available via your Jabber account.
+    <p>
+      ^{buddyListDisplay}

templates/configurators/pairing/xmpp/prompt.hamlet

@@ -1,11 +0,0 @@
-<div .span9 .hero-unit>
-  <h2>
-    Pairing with another computer
-  <p>
-    Pairing with a another computer combines both git-annex repositories #
-    into a single shared repository, with changes kept in sync.
-  <p>
-    You can pair with any of your friends using jabber, or with another #
-    device that shares your own jabber account.
-    <p>
-      ^{buddyListDisplay}

templates/configurators/pairing/xmpp/self/prompt.hamlet

@@ -0,0 +1,18 @@
+<div .span9 .hero-unit>
+  <h2>
+    Sharing with your other devices
+  <p>
+    If you have multiple devices, all running git-annex, and using #
+    your Jabber account #{account}, you can configure them to share #
+    your files between themselves.
+  <p>
+    For example, you can have a computer at home, one at work, and a #
+    laptop, and their repositories will automatically be kept in sync.
+  <p>
+    Make sure your other devices are online and configured to use #
+    your Jabber account before continuing.
+  <p>
+    <a .btn .btn-primary .btn-large href="@{RunningXMPPPairSelfR}">
+      Start sharing with my other devices #
+    <a .btn .btn-large href="@{DashboardR}">
+      Cancel

templates/configurators/pairing/xmpp/self/retry.hamlet

@@ -0,0 +1,11 @@
+<div .span9 .hero-unit>
+  <h2>
+    Unable to get in touch with any other devices.
+  <p>
+    Make sure your other devices are online and configured to use #
+    your Jabber account before continuing.
+  <p>
+    <a .btn .btn-primary .btn-large href="@{RunningXMPPPairSelfR}">
+      Start sharing with my other devices #
+    <a .btn .btn-large href="@{DashboardR}">
+      Cancel