From f62cc484826991bfdb5469b8cf0b7b6b7a617e43 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 8 Sep 2012 23:32:08 -0400
Subject: reorg templates

---
 templates/configurators/addssh.hamlet              | 33 --------------
 templates/configurators/confirmssh.hamlet          | 42 ------------------
 .../configurators/firstrepository/form.hamlet      | 11 +++++
 templates/configurators/inprogresspairing.hamlet   | 10 -----
 templates/configurators/localrepositoryform.hamlet | 11 -----
 templates/configurators/makessherror.hamlet        | 10 -----
 templates/configurators/nopairing.hamlet           |  5 ---
 templates/configurators/pairing.hamlet             | 50 ----------------------
 templates/configurators/pairing/disabled.hamlet    |  5 +++
 templates/configurators/pairing/inprogress.hamlet  | 10 +++++
 templates/configurators/pairing/prompt.hamlet      | 50 ++++++++++++++++++++++
 templates/configurators/ssh/add.hamlet             | 33 ++++++++++++++
 templates/configurators/ssh/confirm.hamlet         | 42 ++++++++++++++++++
 templates/configurators/ssh/error.hamlet           | 10 +++++
 14 files changed, 161 insertions(+), 161 deletions(-)
 delete mode 100644 templates/configurators/addssh.hamlet
 delete mode 100644 templates/configurators/confirmssh.hamlet
 create mode 100644 templates/configurators/firstrepository/form.hamlet
 delete mode 100644 templates/configurators/inprogresspairing.hamlet
 delete mode 100644 templates/configurators/localrepositoryform.hamlet
 delete mode 100644 templates/configurators/makessherror.hamlet
 delete mode 100644 templates/configurators/nopairing.hamlet
 delete mode 100644 templates/configurators/pairing.hamlet
 create mode 100644 templates/configurators/pairing/disabled.hamlet
 create mode 100644 templates/configurators/pairing/inprogress.hamlet
 create mode 100644 templates/configurators/pairing/prompt.hamlet
 create mode 100644 templates/configurators/ssh/add.hamlet
 create mode 100644 templates/configurators/ssh/confirm.hamlet
 create mode 100644 templates/configurators/ssh/error.hamlet

(limited to 'templates/configurators')

diff --git a/templates/configurators/addssh.hamlet b/templates/configurators/addssh.hamlet
deleted file mode 100644
index c2336a169..000000000
--- a/templates/configurators/addssh.hamlet
+++ /dev/null
@@ -1,33 +0,0 @@
-<div .span9 .hero-unit>
-  <h2>
-    Adding a remote server using ssh
-  <p>
-    You can use nearly any server that has ssh and rsync. For example, you #
-    could use a <a href="http://linode.com/">Linode</a> or another VPS, or #
-    an account on a friend's server.
-  <p>
-    $case status
-      $of UnusableServer msg
-        <div .alert .alert-error>
-          <i .icon-warning-sign></i> #{msg}
-      $of _
-        <i .icon-warning-sign></i> Do keep in mind that all your data #
-        will be synced to the server, so make sure it has enough available #
-        disk space and bandwidth, and that you trust it with your data.
-  <p>
-    <form .form-horizontal enctype=#{enctype}>
-      <fieldset>
-        ^{form}
-        ^{authtoken}
-        <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.
diff --git a/templates/configurators/confirmssh.hamlet b/templates/configurators/confirmssh.hamlet
deleted file mode 100644
index f82335ceb..000000000
--- a/templates/configurators/confirmssh.hamlet
+++ /dev/null
@@ -1,42 +0,0 @@
-<div .span9 .hero-unit>
-  <h2>
-    Ready to add remote server
-  <div .row-fluid>
-    <div .span8>
-      <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>
-          <a .btn .btn-primary href="@{MakeSshGitR sshdata}" onclick="$('#setupmodal').modal('show');">
-            Use a git repository on the server
-          <br>
-          All your data will be uploaded to the server. If you set up other #
-          devices to use the same server, they will all be kept in sync, #
-          using the server as a central hub. #
-      <p>
-        <a .btn .btn-primary href="@{MakeSshRsyncR sshdata}" onclick="$('#setupmodal').modal('show');">
-          Use an encrypted rsync repository on the server
-        <br>
-        The contents of your files will be stored, fully encrypted, on the #
-        server. The server will not store other information about your #
-        git repository.
-    <div .span4>
-      $if needsPubKey sshdata
-        <div .alert .alert-info>
-          <i .icon-info-sign></i> #
-          A ssh key will be installed on the server, allowing git-annex to #
-          access it securely without a password.
-<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.
diff --git a/templates/configurators/firstrepository/form.hamlet b/templates/configurators/firstrepository/form.hamlet
new file mode 100644
index 000000000..6c2405be6
--- /dev/null
+++ b/templates/configurators/firstrepository/form.hamlet
@@ -0,0 +1,11 @@
+#{msg}
+<p>
+  <div .input-prepend .input-append>
+    <span .add-on>
+      <i .icon-folder-open></i>
+    ^{fvInput pathView}
+    <button type=submit .btn .btn-primary>
+      Make Repository
+$if err
+  <div .alert .alert-error>
+    #{errmsg}
diff --git a/templates/configurators/inprogresspairing.hamlet b/templates/configurators/inprogresspairing.hamlet
deleted file mode 100644
index 7b655b5a9..000000000
--- a/templates/configurators/inprogresspairing.hamlet
+++ /dev/null
@@ -1,10 +0,0 @@
-<div .span9 .hero-unit>
-  <h2>
-    Pairing in progress ..
-  <p>
-    Now you should either go tell the owner of the computer you want to pair #
-    with the secret phrase you selected ("#{secret}"), or go enter it into #
-    the computer you want to pair with.
-  <p>
-    You do not need to leave this page open; pairing will finish automatically #
-    as soon as the secret phrase is entered into the other computer.
diff --git a/templates/configurators/localrepositoryform.hamlet b/templates/configurators/localrepositoryform.hamlet
deleted file mode 100644
index 6c2405be6..000000000
--- a/templates/configurators/localrepositoryform.hamlet
+++ /dev/null
@@ -1,11 +0,0 @@
-#{msg}
-<p>
-  <div .input-prepend .input-append>
-    <span .add-on>
-      <i .icon-folder-open></i>
-    ^{fvInput pathView}
-    <button type=submit .btn .btn-primary>
-      Make Repository
-$if err
-  <div .alert .alert-error>
-    #{errmsg}
diff --git a/templates/configurators/makessherror.hamlet b/templates/configurators/makessherror.hamlet
deleted file mode 100644
index 05d2de412..000000000
--- a/templates/configurators/makessherror.hamlet
+++ /dev/null
@@ -1,10 +0,0 @@
-<div .span9 .hero-unit>
-  <h2>
-    <i .icon-warning-sign></i> Failed to make repository
-  <p>
-    Something went wrong setting up the repository on the remote server.
-  <p>
-    Transcript: #{msg}
-  <p>
-    <a .btn .btn-primary href="#">
-     Retry
diff --git a/templates/configurators/nopairing.hamlet b/templates/configurators/nopairing.hamlet
deleted file mode 100644
index c946aacc4..000000000
--- a/templates/configurators/nopairing.hamlet
+++ /dev/null
@@ -1,5 +0,0 @@
-<div .span9 .hero-unit>
-  <h2>
-    Pairing not supported
-  <p>
-    This build of git-annex does not support pairing. Sorry!
diff --git a/templates/configurators/pairing.hamlet b/templates/configurators/pairing.hamlet
deleted file mode 100644
index 82ca48b5a..000000000
--- a/templates/configurators/pairing.hamlet
+++ /dev/null
@@ -1,50 +0,0 @@
-<div .span9 .hero-unit>
-  <h2>
-    Pairing with a local computer
-  <p>
-    $if start
-      Pair with a computer on your local network (or VPN), and the #
-      two git annex repositories will be combined into one, with changes #
-      kept in sync between them.
-    $else
-      Pairing with #{username}@#{hostname} will combine the two git annex #
-      repositories into one, with changes kept in sync between them.
-  <p>
-    $if start
-      For security, enter a secret phrase. This same secret phrase will #
-      also need to be entered on the computer you're pairing with. #
-      It will be used to verify you're pairing with the right computer.
-    $else
-      $if sameusername
-        For security, you need to enter the same secret phrase that was #
-        entered on #{hostname} when the pairing was started.
-      $else
-        For security, a secret phrase has been selected, which you need #
-        to enter here to complete the pairing. If you don't know the #
-        phrase, go ask #{username} ...
-  $if badphrase
-    <div .alert .alert-error>
-      <i .icon-warning-sign></i> #{problem}
-  <p>
-    <form .form-horizontal enctype=#{enctype}>
-      <fieldset>
-        ^{form}
-        ^{authtoken}
-        <div .form-actions>
-          <button .btn .btn-primary type=submit>
-            $if start
-              Start pairing
-            $else
-              Complete pairing
-    <div .alert .alert-info>
-      $if start
-        <p>
-          A good secret phrase is reasonably long. You'll only #
-          type it a few times. Only letters and numbers matter; #
-          punctuation and white space is ignored.
-        <p>
-          A quotation is one good choice, something like: #
-          "#{sampleQuote}"
-      $else
-        Only letters and numbers matter; punctuation and spaces are #
-        ignored.
diff --git a/templates/configurators/pairing/disabled.hamlet b/templates/configurators/pairing/disabled.hamlet
new file mode 100644
index 000000000..c946aacc4
--- /dev/null
+++ b/templates/configurators/pairing/disabled.hamlet
@@ -0,0 +1,5 @@
+<div .span9 .hero-unit>
+  <h2>
+    Pairing not supported
+  <p>
+    This build of git-annex does not support pairing. Sorry!
diff --git a/templates/configurators/pairing/inprogress.hamlet b/templates/configurators/pairing/inprogress.hamlet
new file mode 100644
index 000000000..7b655b5a9
--- /dev/null
+++ b/templates/configurators/pairing/inprogress.hamlet
@@ -0,0 +1,10 @@
+<div .span9 .hero-unit>
+  <h2>
+    Pairing in progress ..
+  <p>
+    Now you should either go tell the owner of the computer you want to pair #
+    with the secret phrase you selected ("#{secret}"), or go enter it into #
+    the computer you want to pair with.
+  <p>
+    You do not need to leave this page open; pairing will finish automatically #
+    as soon as the secret phrase is entered into the other computer.
diff --git a/templates/configurators/pairing/prompt.hamlet b/templates/configurators/pairing/prompt.hamlet
new file mode 100644
index 000000000..82ca48b5a
--- /dev/null
+++ b/templates/configurators/pairing/prompt.hamlet
@@ -0,0 +1,50 @@
+<div .span9 .hero-unit>
+  <h2>
+    Pairing with a local computer
+  <p>
+    $if start
+      Pair with a computer on your local network (or VPN), and the #
+      two git annex repositories will be combined into one, with changes #
+      kept in sync between them.
+    $else
+      Pairing with #{username}@#{hostname} will combine the two git annex #
+      repositories into one, with changes kept in sync between them.
+  <p>
+    $if start
+      For security, enter a secret phrase. This same secret phrase will #
+      also need to be entered on the computer you're pairing with. #
+      It will be used to verify you're pairing with the right computer.
+    $else
+      $if sameusername
+        For security, you need to enter the same secret phrase that was #
+        entered on #{hostname} when the pairing was started.
+      $else
+        For security, a secret phrase has been selected, which you need #
+        to enter here to complete the pairing. If you don't know the #
+        phrase, go ask #{username} ...
+  $if badphrase
+    <div .alert .alert-error>
+      <i .icon-warning-sign></i> #{problem}
+  <p>
+    <form .form-horizontal enctype=#{enctype}>
+      <fieldset>
+        ^{form}
+        ^{authtoken}
+        <div .form-actions>
+          <button .btn .btn-primary type=submit>
+            $if start
+              Start pairing
+            $else
+              Complete pairing
+    <div .alert .alert-info>
+      $if start
+        <p>
+          A good secret phrase is reasonably long. You'll only #
+          type it a few times. Only letters and numbers matter; #
+          punctuation and white space is ignored.
+        <p>
+          A quotation is one good choice, something like: #
+          "#{sampleQuote}"
+      $else
+        Only letters and numbers matter; punctuation and spaces are #
+        ignored.
diff --git a/templates/configurators/ssh/add.hamlet b/templates/configurators/ssh/add.hamlet
new file mode 100644
index 000000000..c2336a169
--- /dev/null
+++ b/templates/configurators/ssh/add.hamlet
@@ -0,0 +1,33 @@
+<div .span9 .hero-unit>
+  <h2>
+    Adding a remote server using ssh
+  <p>
+    You can use nearly any server that has ssh and rsync. For example, you #
+    could use a <a href="http://linode.com/">Linode</a> or another VPS, or #
+    an account on a friend's server.
+  <p>
+    $case status
+      $of UnusableServer msg
+        <div .alert .alert-error>
+          <i .icon-warning-sign></i> #{msg}
+      $of _
+        <i .icon-warning-sign></i> Do keep in mind that all your data #
+        will be synced to the server, so make sure it has enough available #
+        disk space and bandwidth, and that you trust it with your data.
+  <p>
+    <form .form-horizontal enctype=#{enctype}>
+      <fieldset>
+        ^{form}
+        ^{authtoken}
+        <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.
diff --git a/templates/configurators/ssh/confirm.hamlet b/templates/configurators/ssh/confirm.hamlet
new file mode 100644
index 000000000..f82335ceb
--- /dev/null
+++ b/templates/configurators/ssh/confirm.hamlet
@@ -0,0 +1,42 @@
+<div .span9 .hero-unit>
+  <h2>
+    Ready to add remote server
+  <div .row-fluid>
+    <div .span8>
+      <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>
+          <a .btn .btn-primary href="@{MakeSshGitR sshdata}" onclick="$('#setupmodal').modal('show');">
+            Use a git repository on the server
+          <br>
+          All your data will be uploaded to the server. If you set up other #
+          devices to use the same server, they will all be kept in sync, #
+          using the server as a central hub. #
+      <p>
+        <a .btn .btn-primary href="@{MakeSshRsyncR sshdata}" onclick="$('#setupmodal').modal('show');">
+          Use an encrypted rsync repository on the server
+        <br>
+        The contents of your files will be stored, fully encrypted, on the #
+        server. The server will not store other information about your #
+        git repository.
+    <div .span4>
+      $if needsPubKey sshdata
+        <div .alert .alert-info>
+          <i .icon-info-sign></i> #
+          A ssh key will be installed on the server, allowing git-annex to #
+          access it securely without a password.
+<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.
diff --git a/templates/configurators/ssh/error.hamlet b/templates/configurators/ssh/error.hamlet
new file mode 100644
index 000000000..05d2de412
--- /dev/null
+++ b/templates/configurators/ssh/error.hamlet
@@ -0,0 +1,10 @@
+<div .span9 .hero-unit>
+  <h2>
+    <i .icon-warning-sign></i> Failed to make repository
+  <p>
+    Something went wrong setting up the repository on the remote server.
+  <p>
+    Transcript: #{msg}
+  <p>
+    <a .btn .btn-primary href="#">
+     Retry
-- 
cgit v1.2.3