improved config

5 files changed, 72 insertions, 78 deletions

diff --git a/templates/configurators/addrepository.hamlet b/templates/configurators/addrepository.hamlet
index 1f793c2a5..d91286ad8 100644
--- a/templates/configurators/addrepository.hamlet
+++ b/templates/configurators/addrepository.hamlet
@@ -1,10 +1,52 @@
-<div .row-fluid>
-  <div .span4>
-    <h3>
-      Clone to removable drive
-    <p>
-      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.
-    
+<div .span9>
+  <h2>
+    Add repositories
+  <div .row-fluid>
+    <div .span4>
+      <h3>
+        <a href="">
+          Clone to a 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="">
+          Pair with 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>
+      <h3>
+        <a href="">
+          Connect to your phone
+      <p>
+        Save photos and recordings from your phone.
+      <p>
+        Send selected files to your phone.
+  <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 and available. #
+        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 server using #
+        <tt>ssh</tt> or <tt>rsync</tt>.
+      <p>
+        To use your own personal cloud.
diff --git a/templates/configurators/listrepositories.hamlet b/templates/configurators/listrepositories.hamlet
new file mode 100644
index 000000000..22a6910de
--- /dev/null
+++ b/templates/configurators/listrepositories.hamlet
@@ -0,0 +1,9 @@
+<div .span9>
+  <table .table .table-striped .table-condensed>
+    <tbody>
+      $forall (num, name) <- repolist
+        <tr>
+          <td>
+            #{num}
+          <td>
+            #{name}
diff --git a/templates/configurators/main.hamlet b/templates/configurators/main.hamlet
index 929b22437..c974eeb5d 100644
--- a/templates/configurators/main.hamlet
+++ b/templates/configurators/main.hamlet
@@ -1,53 +1,15 @@
 <div .span9>
-  <h2>
-    Add repositories #
-    <small>
   <div .row-fluid>
     <div .span4>
       <h3>
-        <a href="">
-          Clone to a 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. 
+        <a href="@{AddRepositoryR}">
+          Add repositories
+     <p>
+       Distribute the files in this repository to other devices;
+       make backups; and more by adding repositories.
     <div .span4>
       <h3>
-        <a href="">
-          Pair with 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>
-      <h3>
-        <a href="">
-          Connect to your phone
-      <p>
-        Save photos and recordings from your phone.
-      <p>
-        Send selected files to your phone.
-  <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 and available. #
-        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 server using #
-        <tt>ssh</tt> or <tt>rsync</tt>.
-      <p>
-        To use your own personal cloud.
+        <a href="@{ListRepositoriesR}">
+          Repository list
+     <p>
+       An overview of your repositories.
diff --git a/templates/configurators/main/sidebar.hamlet b/templates/configurators/main/sidebar.hamlet
deleted file mode 100644
index 3d427f8c5..000000000
--- a/templates/configurators/main/sidebar.hamlet
+++ /dev/null
@@ -1,18 +0,0 @@
-<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/sidebar/main.hamlet b/templates/sidebar/main.hamlet
index 63f201cf1..32900b920 100644
--- a/templates/sidebar/main.hamlet
+++ b/templates/sidebar/main.hamlet
@@ -1,4 +1,3 @@
-<div .span3>
-  ^{perpage}
-  <div .sidebar-nav ##{ident}>
+<div .span3 ##{ident}>
+  <div .sidebar-nav>
     ^{content}