scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-03-09 22:23:28 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix loading more activities on task page [SCI-3390]

Browse source
This commit is contained in:
Oleksii Kriuchykhin 2019-04-25 23:50:00 +02:00
parent 09d1946b19
commit 66631ba26c
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/views/my_modules/activities.html.erb
View file

@ -2,17 +2,17 @@
<%= render partial: "shared/sidebar", locals: { current_task: @my_module, page: 'task' } %>
<%= render partial: "shared/secondary_navigation" %>
<div class="global-activities-container container-flex task_activities">
<div class="global-activities-container container-flex task_activities">
<div class="row">
<div class="ga-top col-md-12 task_activities">
<%= render partial: "my_modules/activities/top_pane" %>
</div>
<div class="ga-side col-lg-3 col-md-12 col-xl-2 task_activities perfect-scrollbar">
<div class="ga-side col-lg-3 col-md-12 col-xl-2 task_activities perfect-scrollbar">
<%= render partial: "my_modules/activities/side_filters" %>
</div>
<div class="ga-main col-lg-9 col-md-12 col-xl-10 task_activities perfect-scrollbar">
<div class="ga-main col-lg-9 col-md-12 col-xl-10 task_activities perfect-scrollbar">
<div class="no-activities-message text-center <%= 'hidden' if @grouped_activities.keys.any? %>">
<p><%= t('activities.index.no_activities_task_message') %></p>
</div>
@ -27,6 +27,7 @@
<%= t'activities.index.more_activities' %>
</a>
</div>
<div id="ga-more-activities-placeholder" class="hidden"></div>
</div>
</div>