From d2b42c30ad2e2728cbea230fecd3af22db89d9ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Brunk?= Date: Fri, 18 Apr 2014 01:58:27 +0200 Subject: [PATCH] bootstrap3 glyphicons --- Assistant/WebApp/Gpg.hs | 2 +- Assistant/WebApp/SideBar.hs | 2 +- templates/actionbutton.hamlet | 2 +- .../configurators/adddrive/combine.hamlet | 4 +-- .../configurators/adddrive/encrypt.hamlet | 6 ++--- templates/configurators/addglacier.hamlet | 4 +-- .../addrepository/archive.hamlet | 4 +-- .../configurators/addrepository/cloud.hamlet | 6 ++--- .../configurators/addrepository/misc.hamlet | 6 ++--- .../configurators/addrepository/ssh.hamlet | 2 +- .../addrepository/xmppconnection.hamlet | 4 +-- templates/configurators/adds3.hamlet | 2 +- .../delete/currentrepository.hamlet | 2 +- templates/configurators/delete/start.hamlet | 2 +- templates/configurators/fsck.hamlet | 2 +- templates/configurators/needconnection.hamlet | 2 +- templates/configurators/newrepository.hamlet | 2 +- .../newrepository/combine.hamlet | 4 +-- .../configurators/newrepository/first.hamlet | 2 +- .../configurators/newrepository/form.hamlet | 2 +- .../configurators/pairing/local/prompt.hamlet | 2 +- templates/configurators/rsync.net/add.hamlet | 2 +- .../configurators/rsync.net/encrypt.hamlet | 6 ++--- templates/configurators/ssh/add.hamlet | 2 +- templates/configurators/ssh/combine.hamlet | 4 +-- templates/configurators/ssh/confirm.hamlet | 8 +++--- templates/configurators/ssh/enable.hamlet | 2 +- templates/configurators/ssh/error.hamlet | 2 +- templates/configurators/unused.hamlet | 6 ++--- templates/configurators/xmpp.hamlet | 4 +-- templates/configurators/xmpp/buddylist.hamlet | 4 +-- templates/control/shutdown.hamlet | 2 +- templates/controlmenu.hamlet | 10 +++---- templates/repolist.hamlet | 26 +++++++++---------- 34 files changed, 71 insertions(+), 71 deletions(-) diff --git a/Assistant/WebApp/Gpg.hs b/Assistant/WebApp/Gpg.hs index ed9c5d53ed..9d90fcd361 100644 --- a/Assistant/WebApp/Gpg.hs +++ b/Assistant/WebApp/Gpg.hs @@ -27,7 +27,7 @@ import qualified Data.Map as M gpgKeyDisplay :: KeyId -> Maybe UserId -> Widget gpgKeyDisplay keyid userid = [whamlet| - # + # $maybe name <- userid #{name} $nothing diff --git a/Assistant/WebApp/SideBar.hs b/Assistant/WebApp/SideBar.hs index 25f0333732..0f06ea7c4d 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 ed4eb7586a..c54ab17c2c 100644 --- a/templates/actionbutton.hamlet +++ b/templates/actionbutton.hamlet @@ -1,2 +1,2 @@ - #{fromMaybe "" label} + #{fromMaybe "" label} diff --git a/templates/configurators/adddrive/combine.hamlet b/templates/configurators/adddrive/combine.hamlet index 29795ed138..81905aebe1 100644 --- a/templates/configurators/adddrive/combine.hamlet +++ b/templates/configurators/adddrive/combine.hamlet @@ -8,12 +8,12 @@ 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 916d589990..95f38b2d3b 100644 --- a/templates/configurators/adddrive/encrypt.hamlet +++ b/templates/configurators/adddrive/encrypt.hamlet @@ -10,16 +10,16 @@ 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 5071aa7f4b..a4748d502c 100644 --- a/templates/configurators/addglacier.hamlet +++ b/templates/configurators/addglacier.hamlet @@ -7,10 +7,10 @@ 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 11aa7f383c..bac5ffef37 100644 --- a/templates/configurators/addrepository/archive.hamlet +++ b/templates/configurators/addrepository/archive.hamlet @@ -1,11 +1,11 @@

- 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 c5dad16a4f..67ddc9737e 100644 --- a/templates/configurators/addrepository/cloud.hamlet +++ b/templates/configurators/addrepository/cloud.hamlet @@ -1,12 +1,12 @@

- 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 +14,7 @@

- 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 79b1937e07..7b83ee6a5f 100644 --- a/templates/configurators/addrepository/misc.hamlet +++ b/templates/configurators/addrepository/misc.hamlet @@ -1,6 +1,6 @@

- Removable drive + Removable drive

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

- 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 c41ad1117b..d787c65e2b 100644 --- a/templates/configurators/addrepository/ssh.hamlet +++ b/templates/configurators/addrepository/ssh.hamlet @@ -1,6 +1,6 @@

- 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 2fae69deeb..f588787b50 100644 --- a/templates/configurators/addrepository/xmppconnection.hamlet +++ b/templates/configurators/addrepository/xmppconnection.hamlet @@ -1,11 +1,11 @@

- 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 3d46ca23fe..e22b3eb79c 100644 --- a/templates/configurators/adds3.hamlet +++ b/templates/configurators/adds3.hamlet @@ -6,7 +6,7 @@ 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 e24cb5bee7..5e7ef2dfd2 100644 --- a/templates/configurators/delete/currentrepository.hamlet +++ b/templates/configurators/delete/currentrepository.hamlet @@ -29,6 +29,6 @@ ^{webAppFormAuthToken}