summaryrefslogtreecommitdiff
path: root/templates/configurators
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2013-11-07 18:02:00 -0400
committerJoey Hess <joey@kitenet.net>2013-11-07 18:02:00 -0400
commit958312885f924e715f4ed71621312229e4b90c1e (patch)
tree71bb0bb14b37194841b4d9e86fb2111b89b32dc9 /templates/configurators
parentb7c15f3b60c373173cd2c3ce5f98a3f3bead04c4 (diff)
webapp: Improve UI around remote that have no annex.uuid set, either because setup of them is incomplete, or because the remote git repository is not a git-annex repository.
Complicated by such repositories potentially being repos that should have an annex.uuid, but it failed to be gotten, perhaps due to the past ssh repo setup bugs. This is handled now by an Upgrade Repository button.
Diffstat (limited to 'templates/configurators')
-rw-r--r--templates/configurators/checkunfinished.hamlet16
-rw-r--r--templates/configurators/edit/nonannexremote.hamlet18
-rw-r--r--templates/configurators/edit/repository.hamlet (renamed from templates/configurators/editrepository.hamlet)0
3 files changed, 18 insertions, 16 deletions
diff --git a/templates/configurators/checkunfinished.hamlet b/templates/configurators/checkunfinished.hamlet
deleted file mode 100644
index 713dddf917..0000000000
--- a/templates/configurators/checkunfinished.hamlet
+++ /dev/null
@@ -1,16 +0,0 @@
-<div .span9 .hero-unit>
- $if null stalled
- <h2>
- The repository is still not finished being set up. Patience..
- <p>
- If you suspect something is wrong, you might want to take a look #
- at the
- <a href="@{LogR}">
- Log
- $else
- <h2>
- Setting up this repository seems to have stalled!
- <p>
- Make sure the remote system is available and
- <a .btn .btn-primary href="@{RetryUnfinishedRepositoriesR}">
- Retry
diff --git a/templates/configurators/edit/nonannexremote.hamlet b/templates/configurators/edit/nonannexremote.hamlet
new file mode 100644
index 0000000000..e0f8165dd0
--- /dev/null
+++ b/templates/configurators/edit/nonannexremote.hamlet
@@ -0,0 +1,18 @@
+<div .span9 .hero-unit>
+ <h2>
+ Just a git repository
+ <p>
+ This repository is not currently set up as a git annex; #
+ only git metadata is synced with this repository.
+ $if sshrepo
+ <p>
+ If this repository's ssh server has git-annex installed, you can #
+ upgrade this repository to a full git annex, which will store the
+ contents of your files, not only their metadata.
+ <p>
+ <a .btn href="@{UpgradeRepositoryR r}">
+ Upgrade Repository
+ <h2>
+ Repository information
+ <p>
+ ^{repoInfo}
diff --git a/templates/configurators/editrepository.hamlet b/templates/configurators/edit/repository.hamlet
index 94a2702e7a..94a2702e7a 100644
--- a/templates/configurators/editrepository.hamlet
+++ b/templates/configurators/edit/repository.hamlet