From 35477b1005f9db156c78b51e12cfaa351240ec55 Mon Sep 17 00:00:00 2001
From: Mojca Lorber <mojca.lorber@biosistemika.com>
Date: Thu, 29 Sep 2016 16:43:19 +0200
Subject: [PATCH] Remove Info tab and change comment title on results view

---
 app/assets/stylesheets/extend/bootstrap.scss |  4 +++
 app/views/my_modules/_result.html.erb        | 38 +++++++-------------
 app/views/result_comments/_index.html.erb    |  4 ++-
 app/views/step_comments/_index.html.erb      |  2 +-
 4 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/app/assets/stylesheets/extend/bootstrap.scss b/app/assets/stylesheets/extend/bootstrap.scss
index 151ce3110..4159a13b1 100644
--- a/app/assets/stylesheets/extend/bootstrap.scss
+++ b/app/assets/stylesheets/extend/bootstrap.scss
@@ -53,3 +53,7 @@
 .step-comment .col-xs-12 {
   float: none;
 }
+
+.result-comment .col-xs-12 {
+  float: none;
+}
diff --git a/app/views/my_modules/_result.html.erb b/app/views/my_modules/_result.html.erb
index 29da2a114..069abc134 100644
--- a/app/views/my_modules/_result.html.erb
+++ b/app/views/my_modules/_result.html.erb
@@ -36,34 +36,20 @@
     </div>
     <div class="panel-collapse collapse" id="result-panel-<%= result.id %>" role="tabpanel">
       <div class="panel-body">
-        <ul class="nav nav-tabs">
-          <li role="presentation" class="active">
-            <a href="#result-info-<%= result.id %>" data-toggle="tab"><span class="glyphicon glyphicon-info-sign"></span>
-              <%= t'my_modules.results.info_tab' %></a>
-          </li>
-          <% if false %>
-          <li role="presentation">
-            <a class="comment-tab-link" href="<%= url_for result_result_comments_path(result_id: result.id, format: :json) %>" aria-controls="result-comments-<%= result.id %>" data-remote="true">
-              <span class="glyphicon glyphicon-comment"></span>
-              <%= t'my_modules.results.comments_tab' %></a>
-          </li>
-          <% end %>
-        </ul>
-        <div class="tab-content">
-          <div class="tab-pane active" role="tabpanel" id="result-info-<%= result.id %>">
-            <div class="row">
-              <%= render partial: 'my_modules/result_user_generated.html.erb',
-                         locals: { result: result, markdown: markdown } %>
-            </div>
-            <% if can_view_result_comments(@my_module) %>
-            <div class="row">
-              <div class="result-comment"
-                   id="result-comments-<%= result.id %>"
-                   data-href="<%= result_result_comments_url(result) %>"></div>
-            </div>
-            <% end %>
+        <div class="row">
+          <div class="col-xs-12">
+            <%= render partial: 'my_modules/result_user_generated.html.erb',
+                       locals: { result: result, markdown: markdown } %>
           </div>
         </div>
+        <% if can_view_result_comments(@my_module) %>
+          <div class="row">
+            <div class="result-comment"
+                 id="result-comments-<%= result.id %>"
+                 data-href="<%= result_result_comments_url(result) %>">
+            </div>
+          </div>
+        <% end %>
       </div>
     </div>
   </div>
diff --git a/app/views/result_comments/_index.html.erb b/app/views/result_comments/_index.html.erb
index 00bf407dd..e8ef220d3 100644
--- a/app/views/result_comments/_index.html.erb
+++ b/app/views/result_comments/_index.html.erb
@@ -1,5 +1,7 @@
 <hr>
-<h5 class="text-center"><%= t('my_modules.results.comments_tab') %></h5>
+<div class="col-xs-12">
+  <strong><%= t('my_modules.results.comments_tab') %></strong>
+</div>
 <hr>
 <ul class="no-style double-line content-comments">
   <% if @comments.length == @per_page %>
diff --git a/app/views/step_comments/_index.html.erb b/app/views/step_comments/_index.html.erb
index 9a8035cba..8bafe9c00 100644
--- a/app/views/step_comments/_index.html.erb
+++ b/app/views/step_comments/_index.html.erb
@@ -1,5 +1,5 @@
 <hr>
-<div class="col-xs-12"">
+<div class="col-xs-12">
   <strong><%= t('protocols.steps.comments_tab') %></strong>
 </div>
 <hr>