From cc1372e99236ffc5987e46fc09b5454b2425d9f7 Mon Sep 17 00:00:00 2001
From: Sebastin Santy <sebastinssanty@gmail.com>
Date: Sat, 22 Jul 2017 01:04:55 +0530
Subject: Bug 1381752 - Re-organize the layout

---
 .../template/en/default/bug_modal/common_header.html.tmpl  |  4 ++--
 .../en/default/bug_modal/common_new_comment.html.tmpl      | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'extensions/BugModal/template/en')

diff --git a/extensions/BugModal/template/en/default/bug_modal/common_header.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/common_header.html.tmpl
index 2ffee3bd7..814464f27 100644
--- a/extensions/BugModal/template/en/default/bug_modal/common_header.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/common_header.html.tmpl
@@ -49,7 +49,7 @@
     "contextMenu",
     "visibility"
   );
-  style_urls.push(
+  style_urls.unshift(
     "extensions/BugModal/web/common_bug_modal.css",
     "extensions/BugModal/web/dropdown.css",
     "skins/custom/bug_groups.css",
@@ -76,4 +76,4 @@
   };
 [% END %]
 
-[% Hook.process("end") %]
\ No newline at end of file
+[% Hook.process("end") %]
diff --git a/extensions/BugModal/template/en/default/bug_modal/common_new_comment.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/common_new_comment.html.tmpl
index 2ba3948d1..184310277 100644
--- a/extensions/BugModal/template/en/default/bug_modal/common_new_comment.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/common_new_comment.html.tmpl
@@ -39,17 +39,19 @@
       Preview
       <img id="preview-throbber" src="extensions/BugModal/web/throbber.gif" width="16" height="11" style="display:none">
     </li>
+    <!-- <li id="comment-guide-tab" role="tab" tabindex="-2" aria-controls="comment-guide-tabpanel" aria-selected="false">
+      <a href="page.cgi?id=etiquette.html" target="_blank" tabindex="-1">
+      Comments Subject to Etiquette and Contributor Guidelines</a>
+    </li> -->
   </ul>
+<!--   <div id="bugzilla-etiquette">
+    
+  </div> -->
 
   <div id="comment-edit-tabpanel" class="comment-tabpanel" role="tabpanel" aria-labelledby="comment-edit-tab">
-    <textarea rows="5" cols="80" name="comment" id="comment" aria-labelledby="comment-edit-tab"></textarea>
+    <textarea rows="5" [%+ UNLESS disable_cols %] cols="80" [% END +%] name="comment" id="comment" aria-labelledby="comment-edit-tab"></textarea>
   </div>
   <div id="comment-preview-tabpanel" class="comment-tabpanel" role="tabpanel" aria-labelledby="comment-preview-tab" style="display:none">
     <pre id="comment-preview" class="comment-text"></pre>
   </div>
-
-  <div id="bugzilla-etiquette">
-    <a href="page.cgi?id=etiquette.html" target="_blank" tabindex="-1">
-      Comments Subject to Etiquette and Contributor Guidelines</a>
-  </div>
 </div>
-- 
cgit v1.2.3-24-g4f1b