From 006f9316d81e70efd5d80c6750f167b31730ecf4 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Mar 19 2014 17:48:13 +0000 Subject: Add the pull_request template This is the view that user has when he/she submits a pull request from the fork to the project. --- diff --git a/progit/templates/pull_request.html b/progit/templates/pull_request.html new file mode 100644 index 0000000..1bfc440 --- /dev/null +++ b/progit/templates/pull_request.html @@ -0,0 +1,90 @@ +{% extends "master.html" %} + +{% block title %}Home{% endblock %} +{%block tag %}home{% endblock %} + + +{% block content %} + +

Request pull + {% if '/fork/' in request.url %} + + {% else %} + + {% endif %} + {{ repo.name }} + + + {% if '/fork/' in request.url %} + (tree) + {% else %} + (tree) + {% endif %} + +

+ +
+ +
+ +
+

Diff:

+ {% for html_diff in html_diffs %} +

Commit: {{ diff_commits[loop.index - 1].oid.hex }}

+ + + + + + + + + + + + + + +
Author + {{ diff_commits[loop.index - 1].author.name }} {{ '<' + diff_commits[loop.index - 1].author.email + '>' }} + - {{ diff_commits[loop.index - 1].commit_time }} +
Committer + {{ diff_commits[loop.index - 1].committer.name }} {{ '<' + diff_commits[loop.index - 1].committer.email + '>' }} + - {{ diff_commits[loop.index - 1].commit_time }} +
Parent + {% for parent in diff_commits[loop.index - 1].parents %} + {% if '/fork/' in request.url %} + + {% else %} + + {% endif %} + + {{ parent.oid.hex }} +
+ {% endfor %} +
+

+ {{ diff_commits[loop.index - 1].message }} +

+ {% autoescape false %} + {{ html_diff }} + {% endautoescape %} + {% endfor %} +
+ +{% endblock %}