blind enabling of existing ssh and ssh gcrypt repos

This commit is contained in:
Joey Hess 2013-10-02 15:54:32 -04:00
parent dfdaa649d0
commit a5e1f2efc0
6 changed files with 129 additions and 60 deletions

View file

@ -0,0 +1,19 @@
<div .span9 .hero-unit>
<h2>
Combine repositories?
<p>
A repository already exists on #{sshHostName sshdata} in the #
<tt>#{sshDirectory sshdata}</tt> directory.
<p>
Do you want to merge this repository's contents into your repository?
<p>
<a .btn onclick="$('#setupmodal').modal('show');" href="@{CombineSshR sshdata}">
<i .icon-resize-small></i> Combine the repositories #
The combined repositories will sync and share their files.
<p>
<p>
<a .btn href="@{AddSshR}">
<i .icon-resize-full></i> Go back #
Use a different directory than <tt>#{sshDirectory sshdata}</tt> to #
avoid combining the repositories.
^{sshSetupModal sshdata}

View file

@ -65,16 +65,5 @@
<i .icon-plus-sign></i> Encrypt repository #
with a new encryption key
^{sshTestModal}
^{sshSetupModal sshdata}
^{genKeyModal}
<div .modal .fade #setupmodal>
<div .modal-header>
<h3>
Making repository ...
<div .modal-body>
<p>
Setting up repository on the remote server. This could take a minute.
$if needsPubKey sshdata
<p>
You will be prompted once more for your ssh password. A ssh key #
is being installed on the server, allowing git-annex to access it #
securely without a password.

View file

@ -0,0 +1,12 @@
<div .modal .fade #setupmodal>
<div .modal-header>
<h3>
Setting up repository ...
<div .modal-body>
<p>
Setting up repository on the remote server. This could take a minute.
$if needsPubKey sshdata
<p>
You will be prompted once more for your ssh password. A ssh key #
is being installed on the server, allowing git-annex to access it #
securely without a password.