scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-12 16:14:58 +08:00
Code Issues Projects Releases Packages Wiki Activity

Remove Info tab and change comment title on results view

Browse source
This commit is contained in:
Mojca Lorber 2016-09-29 16:43:19 +02:00
parent c9fbf845f1
commit 35477b1005
4 changed files with 20 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/extend/bootstrap.scss vendored
View file

@ -53,3 +53,7 @@
.step-comment .col-xs-12 { .step-comment .col-xs-12 {
float: none; float: none;
} }
.result-comment .col-xs-12 {
float: none;
}

38
app/views/my_modules/_result.html.erb
View file

@ -36,34 +36,20 @@
</div> </div>
<div class="panel-collapse collapse" id="result-panel-<%= result.id %>" role="tabpanel"> <div class="panel-collapse collapse" id="result-panel-<%= result.id %>" role="tabpanel">
<div class="panel-body"> <div class="panel-body">
<ul class="nav nav-tabs"> <div class="row">
<li role="presentation" class="active"> <div class="col-xs-12">
<a href="#result-info-<%= result.id %>" data-toggle="tab"><span class="glyphicon glyphicon-info-sign"></span> <%= render partial: 'my_modules/result_user_generated.html.erb',
<%= t'my_modules.results.info_tab' %></a> locals: { result: result, markdown: markdown } %>
</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> </div>
</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> </div>
</div> </div>

4
app/views/result_comments/_index.html.erb
View file

@ -1,5 +1,7 @@
<hr> <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> <hr>
<ul class="no-style double-line content-comments"> <ul class="no-style double-line content-comments">
<% if @comments.length == @per_page %> <% if @comments.length == @per_page %>

2
app/views/step_comments/_index.html.erb
View file

@ -1,5 +1,5 @@
<hr> <hr>
<div class="col-xs-12""> <div class="col-xs-12">
<strong><%= t('protocols.steps.comments_tab') %></strong> <strong><%= t('protocols.steps.comments_tab') %></strong>
</div> </div>
<hr> <hr>