From 70ea7fbcdbda082048326845d1686b00b6252efe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Brunk?= Date: Mon, 21 Apr 2014 17:44:10 +0200 Subject: [PATCH] add some padding by nesting layout elements --- templates/configurators/addbox.com.hamlet | 37 ++--- templates/configurators/adddrive.hamlet | 68 ++++----- .../configurators/adddrive/combine.hamlet | 41 +++--- .../configurators/adddrive/encrypt.hamlet | 53 +++---- templates/configurators/addglacier.hamlet | 57 ++++---- templates/configurators/addia.hamlet | 53 +++---- templates/configurators/adds3.hamlet | 3 +- .../delete/currentrepository.hamlet | 65 ++++----- .../configurators/delete/finished.hamlet | 29 ++-- templates/configurators/delete/start.hamlet | 25 ++-- .../configurators/edit/nonannexremote.hamlet | 33 ++--- .../configurators/edit/repository.hamlet | 69 ++++----- templates/configurators/enableaws.hamlet | 49 +++---- .../configurators/enabledirectory.hamlet | 21 +-- templates/configurators/enableia.hamlet | 33 ++--- templates/configurators/enablewebdav.hamlet | 33 ++--- templates/configurators/fsck.hamlet | 61 ++++---- templates/configurators/needconnection.hamlet | 27 ++-- templates/configurators/needgcrypt.hamlet | 21 +-- templates/configurators/needglaciercli.hamlet | 21 +-- templates/configurators/newrepository.hamlet | 27 ++-- .../newrepository/combine.hamlet | 39 ++--- .../configurators/newrepository/first.hamlet | 37 ++--- .../configurators/pairing/disabled.hamlet | 11 +- .../pairing/local/inprogress.hamlet | 37 ++--- .../configurators/pairing/local/prompt.hamlet | 101 ++++++------- .../configurators/pairing/xmpp/end.hamlet | 63 +++++---- .../pairing/xmpp/friend/confirm.hamlet | 23 +-- .../pairing/xmpp/friend/prompt.hamlet | 23 +-- .../pairing/xmpp/self/prompt.hamlet | 41 +++--- .../pairing/xmpp/self/retry.hamlet | 23 +-- templates/configurators/preferences.hamlet | 29 ++-- templates/configurators/rsync.net/add.hamlet | 89 ++++++------ .../configurators/rsync.net/encrypt.hamlet | 77 +++++----- templates/configurators/ssh/add.hamlet | 49 +++---- templates/configurators/ssh/combine.hamlet | 41 +++--- templates/configurators/ssh/confirm.hamlet | 133 +++++++++--------- templates/configurators/ssh/enable.hamlet | 45 +++--- templates/configurators/ssh/error.hamlet | 25 ++-- templates/configurators/unused.hamlet | 83 +++++------ .../configurators/upgrade/android.hamlet | 19 +-- templates/configurators/xmpp.hamlet | 61 ++++---- templates/configurators/xmpp/disabled.hamlet | 11 +- .../configurators/xmpp/needcloudrepo.hamlet | 35 ++--- templates/control/log.hamlet | 13 +- templates/control/notrunning.hamlet | 7 +- templates/control/repairrepository.hamlet | 37 ++--- .../control/repairrepository/done.hamlet | 27 ++-- templates/control/repositoryswitcher.hamlet | 29 ++-- templates/control/shutdown.hamlet | 19 +-- templates/documentation/about.hamlet | 63 +++++---- templates/documentation/repogroup.hamlet | 121 ++++++++-------- 52 files changed, 1145 insertions(+), 1092 deletions(-) diff --git a/templates/configurators/addbox.com.hamlet b/templates/configurators/addbox.com.hamlet index e994838e72..ce85eda2e1 100644 --- a/templates/configurators/addbox.com.hamlet +++ b/templates/configurators/addbox.com.hamlet @@ -1,21 +1,22 @@ -
-

- Adding a Box.com repository -

- Box.com offers a small quantity of storage # - for free, and larger quantities for a fee. -

- Even a small amount of free storage is useful, as a transfer point # - between your repositories. -

-

-
- ^{form} - ^{webAppFormAuthToken} -
-
- # - - Rescan for removable drives +
+
+

+ Adding a removable drive +

+ Clone this repository to a USB drive, memory stick, or other # + removable media. Whenever the removable drive is plugged in, its # + content will be synced with the content of this repository. +

+ $if (null writabledrives) +

+ $if (null removabledrives) +

+ No removable drives found + Please make sure you have a removable drive plugged in and mounted. + $else +

+ No usable removable drives found + Seems you cannot write to any of the removable drives that are # + currently mounted. Try plugging in a removable drive that you can # + write to, or correcting the write permissions. +

+ + Rescan for removable drives + $else + +

+ ^{form} + ^{webAppFormAuthToken} +
+
+ # + + Rescan for removable drives + \ No newline at end of file diff --git a/templates/configurators/adddrive/combine.hamlet b/templates/configurators/adddrive/combine.hamlet index 1ed56b6839..25ad4b4b9e 100644 --- a/templates/configurators/adddrive/combine.hamlet +++ b/templates/configurators/adddrive/combine.hamlet @@ -1,21 +1,22 @@ -
-

- Combine repositories? -

- The removable drive at #{mountPoint drive} already - has files in its repository #{driveRepoPath drive} -

- Do you want to combine these files into your repository? -

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

-

- - - \ Go back # - Use a different directory than #{driveRepoPath drive} to # - avoid combining the repositories. +

+
+

+ Combine repositories? +

+ The removable drive at #{mountPoint drive} already + has files in its repository #{driveRepoPath drive} +

+ Do you want to combine these files into your repository? +

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

+

+ + + \ 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 14d1dc496b..11c4394979 100644 --- a/templates/configurators/adddrive/encrypt.hamlet +++ b/templates/configurators/adddrive/encrypt.hamlet @@ -1,28 +1,29 @@ -

-

- Encrypt this drive? -

- Encrypting the repository stored on the removable drive at # - #{mountPoint drive} # - will prevent the data stored in it from being exposed if the drive # - falls into the wrong hands. However, encryption # - will also prevent you from sharing the repository with friends, or # - easily accessing its contents on another computer. -

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

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

- - - \ Encrypt repository # - with a new encryption key +

+
+

+ Encrypt this drive? +

+ Encrypting the repository stored on the removable drive at # + #{mountPoint drive} # + will prevent the data stored in it from being exposed if the drive # + falls into the wrong hands. However, encryption # + will also prevent you from sharing the repository with friends, or # + easily accessing its contents on another computer. +

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

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

+ + + \ Encrypt repository # + with a new encryption key ^{setupDriveModal} ^{genKeyModal} diff --git a/templates/configurators/addglacier.hamlet b/templates/configurators/addglacier.hamlet index 445255caf4..454229c371 100644 --- a/templates/configurators/addglacier.hamlet +++ b/templates/configurators/addglacier.hamlet @@ -1,31 +1,32 @@ -

-

- Adding an Amazon Glacier repository -

- Amazon Glacier is an # - offline cloud storage provider. It takes several hours for requested # - files to be retrieved from Glacier, making it mostly suitable for # - backups and long-term data archival. # -

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

- - \ 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. # - - Pricing details -

- -

- ^{form} - ^{webAppFormAuthToken} -
-
-