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

fix modals

Browse source
This commit is contained in:
Joey Hess 2013-09-16 16:46:00 -04:00
parent 490aa67d10
commit 1ba7737335
7 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Assistant/WebApp/Configurators/Local.hs
View file

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

BIN
doc/assistant/encryptdrive.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 42 KiB

2
templates/configurators/adddrive.hamlet
View file

@ -26,6 +26,6 @@
<fieldset> <fieldset>
^{form} ^{form}
^{webAppFormAuthToken} ^{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}"> <a .btn href="@{AddDriveR}">
Rescan for removable drives Rescan for removable drives

8
templates/configurators/adddrive/clonemodal.hamlet
View file

@ -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.

4
templates/configurators/adddrive/combine.hamlet
View file

@ -7,7 +7,7 @@
<p> <p>
Do you want to combine these files into your repository? Do you want to combine these files into your repository?
<p> <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 # <i .icon-resize-small></i> Combine the repositories #
The combined repositories will sync and share their files. The combined repositories will sync and share their files.
<p> <p>
@ -16,4 +16,4 @@
<i .icon-resize-full></i> Go back # <i .icon-resize-full></i> Go back #
Use a different directory than <tt>#{driveRepoPath drive}</tt> to # Use a different directory than <tt>#{driveRepoPath drive}</tt> to #
avoid combining the repositories. avoid combining the repositories.
^{cloneModal} ^{setupDriveModal}

6
templates/configurators/adddrive/encrypt.hamlet
View file

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

7
templates/configurators/adddrive/setupmodal.hamlet Normal file
View file

@ -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.