From e1328f69aee22776286ff751dc4221685b2d239f Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Sep 05 2016 14:00:22 +0000
Subject: Rework the remote pull-request page to fit better with the new UI


---

diff --git a/pagure/templates/remote_pull_request.html b/pagure/templates/remote_pull_request.html
index 4489ddb..2641733 100644
--- a/pagure/templates/remote_pull_request.html
+++ b/pagure/templates/remote_pull_request.html
@@ -1,5 +1,5 @@
 {% extends "repo_master.html" %}
-{% from "_formhelper.html" import render_field_in_row %}
+{% from "_formhelper.html" import render_bootstrap_field %}
 
 {% block title %}Remote Pull request {{ repo.name }}{% endblock %}
 {% set tag = "home" %}
@@ -10,9 +10,14 @@
 <h2>New remote pull-request</h2>
 
 <p>
-  Remote pull-requests are pull-requests made from a project *not* hosted
-  on pagure or not hosted on the same pagure instance than the target project,
-  hosted on pagure.
+  *Remote pull-requests* are pull-requests from projects hosted somewhere
+  else than this Pagure instance.
+</p>
+
+<p>
+  If you would like to submit a new remote pull-request to this project,
+  please provide the URL for the remote Git repository and the branch you
+  want to merge.
 </p>
 
 <p>
@@ -23,36 +28,36 @@
 </p>
 
 {% if form %}
-<section class="new_project">
   <form action="{{ url_for('.new_remote_request_pull', username=username,
     repo=repo.name) }}" method="post">
-    <table>
-      {{ render_field_in_row(form.title, size=80) }}
-      {{ render_field_in_row(form.git_repo, size=80) }}
-      {{ render_field_in_row(form.branch_from, size=80) }}
-      <tr>
-        <td>To branch</td>
-        <td>
-          <select id="branch_select" name="branch_to">
-            {% if branch_to %}<option>{{ branch_to }}</option>{% endif %}
-            {% for branch in branches |reverse %}
-              {% if not branch_to or branch != branch_to %}
-              <option>{{ branch }}</option>
-              {% endif %}
-            {% endfor %}
-          </select>
-        </td>
-      </tr>
-    </table>
+    <div class="card-block">
+      {{ render_bootstrap_field(
+          form.title, size=80,
+          field_description="title of the pull-request") }}
+      {{ render_bootstrap_field(
+          form.git_repo, size=80,
+          field_description="public url to the git repository containing the changes to merge") }}
+      {{ render_bootstrap_field(form.branch_from, size=80) }}
+      To branch:
+      <select id="branch_select" name="branch_to" class="c-select">
+        {% if branch_to %}<option>{{ branch_to }}</option>{% endif %}
+        {% for branch in branches |reverse %}
+          {% if not branch_to or branch != branch_to %}
+          <option>{{ branch }}</option>
+          {% endif %}
+        {% endfor %}
+      </select>
+
+    </div>
     <p class="buttons indent">
-      <input type="submit" class="submit positive button" value="Preview">
+      <input type="submit" class="btn btn-primary" value="Preview">
       {{ form.csrf_token }}
+
       <a href="{{ url_for('view_repo', username=username, repo=repo.name)}}">
-        <input type="button" value="Cancel" />
+        <input type="button" class="btn btn-secondary" value="Cancel" />
       </a>
     </p>
   </form>
-</section>
 {% endif %}
 
 {% endblock %}