moving toward configuring new repos in the webapp

8 files changed, 88 insertions, 22 deletions

diff --git a/templates/configurators/addrepository.hamlet b/templates/configurators/addrepository.hamlet
index 7af450b87..1f793c2a5 100644
--- a/templates/configurators/addrepository.hamlet
+++ b/templates/configurators/addrepository.hamlet
@@ -1,15 +1,10 @@
-<div .span9 .hero-unit>
-    $if firstrun
-      <h2>
-        Welcome to git-annex!
-        <p>
-          There's just one thing to do before you can start using the power #
-          and convenience of git-annex.
-    <h2>
-      Create a git-annex repository
+<div .row-fluid>
+  <div .span4>
+    <h3>
+      Clone to removable drive
     <p>
-      Files in this repository will managed by git-annex, #
-      and kept in sync with your repositories on other devices.
-    <p>
-    <form .form-inline enctype=#{enctype}>
-      ^{form}
+      Clone this repository to a USB drive, or other removable media, #
+      for offline archiving, backups, or to #
+      <a href="http://en.wikipedia.org/wiki/Sneakernet">SneakerNet</a> #
+      between computers.
+    
diff --git a/templates/configurators/firstrepository.hamlet b/templates/configurators/firstrepository.hamlet
new file mode 100644
index 000000000..f4ffcf372
--- /dev/null
+++ b/templates/configurators/firstrepository.hamlet
@@ -0,0 +1,14 @@
+<div .span9 .hero-unit>
+    <h2>
+      Welcome to git-annex!
+      <p>
+        There's just one thing to do before you can start using the power #
+        and convenience of git-annex.
+    <h2>
+      Create a git-annex repository
+    <p>
+      Files in this repository will managed by git-annex, #
+      and kept in sync with your repositories on other devices.
+    <p>
+    <form .form-inline enctype=#{enctype}>
+      ^{form}
diff --git a/templates/configurators/intro.hamlet b/templates/configurators/intro.hamlet
index 5062346a8..0784b2743 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) <- remotelist
+            $forall (num, name) <- repolist
               <tr>
                 <td>
                   #{num}
diff --git a/templates/configurators/addrepository/form.hamlet b/templates/configurators/localrepositoryform.hamlet
index e72dbcf43..e72dbcf43 100644
--- a/templates/configurators/addrepository/form.hamlet
+++ b/templates/configurators/localrepositoryform.hamlet
diff --git a/templates/configurators/main.hamlet b/templates/configurators/main.hamlet
index 150e08981..09fa096b1 100644
--- a/templates/configurators/main.hamlet
+++ b/templates/configurators/main.hamlet
@@ -1,3 +1,42 @@
-<div .span9 .hero-unit>
-  <h2>
-    Sorry, no configuration is implemented yet...
+<div .span9>
+  <div .row-fluid>
+    <div .span4>
+      <h3>
+        <a href="">
+          Clone to removable drive
+      <p>
+        Clone this repository to a USB drive, memory stick, or other #
+        removable media.
+      <p>
+        For offline archiving, backups, or to #
+        <a href="http://en.wikipedia.org/wiki/Sneakernet">SneakerNet</a> #
+        between computers. 
+    <div .span4>
+      <h3>
+        <a href="">
+          Clone to a local computer
+      <p>
+        Automatically keep files in sync between computers on your #
+        local network.
+      <p>
+        For easy sharing with family and friends, or between your devices.
+    <div .span4>
+  <div .row-fluid>
+    <div .span4>
+      <h3>
+        <a href="">
+          Store data in the cloud
+      <p>
+        Store your data on a third-party cloud platform, #
+        including Amazon S3, Box.com, and Rsync.net.
+      <p>
+        Pay someone to keep your data safe. With strong encryption to #
+        protect your privacy.
+    <div .span4>
+      <h3>
+        <a href="">
+          Clone to a remote server
+      <p>
+        Set up a repository on a remote Unix server running SSH.
+      <p>
+        For when you want to run your own cloud.
diff --git a/templates/configurators/main/sidebar.hamlet b/templates/configurators/main/sidebar.hamlet
new file mode 100644
index 000000000..3d427f8c5
--- /dev/null
+++ b/templates/configurators/main/sidebar.hamlet
@@ -0,0 +1,18 @@
+<div .alert .alert-info>
+  <h4 .alert-heading>
+    git-annex is managing #
+    $if notenough
+      only #
+      <span .badge .badge-error>#{numrepos}</span> repository. #
+    $else
+      $if barelyenough
+        <span .badge .badge-warning>#{numrepos}</span> repositories. #
+      $else
+        <span .badge .badge-success>#{numrepos}</span> repositories. #
+  $if notenough
+    Recommend you add more clones to avoid data loss.
+  $else
+    $if barelyenough
+      Consider adding more.
+    $else
+      Adding more can't hurt!
diff --git a/templates/documentation/about.hamlet b/templates/documentation/about.hamlet
index af48a0b10..e9a233471 100644
--- a/templates/documentation/about.hamlet
+++ b/templates/documentation/about.hamlet
@@ -10,8 +10,8 @@
   <hr>
     git-annex is © 2010-2012 Joey Hess. It is free software, licensed #
     under the terms of the GNU General Public License, version 3 or above. #
-    <br>
-    <i class="icon-heart"></i> Its development was made possible by #
+    <p>
+    Its development was made possible by #
     <a href="http://git-annex.branchable.com/design/assistant/thanks/">
       many excellent people
-    .
+    . <i class="icon-heart"></i>
diff --git a/templates/sidebar/alert.hamlet b/templates/sidebar/alert.hamlet
index 9c204402b..937751819 100644
--- a/templates/sidebar/alert.hamlet
+++ b/templates/sidebar/alert.hamlet
@@ -7,7 +7,7 @@
       <i class="icon-#{name}"></i> #
   $maybe h <- heading
     $if block
-      <h4 class="alert-heading">#{h}</h4> #
+      <h4 .alert-heading>#{h}</h4> #
     $else
       <strong>#{h}</strong> #
   ^{widget}