fix modals

Assistant/WebApp/Configurators/Local.hs

@@ -269,8 +269,8 @@ getConfirmAddDriveR drive = ifM (liftIO $ doesDirectoryExist dir)
 	askcombine = page "Combine repositories?" (Just Configuration) $
 		$(widgetFile "configurators/adddrive/combine")
 
-cloneModal :: Widget
-cloneModal = $(widgetFile "configurators/adddrive/clonemodal")
+setupDriveModal :: Widget
+setupDriveModal = $(widgetFile "configurators/adddrive/setupmodal")
 
 getFinishAddDriveR :: RemovableDriveKey -> Handler Html
 getFinishAddDriveR (RemovableDriveKey drive mkeyid) =

templates/configurators/adddrive.hamlet

@@ -26,6 +26,6 @@
       <fieldset>
         ^{form}
         ^{webAppFormAuthToken}
-        <button .btn .btn-primary type=submit onclick="$('#clonemodal').modal('show');">Use this drive</button> #
+        <button .btn .btn-primary type=submit>Use this drive</button> #
         <a .btn href="@{AddDriveR}">
           Rescan for removable drives

templates/configurators/adddrive/clonemodal.hamlet

@@ -1,8 +0,0 @@
-<div .modal .fade #clonemodal>
-  <div .modal-header>
-    <h3>
-      Cloning to drive
-  <div .modal-body>
-    <p>
-      Cloning the repository to the drive. This may take a few minutes; #
-      do not remove the drive.

templates/configurators/adddrive/combine.hamlet

@@ -7,7 +7,7 @@
   <p>
     Do you want to combine these files into your repository?
   <p>
-    <a .btn href="@{FinishAddDriveR (RemovableDriveKey drive Nothing)}">
+    <a .btn onclick="$('#setupmodal').modal('show');" href="@{FinishAddDriveR (RemovableDriveKey drive Nothing)}">
       <i .icon-resize-small></i> Combine the repositories #
     The combined repositories will sync and share their files.
   <p>
@@ -16,4 +16,4 @@
       <i .icon-resize-full></i> Go back #
     Use a different directory than <tt>#{driveRepoPath drive}</tt> to #
     avoid combining the repositories.
-^{cloneModal}
+^{setupDriveModal}

templates/configurators/adddrive/encrypt.hamlet

@@ -9,12 +9,12 @@
     will also prevent you from sharing the drive with friends, or #
     easily accessing its contents on another computer.
   <p>
-    <a .btn href="@{FinishAddDriveR (RemovableDriveKey drive Nothing)}">
+    <a .btn onclick="$('#setupmodal').modal('show');" href="@{FinishAddDriveR (RemovableDriveKey drive Nothing)}">
       <i .icon-minus-sign></i> Do not encrypt repository #
     Anyone who has the drive can see the files stored on it.
     $forall (keyid, name) <- secretkeys
       <p>
-        <a .btn href="@{FinishAddDriveR (RemovableDriveKey drive (Just keyid))}">
+        <a .btn onclick="$('#setupmodal').modal('show');" href="@{FinishAddDriveR (RemovableDriveKey drive (Just keyid))}">
           <i .icon-ok-sign></i> Encrypt repository #
         to
         <span title="key id #{keyid}">
@@ -27,4 +27,4 @@
     <a .btn href="">
       <i .icon-plus-sign></i> Encrypt repository #
     with a new encryption key
-^{cloneModal}
+^{setupDriveModal}

templates/configurators/adddrive/setupmodal.hamlet

@@ -0,0 +1,7 @@
+<div .modal .fade #setupmodal>
+  <div .modal-header>
+    <h3>
+      Setting up repository on removable drive.
+  <div .modal-body>
+    <p>
+      This may take a few minutes; do not remove the drive.