diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-09-13 16:47:44 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-09-13 16:50:02 -0400 |
| commit | 74906ed13f85f0b7b9215d82390e7ccb28551642 (patch) | |
| tree | 609199fa58ce00cdd41c88a8eedc9266b453eea5 /templates | |
| parent | df337bb63b4ed6e5d2ce563ec89d28d192e791db (diff) | |
UI for enabling special remotes
Now other repositories can configure special remotes, and when their
configuration has propigated out, they'll appear in the webapp's list of
repositories, with a link to enable them.
Added support for enabling rsync special remotes, and directory special
remotes that are on removable drives. However, encrypted directory special
remotes are not supported yet. The removable drive configuator doesn't
support them yet anyway.
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/configurators/enabledirectory.hamlet | 10 | ||||
| -rw-r--r-- | templates/configurators/intro.hamlet | 2 | ||||
| -rw-r--r-- | templates/configurators/repositories.hamlet | 7 | ||||
| -rw-r--r-- | templates/configurators/ssh/enable.hamlet | 30 |
4 files changed, 47 insertions, 2 deletions
diff --git a/templates/configurators/enabledirectory.hamlet b/templates/configurators/enabledirectory.hamlet new file mode 100644 index 000000000..03da311c5 --- /dev/null +++ b/templates/configurators/enabledirectory.hamlet @@ -0,0 +1,10 @@ +<div .span9 .hero-unit> + <h2> + Enabling #{description} + <p> + Where is this repository located? + <p> + <a .btn href="@{AddDriveR}"> + On a removable drive + <a .btn href="@{RepositoriesR}"> + Cancel diff --git a/templates/configurators/intro.hamlet b/templates/configurators/intro.hamlet index 4a1f228c8..c1642b061 100644 --- a/templates/configurators/intro.hamlet +++ b/templates/configurators/intro.hamlet @@ -17,7 +17,7 @@ \ repositories and devices: <table .table .table-striped .table-condensed> <tbody> - $forall (num, name) <- repolist + $forall (num, name, _) <- repolist <tr> <td> #{num} diff --git a/templates/configurators/repositories.hamlet b/templates/configurators/repositories.hamlet index a38ec10af..32b79708d 100644 --- a/templates/configurators/repositories.hamlet +++ b/templates/configurators/repositories.hamlet @@ -3,12 +3,17 @@ Your repositories <table .table .table-condensed> <tbody> - $forall (num, name) <- repolist + $forall (num, name, needsenabled) <- repolist <tr> <td> #{num} <td> #{name} + <td> + $maybe enable <- needsenabled + not enabled here → # + <a href="@{enable}"> + enable <div .row-fluid> <div .span6> <h2> diff --git a/templates/configurators/ssh/enable.hamlet b/templates/configurators/ssh/enable.hamlet new file mode 100644 index 000000000..1e35e481b --- /dev/null +++ b/templates/configurators/ssh/enable.hamlet @@ -0,0 +1,30 @@ +<div .span9 .hero-unit> + <h2> + Enabling #{description} + <p> + Another repository uses this server, but the server is not # + yet enabled for use here. The first step to enable it is to check if it's # + usable here. + <p> + <p> + <form .form-horizontal enctype=#{enctype}> + <fieldset> + <div .form-actions> + <button .btn .btn-primary type=submit onclick="$('#testmodal').modal('show');"> + Check this server + $case status + $of UnusableServer msg + <div .alert .alert-error> + <i .icon-warning-sign></i> #{msg} + $of _ + ^{form} + ^{authtoken} +<div .modal .fade #testmodal> + <div .modal-header> + <h3> + Testing server ... + <div .modal-body> + <p> + Checking ssh connection to the server. This could take a minute. + <p> + You may be prompted for your password to log into the server. |