From 55ecac02b19f901a029043bf4c293902d4d745f3 Mon Sep 17 00:00:00 2001 From: Ryan Lerch Date: Jan 13 2016 09:49:23 +0000 Subject: redid the user requests list page to the new UI --- diff --git a/pagure/templates/user_requests.html b/pagure/templates/user_requests.html index d08d182..fa3c3eb 100644 --- a/pagure/templates/user_requests.html +++ b/pagure/templates/user_requests.html @@ -1,76 +1,102 @@ {% extends "master.html" %} {% from "_formhelper.html" import render_field_in_row %} +{% from "_browseheader.html" import browse_header %} {% block title %}Pull-requests of {{ username }}{% endblock %} -{% set tag = "home"%} +{% set tag = "users"%} {% block content %} +
+
+ {{browse_header(select=tag)}} +
+
+
+
+

+ Pull Requests opened by {{ username | avatar(20) | safe }} {{ username }} +

+
+ + All + Open + Merged + Closed + +
+ + + + + + + + + + + + + + {% for request in requests %} + + + + + + + + {% else %} + + + + {% endfor %} + +
#TitleOpenedProjectAssigned to
PR#{{ request.id }} + + {{ request.title | noJS("img") | safe }} {{request.status}} + + + {{ + request.date_created | humanize}} + + + {{ request.project.username + '/' if request.project.is_fork }} + {{ request.project.name }} + + + {% if request.assignee %} + {{ request.assignee.user | avatar(16) | safe }} + {{ request.assignee.user }} + {% else %} + unassigned + {% endif %} +
No pull-request found
+
+
-

Opened pull-requests for

- -

- {{ username | avatar(36) | safe }} {{ username }} - {% if g.fas_user and g.fas_user.username == username %} - - {% endif %} - -

- - - - - - - - - - - - - - - - {% for request in requests %} - - - - - - - - - {% else %} - - - - {% endfor %} - -
#TitleProjectOpened byOpened onAssigned to
#{{ request.id }} - - {{ request.title | noJS("img") | safe }} - - - - {{ request.project.username + '/' if request.project.is_fork }} - {{ request.project.name }} - - - {{ request.user.user | avatar(16) | safe }} - {{ request.user.user }} - - {{ request.date_created.strftime('%Y-%m-%d %H:%M:%S') }} - - {% if request.assignee %} - {{ request.assignee.user | avatar(16) | safe }} - {{ request.assignee.user }} - {% else %} - (unassigned) - {% endif %} -
No pull-request found
+{% endblock %} +{% block jscripts %} + {{ super() }} + {% endblock %}