Merge branch 'master' into milestone

5 files changed, 60 insertions, 1 deletions

diff --git a/data/templates/fork-remote-multiple.htm b/data/templates/fork-remote-multiple.htm
new file mode 100644
index 0000000..f5a95b2
--- /dev/null
+++ b/data/templates/fork-remote-multiple.htm
@@ -0,0 +1,27 @@
+<form method="post" action="/fork-remote" enctype="multipart/form-data" class="well form-inline form-horizontal">
+ <div class="control-group">
+  <p>
+   The URL you provided contains links to several Git repositories.
+   Select one of them.
+  </p>
+  <select size="{{urlselsize}}" name="remote_url" id="sel-remote_url" style="width:100%">
+  {% for grouptitle, groupurls in urls %}
+   {% if groupurls|length == 1 %}
+    <option value="{{groupurls.0}}">{{grouptitle}}</option>
+   {% else %}
+   <optgroup label="{{grouptitle}}">
+    {% for url in groupurls %} 
+    <option value="{{url}}">{{url}}</option>
+    {% endfor %}
+   </optgroup>
+   {% endif %}
+  {% endfor %}
+ </select>
+ </div>
+ <div style="text-align: right">
+  <button type="submit" class="btn btn-primary">
+   <i class="icon-share icon-white"></i> Fork
+  </button>
+ </div>
+
+</form>
\ No newline at end of file
diff --git a/data/templates/fork-remote-new.htm b/data/templates/fork-remote-new.htm
new file mode 100644
index 0000000..6b48ffe
--- /dev/null
+++ b/data/templates/fork-remote-new.htm
@@ -0,0 +1,12 @@
+<form method="post" action="/fork-remote" enctype="multipart/form-data" class="well form-inline">
+ <p>
+  <strong>Copy a paste from a remote server:</strong>
+  Just paste the website or git clone URL.
+ </p>
+
+ <button type="submit" class="btn btn-primary" style="float: right">
+  <i class="icon-share icon-white"></i> Fork remote paste
+ </button>
+ <label for="remote-url">Remote paste URL</label>
+ <input type="text" name="remote_url" id="remote-url" value="{{remote_url}}" class="span5"/>
+</form>
diff --git a/data/templates/fork-remote.htm b/data/templates/fork-remote.htm
new file mode 100644
index 0000000..f651661
--- /dev/null
+++ b/data/templates/fork-remote.htm
@@ -0,0 +1,17 @@
+{% extends "base.htm" %}
+{% block title %}Fork remote paste{% endblock %}
+
+{% block content %}
+ {% include 'fork-remote-new.htm' %}
+
+ {% if error %}
+  <div class="alert alert-error">
+   {{error}}
+  </div>
+ {% endif %}
+
+ {% if urls %}
+  {% include 'fork-remote-multiple.htm' %}
+ {% endif %}
+
+{% endblock %}
diff --git a/data/templates/new.htm b/data/templates/new.htm
index 89c2fe0..8029b8c 100644
--- a/data/templates/new.htm
+++ b/data/templates/new.htm
@@ -20,6 +20,9 @@
  </div>
 
 </form>
+
+{% include 'fork-remote-new.htm' %}
+
 <script type="application/javascript">
 $(document).ready(function() {
     initEdit();
diff --git a/data/templates/repo-sidebar-list.htm b/data/templates/repo-sidebar-list.htm
index 568656e..ed262ac 100644
--- a/data/templates/repo-sidebar-list.htm
+++ b/data/templates/repo-sidebar-list.htm
@@ -2,5 +2,5 @@
   <a href="{{repo.getLink('display')}}">
    {{repo.getTitle}}
   </a><br/>
-  &nbsp;&nbsp;&nbsp;<span title="{{repo.crdate|date('c')}}">{{dh.get(repo.crdate)}}</span>
+  &#160;&#160;&#160;<span title="{{repo.crdate|date('c')}}">{{dh.get(repo.crdate)}}</span>
  </li>