From a27bf1ec20746fc613fffef2fb32b6a0a3d2cdfd Mon Sep 17 00:00:00 2001
From: Chenxiong Qi <qcxhome@gmail.com>
Date: Jan 06 2018 14:08:09 +0000
Subject: Move add milestone button to top of issues list


Fixes #2860

Signed-off-by: Chenxiong Qi <qcxhome@gmail.com>

---

diff --git a/pagure/templates/issues.html b/pagure/templates/issues.html
index b1b91f4..00e1605 100644
--- a/pagure/templates/issues.html
+++ b/pagure/templates/issues.html
@@ -19,13 +19,19 @@
       {{ issues|count }} Issues (of {{ issues_cnt }})
     {% endif %}
     <span class="btn-group btn-group-sm pull-xs-right" role="group">
+    {% if g.repo_admin %}
+      <a href="javascript:avoid(0)" class="btn btn-secondary btn-sm"
+        data-toggle="modal" data-target="#milestone_modal">
+        Add milestone
+      </a>
+    {% endif %}
     {% if repo.milestones %}
       <a href="{{ url_for(
           'view_roadmap',
           repo=repo.name,
           username=username,
-          namespace=repo.namespace) }}">
-        <button class="btn btn-secondary btn-sm">Roadmap</button>
+          namespace=repo.namespace) }}" class="btn btn-secondary btn-sm">
+        Roadmap
       </a>
     {% endif %}
       {% if g.repo.reports %}
@@ -48,6 +54,28 @@
       {% endif %}
     </span>
   </h2>
+
+  {% if g.repo_admin %}
+    <div class="modal fade" id="milestone_modal" tabindex="-1"
+          role="dialog" aria-labelledby="New milestone" aria-hidden="true">
+      <div class="modal-dialog" role="document">
+        <div class="modal-content">
+          <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+              <span aria-hidden="true">&times;</span>
+              <span class="sr-only">Close</span>
+            </button>
+          </div>
+          <div class="modal-body">
+        {% set tag_form = add_report_form %}
+        {% set from = 'issues' %}
+        {% include 'settings_milestones.html' %}
+          </div>
+        </div>
+      </div>
+    </div>
+  {% endif %}
+
     {% if oth_issues_cnt %}
     <div class="addrem_bar issues_pbar m-b-1 {%
       if status|lower not in ['open', 'true'] %}closed{%
@@ -342,10 +370,6 @@
   data-toggle="modal" data-target="#report_modal">
   Save report
 </button>
-<button type="button" class="btn btn-secondary btn-sm pull-xs-right"
-  data-toggle="modal" data-target="#milestone_modal">
-  Add milestone
-</button>
 <div class="modal fade" id="report_modal" tabindex="-1"
       role="dialog" aria-labelledby="New report" aria-hidden="true">
   <div class="modal-dialog" role="document">
@@ -375,24 +399,6 @@
     </div>
   </div>
 </div>
-<div class="modal fade" id="milestone_modal" tabindex="-1"
-      role="dialog" aria-labelledby="New milestone" aria-hidden="true">
-  <div class="modal-dialog" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true">&times;</span>
-          <span class="sr-only">Close</span>
-        </button>
-      </div>
-      <div class="modal-body">
-    {% set tag_form = add_report_form %}
-    {% set from = 'issues' %}
-    {% include 'settings_milestones.html' %}
-      </div>
-    </div>
-  </div>
-</div>
 {% endif %}
 
 {{ pagination_link('page', g.page, total_page) }}