From ccc8afb59d6394198bae609682c7eaffbc0a60a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Brunk?= Date: Mon, 21 Apr 2014 13:05:52 +0200 Subject: [PATCH] don't close tags that are closed by hamlet --- Assistant/WebApp/Gpg.hs | 11 +++--- Assistant/WebApp/SideBar.hs | 2 +- templates/actionbutton.hamlet | 3 +- .../configurators/adddrive/combine.hamlet | 6 ++- .../configurators/adddrive/encrypt.hamlet | 9 +++-- templates/configurators/addglacier.hamlet | 6 ++- .../addrepository/archive.hamlet | 6 ++- .../configurators/addrepository/cloud.hamlet | 9 +++-- .../configurators/addrepository/misc.hamlet | 9 +++-- .../configurators/addrepository/ssh.hamlet | 3 +- .../addrepository/xmppconnection.hamlet | 6 ++- templates/configurators/adds3.hamlet | 3 +- .../delete/currentrepository.hamlet | 3 +- templates/configurators/delete/start.hamlet | 3 +- templates/configurators/fsck.hamlet | 4 +- templates/configurators/needconnection.hamlet | 3 +- templates/configurators/newrepository.hamlet | 3 +- .../newrepository/combine.hamlet | 6 ++- .../configurators/newrepository/first.hamlet | 3 +- .../configurators/newrepository/form.hamlet | 2 +- .../configurators/pairing/local/prompt.hamlet | 3 +- templates/configurators/rsync.net/add.hamlet | 3 +- .../configurators/rsync.net/encrypt.hamlet | 9 +++-- templates/configurators/ssh/add.hamlet | 3 +- templates/configurators/ssh/combine.hamlet | 6 ++- templates/configurators/ssh/confirm.hamlet | 13 ++++--- templates/configurators/ssh/enable.hamlet | 3 +- templates/configurators/ssh/error.hamlet | 3 +- templates/configurators/unused.hamlet | 9 +++-- templates/configurators/xmpp.hamlet | 6 ++- templates/configurators/xmpp/buddylist.hamlet | 4 +- templates/control/shutdown.hamlet | 3 +- templates/controlmenu.hamlet | 15 ++++--- templates/page.hamlet | 4 +- templates/repolist.hamlet | 39 ++++++++++++------- templates/sidebar/alert.hamlet | 3 +- 36 files changed, 144 insertions(+), 82 deletions(-) diff --git a/Assistant/WebApp/Gpg.hs b/Assistant/WebApp/Gpg.hs index 9d90fcd361..e7946d1bb7 100644 --- a/Assistant/WebApp/Gpg.hs +++ b/Assistant/WebApp/Gpg.hs @@ -27,11 +27,12 @@ import qualified Data.Map as M gpgKeyDisplay :: KeyId -> Maybe UserId -> Widget gpgKeyDisplay keyid userid = [whamlet| - # - $maybe name <- userid - #{name} - $nothing - key id #{keyid} + + \ + $maybe name <- userid + #{name} + $nothing + key id #{keyid} |] genKeyModal :: Widget diff --git a/Assistant/WebApp/SideBar.hs b/Assistant/WebApp/SideBar.hs index 0f06ea7c4d..d7a0bb78fa 100644 --- a/Assistant/WebApp/SideBar.hs +++ b/Assistant/WebApp/SideBar.hs @@ -106,4 +106,4 @@ htmlIcon UpgradeIcon = bootstrapIcon "arrow-up" htmlIcon ConnectionIcon = bootstrapIcon "signal" bootstrapIcon :: Text -> Widget -bootstrapIcon name = [whamlet||] +bootstrapIcon name = [whamlet||] diff --git a/templates/actionbutton.hamlet b/templates/actionbutton.hamlet index c54ab17c2c..4741dcb57d 100644 --- a/templates/actionbutton.hamlet +++ b/templates/actionbutton.hamlet @@ -1,2 +1,3 @@ - #{fromMaybe "" label} + # + #{fromMaybe "" label} diff --git a/templates/configurators/adddrive/combine.hamlet b/templates/configurators/adddrive/combine.hamlet index 81905aebe1..1ed56b6839 100644 --- a/templates/configurators/adddrive/combine.hamlet +++ b/templates/configurators/adddrive/combine.hamlet @@ -8,12 +8,14 @@ Do you want to combine these files into your repository?

- Combine the repositories # + + \ Combine the repositories # The combined repositories will sync and share their files.

- Go back # + + \ Go back # Use a different directory than #{driveRepoPath drive} to # avoid combining the repositories. ^{setupDriveModal} diff --git a/templates/configurators/adddrive/encrypt.hamlet b/templates/configurators/adddrive/encrypt.hamlet index 95f38b2d3b..14d1dc496b 100644 --- a/templates/configurators/adddrive/encrypt.hamlet +++ b/templates/configurators/adddrive/encrypt.hamlet @@ -10,16 +10,19 @@ easily accessing its contents on another computer.

- Do not encrypt repository # + + \ Do not encrypt repository # Anyone who has the drive can see the files stored on it. $forall (keyid, name) <- secretkeys

- Encrypt repository # + + \ Encrypt repository # to ^{gpgKeyDisplay keyid (Just name)}

- Encrypt repository # + + \ Encrypt repository # with a new encryption key ^{setupDriveModal} ^{genKeyModal} diff --git a/templates/configurators/addglacier.hamlet b/templates/configurators/addglacier.hamlet index 00698bb35c..445255caf4 100644 --- a/templates/configurators/addglacier.hamlet +++ b/templates/configurators/addglacier.hamlet @@ -7,10 +7,12 @@ files to be retrieved from Glacier, making it mostly suitable for # backups and long-term data archival. #

- By default, only files you place in # + + \ By default, only files you place in # "archive" directories will be archived in Amazon Glacier.

- You will be charged by Amazon for data # + + \ You will be charged by Amazon for data # uploaded to Glacier, as well as data downloaded from Glacier, and a # monthly fee for data storage. # diff --git a/templates/configurators/addrepository/archive.hamlet b/templates/configurators/addrepository/archive.hamlet index bac5ffef37..7a266ed8bf 100644 --- a/templates/configurators/addrepository/archive.hamlet +++ b/templates/configurators/addrepository/archive.hamlet @@ -1,11 +1,13 @@

- Amazon Glacier + + \ Amazon Glacier

Low cost offline data archival.

- Internet Archive + + \ Internet Archive

Free archival of public data. diff --git a/templates/configurators/addrepository/cloud.hamlet b/templates/configurators/addrepository/cloud.hamlet index 67ddc9737e..382ecbbc27 100644 --- a/templates/configurators/addrepository/cloud.hamlet +++ b/templates/configurators/addrepository/cloud.hamlet @@ -1,12 +1,14 @@

- Box.com + + \ Box.com

Provides free cloud storage for small amounts of data.

- Rsync.net + + \ Rsync.net

Works very well with git-annex.
@@ -14,7 +16,8 @@

- Amazon S3 + + \ Amazon S3

Good choice for professional quality storage. diff --git a/templates/configurators/addrepository/misc.hamlet b/templates/configurators/addrepository/misc.hamlet index 7b83ee6a5f..897039ad91 100644 --- a/templates/configurators/addrepository/misc.hamlet +++ b/templates/configurators/addrepository/misc.hamlet @@ -1,6 +1,7 @@

- Removable drive + + \ Removable drive

Add a USB drive, memory stick, or other removable media. # For offline archiving, backups, or to # @@ -11,14 +12,16 @@

- Local computer + + \ Local computer

Pair with a computer to keep files in sync quickly, # over your local network.

- Add another repository + + \ Add another repository

Make another repository on your computer. diff --git a/templates/configurators/addrepository/ssh.hamlet b/templates/configurators/addrepository/ssh.hamlet index d787c65e2b..b5ed1aa4cb 100644 --- a/templates/configurators/addrepository/ssh.hamlet +++ b/templates/configurators/addrepository/ssh.hamlet @@ -1,6 +1,7 @@

- Remote server + + \ Remote server

Set up a repository on a remote server using # ssh. diff --git a/templates/configurators/addrepository/xmppconnection.hamlet b/templates/configurators/addrepository/xmppconnection.hamlet index f588787b50..34e87ed83d 100644 --- a/templates/configurators/addrepository/xmppconnection.hamlet +++ b/templates/configurators/addrepository/xmppconnection.hamlet @@ -1,11 +1,13 @@

- Share with your other devices + + \ Share with your other devices

Keep files in sync between your devices running git-annex.

- Share with a friend + + \ Share with a friend

Combine your repository with a friend's repository, and share your files. diff --git a/templates/configurators/adds3.hamlet b/templates/configurators/adds3.hamlet index bfd65bb408..7ac88717c8 100644 --- a/templates/configurators/adds3.hamlet +++ b/templates/configurators/adds3.hamlet @@ -6,7 +6,8 @@ provider. If you need a professional level of storage for your data, # this is a good choice.

- You will be charged by Amazon for data # + + \ You will be charged by Amazon for data # uploaded to S3, as well as data downloaded from S3, and a monthly fee # for data storage. # diff --git a/templates/configurators/delete/currentrepository.hamlet b/templates/configurators/delete/currentrepository.hamlet index 5f56d1f870..d32ee8aec8 100644 --- a/templates/configurators/delete/currentrepository.hamlet +++ b/templates/configurators/delete/currentrepository.hamlet @@ -29,6 +29,7 @@ ^{webAppFormAuthToken}