From 71995439f40855afb72573291146aa22be2837b8 Mon Sep 17 00:00:00 2001
From: Ryan Lerch <rlerch@redhat.com>
Date: Dec 24 2015 09:22:01 +0000
Subject: more changes to issues,and started on the requests page


---

diff --git a/pagure/static/koji.css b/pagure/static/koji.css
index eb48831..ba48a90 100644
--- a/pagure/static/koji.css
+++ b/pagure/static/koji.css
@@ -79,7 +79,7 @@ background:#ededed;
 padding: 0.3rem;
 }
 
-#issue-title
+#issue-title, .stretch-table-column
 {
 	min-width:99%;
 }
@@ -91,7 +91,7 @@ padding: 0.3rem;
     line-height: 1.2;
 }
 
-#pagure-issues-list .td-open_date
+#pagure-issues-list .td-open_date, .nowrap
 {
 white-space: nowrap;
 }
@@ -111,6 +111,11 @@ white-space: nowrap;
 display:none;
 }
 
+.bodycontent
+{
+min-height:800px;
+}
+
 .oi-spin {
   -webkit-animation: spin 2s infinite linear;
   -moz-animation: spin 2s infinite linear;
diff --git a/pagure/templates/_formhelper.html b/pagure/templates/_formhelper.html
index e91e5a5..c8e3270 100644
--- a/pagure/templates/_formhelper.html
+++ b/pagure/templates/_formhelper.html
@@ -142,7 +142,7 @@
 {% endmacro %}
 
 
-{% macro show_initial_comment(comment, id, repo, username, issueid, form, repo_admin) %}
+{% macro show_initial_comment(comment, id, repo, username, issueid, form, repo_admin, issue) %}
 <div class="clearfix p-b-lg">
     <section class="issue_comment">
       <div class="comment_body">
@@ -156,18 +156,14 @@
       </div>
     </section>
         <aside class="issue_action icon pull-right">
-          <a class="reply btn-secondary btn-sm" title="Reply to this comment - loose formating">
+          <a class="btn btn-secondary btn-sm" title="Reply to this comment - loose formating">
             reply
           </a>
-          {% if id != 0 and g.fas_user and (
-              (comment.parent.status in [True, 'Open'] and g.fas_user.username == comment.user.username)
-              or repo_admin) %}
-          <button type="submit" name="drop_comment" value="{{ comment.id }}"
-              onclick="return confirm('Do you really want to remove this comment?');"
-              title="Remove comment">
-              <span class="icon icon-remove blue"></span>
-          </button>
-          {% endif %}
+      {% if repo_admin or g.fas_user.username == issue.user.username %}
+      <a class="btn btn-secondary btn-sm" href="{{ url_for('edit_issue', username=username,
+                    repo=repo.name, issueid=issueid) }}">
+          edit</a>
+      {% endif %}
         </aside>
 </div>
 {% endmacro %}
diff --git a/pagure/templates/issue.html b/pagure/templates/issue.html
index f4a4b4b..f4cc812 100644
--- a/pagure/templates/issue.html
+++ b/pagure/templates/issue.html
@@ -14,21 +14,17 @@
 {% endblock %}
 
 {% block repo %}
+<div class="row m-t-md">
+  <div class="col-md-8">
 
-<h2>
-    <span class="issueid label label-default">#{{ issueid }}</span> <span id="issuetitle">{{
-        issue.title | noJS("img") | safe }}</span>
-    {% if authenticated and (repo_admin or g.fas_user.username == issue.user.username) %}
-    <a class="btn btn-primary pull-right" href="{{ url_for('edit_issue', username=username,
-                  repo=repo.name, issueid=issueid) }}">
-        Edit</a>
-    {% endif %}
-</h2>
+    <h2>
+      <span class="issueid label label-default">#{{ issueid }}</span> <span id="issuetitle">{{
+          issue.title | noJS("img") | safe }}</span>
+    </h2>
 <h5 class="text-muted"> Created {{ issue.date_created | humanize}} by {{ issue.user.user }}</h5>
 
-<div class="row m-t-md">
-  <div class="col-md-8">
-    {{ show_initial_comment(issue, 0, repo, username, issueid, form) }}
+
+    {{ show_initial_comment(issue, 0, repo, username, issueid, form, issue) }}
 
     <section id="comments">
     {% if issue.comments %}
diff --git a/pagure/templates/issues.html b/pagure/templates/issues.html
index cb33284..6c00f9e 100644
--- a/pagure/templates/issues.html
+++ b/pagure/templates/issues.html
@@ -6,8 +6,8 @@
 
 {% block repo %}
 
-<div class="inline">
-  <h3>
+
+  <h2 class="p-b">
     {% if status and status != 'Open' %}
       {{ issues|count }} Closed Issues
     {% else %}
@@ -15,10 +15,10 @@
     {% endif %}
 
     <a class="pull-right" href="{{ url_for('new_issue', username=username, repo=repo.name) }}">
-      <button class="btn btn-secondary btn-sm">New Issue</button>
+      <button class="btn btn-success btn-sm">New Issue</button>
     </a>
-  </h3>
-</div>
+  </h2>
+
 
 <section id="tags">
   <span class="btn-group btn-group-sm issues-tagbar" role="group" aria-label="Basic example">
@@ -60,9 +60,9 @@
     {% endfor %}
 </span>
 </section>
-
-<table id="pagure-issues-list" class="table table-sm">
-    <thead>
+<div class="card m-t">
+<table id="pagure-issues-list" class="table table-hover table-striped m-b-0">
+    <thead class="thead-default">
         <tr>
             <th>#</th>
             <th id="issue-title">Title</th>
@@ -126,5 +126,5 @@
     {% endfor %}
     </tbody>
 </table>
-
+</div>
 {% endblock %}
diff --git a/pagure/templates/requests.html b/pagure/templates/requests.html
index 987882d..4162be3 100644
--- a/pagure/templates/requests.html
+++ b/pagure/templates/requests.html
@@ -30,19 +30,19 @@
       </a>
     </aside>
 </div>
-
-<table class="list requests">
+<div class="card">
+<table class="table table-hover table-striped m-b-0">
     <thead>
         <tr>
             <th>#</th>
-            <th>Title</th>
+            <th class="stretch-table-column">Title</th>
             <th class="open_by">
-              Opened by (<a href="{{ url_for('request_pulls', username=username,
+              Reporter(<a href="{{ url_for('request_pulls', username=username,
                 repo=repo.name, assignee=assignee, status=status) }}">reset</a>)
             </th>
-            <th class="open_date">Opened on</th>
+            <th class="open_date nowrap">Opened date</th>
             <th class="assigned">
-              Assigned to (<a href="{{ url_for('request_pulls', username=username,
+              Assignee(<a href="{{ url_for('request_pulls', username=username,
                 repo=repo.name, author=author, status=status) }}">reset</a>)
             </th>
         </tr>
@@ -93,5 +93,6 @@
     {% endfor %}
     </tbody>
 </table>
+</div>
 {% endblock %}