From 5f989becaf919d25568e74587eaecb9603ceb2cd Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Oct 02 2018 07:57:04 +0000
Subject: [PATCH 1/2] Fix citing the original comment in a ticket


Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/pagure/templates/_formhelper.html b/pagure/templates/_formhelper.html
index 50b7897..ea8e4a7 100644
--- a/pagure/templates/_formhelper.html
+++ b/pagure/templates/_formhelper.html
@@ -306,10 +306,10 @@
 
 
 {% macro show_initial_comment(comment, username, repo, issueid, form) %}
-<div class="clearfix p-b-3">
+<div class="clearfix p-b-3" id="original_comment_box">
   <section class="issue_comment" id="comment-0">
     <div class="comment_body">
-{{ comment.content | markdown | noJS | safe }}
+{{- comment.content | markdown | noJS | safe -}}
     </div>
   </section>
   <div class="issue_action icon float-right">
diff --git a/pagure/templates/issue.html b/pagure/templates/issue.html
index c71ab80..ce5db3a 100644
--- a/pagure/templates/issue.html
+++ b/pagure/templates/issue.html
@@ -769,6 +769,9 @@ function setup_reply_btns() {
   $( ".reply" ).click(
     function() {
       var _section = $(this).closest('.card');
+      if (!_section.length) {
+        var _section = $(this).closest('#original_comment_box');
+      }
       var _comment = _section.find('.comment_body');
       var _text = _comment.text().split("\n");
       var _output = new Array();

From 121bdb9f7f30759939e9d0ab1b447281a3ba765d Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Oct 02 2018 07:57:04 +0000
Subject: [PATCH 2/2] Trim end of lines in template


Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/pagure/templates/_formhelper.html b/pagure/templates/_formhelper.html
index ea8e4a7..671eed8 100644
--- a/pagure/templates/_formhelper.html
+++ b/pagure/templates/_formhelper.html
@@ -121,7 +121,7 @@
         <a href="{{ url_for('ui_ns.view_user', username=comment.user.user)}}"
             title="{{ comment.user.html_title }}"
             class="notblue font-weight-bold">
-            {{ comment.user.user }} 
+            {{ comment.user.user }}
         </a>
         <a class="notblue" title="Permalink to this headline"
           href="#comment-{{ id }}">
@@ -156,7 +156,7 @@
               </div>
               {% endif %}
             {% endif%}
-                  
+
 
             {% if g.fas_user %}
               <a class="reply btn btn-outline-primary border-0" data-toggle="tooltip"
@@ -238,7 +238,7 @@
       <a href="{{ url_for('ui_ns.view_user', username=pull_request.user.user)}}"
           title="{{ pull_request.user.html_title }}"
           class="notblue font-weight-bold">
-        {{ pull_request.user.user }} 
+        {{ pull_request.user.user }}
       </a>
       <a class="notblue" title="Permalink to this headline"
         href="#comment-0">
@@ -257,7 +257,7 @@
               </a>
             {% endif %}
             {% if g.fas_user and (g.repo_committer or g.fas_user.username == pull_request.user.username) %}
-            <a class="btn btn-outline-primary border-0" 
+            <a class="btn btn-outline-primary border-0"
                href="{{ url_for(
                 'ui_ns.request_pull_edit',
                 repo=repo.name,
@@ -286,7 +286,7 @@
     {% if g.fas_user and (g.repo_committer or g.fas_user.username == pull_request.user.username) %}
       <div>
       {% if pull_request.status == 'Open' %}
-      <a class="btn btn-outline-primary mt-2 btn-sm" 
+      <a class="btn btn-outline-primary mt-2 btn-sm"
         href="{{ url_for(
           'ui_ns.request_pull_edit',
           repo=repo.name,