make other repositories list list all autostarted repos

And add a form to add another, unrelated repository

5 files changed, 30 insertions, 5 deletions

diff --git a/templates/configurators/newrepository.hamlet b/templates/configurators/newrepository.hamlet
new file mode 100644
index 000000000..d2bdad9b9
--- /dev/null
+++ b/templates/configurators/newrepository.hamlet
@@ -0,0 +1,15 @@
+<div .span9 .hero-unit>
+  <h2>
+    Add another repository
+  <p>
+    The form below will make a separate repository, that is not synced #
+    with your existing repository. You can use the new repository for #
+    different sorts of files, that are synced and shared with other #
+    devices and users.
+  <p>
+    <form .form-inline enctype=#{enctype}>
+      ^{form}
+  <p>
+    <i .icon-asterisk></i> #
+    Do you want to add another repository that is kept in sync with #
+    the current one? If so, <a href="@{RepositoriesR}">go here</a>.
diff --git a/templates/configurators/firstrepository.hamlet b/templates/configurators/newrepository/first.hamlet
index ac28119eb..88b1fa72b 100644
--- a/templates/configurators/firstrepository.hamlet
+++ b/templates/configurators/newrepository/first.hamlet
@@ -10,5 +10,5 @@
     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}
+    <form .form-inline enctype=#{enctype}>
+      ^{form}
diff --git a/templates/configurators/firstrepository/form.hamlet b/templates/configurators/newrepository/form.hamlet
index 6c2405be6..6c2405be6 100644
--- a/templates/configurators/firstrepository/form.hamlet
+++ b/templates/configurators/newrepository/form.hamlet
diff --git a/templates/otherrepos.hamlet b/templates/otherrepos.hamlet
new file mode 100644
index 000000000..f1738f2f0
--- /dev/null
+++ b/templates/otherrepos.hamlet
@@ -0,0 +1,10 @@
+<ul .dropdown-menu>
+  $forall (name, path) <- repolist
+    <li>
+      <a href="@{SwitchToRepositoryR path}">
+        #{name}
+  $if not (null repolist)
+    <li .divider></li>
+  <li>
+    <a href="@{NewRepositoryR}">
+      Add another repository
diff --git a/templates/page.hamlet b/templates/page.hamlet
index 0c07c9130..7648b6107 100644
--- a/templates/page.hamlet
+++ b/templates/page.hamlet
@@ -6,7 +6,8 @@
       <ul .nav>
         $forall (name, route, isactive) <- navbar
           <li :isactive:.active>
-            <a href="@{route}">#{name}</a>
+            <a href="@{route}">
+              #{name}
       $maybe reldir <- relDir webapp
         <ul .nav .pull-right>
           <li>
@@ -15,8 +16,7 @@
             <a .dropdown-toggle data-toggle="dropdown" href="#menu1">
               Current Repository: #{reldir}
               <b .caret></b>
-            <ul .dropdown-menu>
-               <li><a href="@{RepositoriesR}">Add another repository</a></li>
+            ^{otherReposWidget}
       $nothing
 <div .container-fluid>
   <div .row-fluid>