mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

webapp: Encourage user to install git-annex on a server when adding a ssh server, rather than just funneling them through to rsync.

Browse source
This commit is contained in:
Joey Hess 2013-03-16 12:58:59 -04:00
parent ab0c6db755
commit 996e899acc
6 changed files with 50 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

10
templates/configurators/ssh/add.hamlet
View file

@ -20,12 +20,4 @@
<div .form-actions>
<button .btn .btn-primary type=submit onclick="$('#testmodal').modal('show');">
Check this server
<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.
^{sshTestModal}

32
templates/configurators/ssh/confirm.hamlet
View file

@ -2,22 +2,31 @@
<h2>
Ready to add remote server
<div .row-fluid>
<div .span8>
<div .span9>
<p>
The server #{sshHostName sshdata} has been verified to be usable.
$if not (rsyncOnly sshdata)
<p>
You have two options for how to use the server:
<p>
<p>
You have two options for how to use the server:
<p>
$if not (rsyncOnly sshdata)
<a .btn .btn-primary href="@{MakeSshGitR sshdata}" onclick="$('#setupmodal').modal('show');">
Use a git repository on the server
$else
<a .btn .disabled .btn-warning href="@{RetrySshR sshdata}" onclick="$('#testmodal').modal('show');">
Use a git repository on the server (not available) #
<a .btn .btn-primary href="@{RetrySshR sshdata}" onclick="$('#testmodal').modal('show');">
Retry
<br>
All your data will be uploaded to the server, including the full #
git repository. This is a great choice if you want to set up #
other devices to use the same server, or share the repository with #
others.
<p style="text-align: center">
-or-
<i .icon-warning-sign></i> #
<i>
The server needs git and git-annex installed to use this option.
<br>
All your data will be uploaded to the server, including the full #
git repository. This is a great choice if you want to set up #
other devices to use the same server, or share the repository with #
others.
<p style="text-align: center">
-or-
<p>
<a .btn .btn-primary href="@{MakeSshRsyncR sshdata}" onclick="$('#setupmodal').modal('show');">
Use an encrypted rsync repository on the server
@ -32,6 +41,7 @@
<i .icon-info-sign></i> #
A ssh key will be installed on the server, allowing git-annex to #
access it securely without a password.
^{sshTestModal}
<div .modal .fade #setupmodal>
<div .modal-header>
<h3>

9
templates/configurators/ssh/testmodal.hamlet Normal file
View file

@ -0,0 +1,9 @@
<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.