scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-11 01:44:34 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2243 from aignatov-bio/ai-sci-4137-fix-activity-page-it-task

Browse source 
Fix task activity page [SCI-4137]
This commit is contained in:
aignatov-bio 2019-12-03 09:09:36 +01:00 committed by GitHub
commit d643a08a9c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/sitewide/dropdown_selector.js
View file

@ -244,10 +244,10 @@ var dropdownSelector = (function() {
var perfectScroll;
var dropdownContainer;
if (selectElement.length === 0) return;
// Check if element exist or already initialized
if (selectElement.length === 0 || selectElement.next().hasClass('dropdown-selector-container')) {
selectElement.next().remove();
}
if (selectElement.next().hasClass('dropdown-selector-container')) selectElement.next().remove();
// Create initial container after select block
dropdownContainer = selectElement.after('<div class="dropdown-selector-container"></div>').next();

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

@ -9,26 +9,30 @@
<div class="ga-bottom">
<div class="ga-main 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 class="ga-main">
<div class="activities-container 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>
<div class="ga-activities-list"
data-activities-url="<%= activities_my_module_path(@my_module) %>"
data-starting-timestamp="<%= @starting_timestamp %>">
<%= render partial: "global_activities/activity_list.html.erb" %>
</div>
<div class="text-center">
<a class="btn btn-default btn-more-activities <%= 'hidden' unless @next_page %>"
data-next-page="<%= @next_page %>">
<%= t'activities.index.more_activities' %>
</a>
</div>
<div id="ga-more-activities-placeholder" class="hidden"></div>
</div>
<div class="ga-activities-list"
data-activities-url="<%= activities_my_module_path(@my_module) %>"
data-starting-timestamp="<%= @starting_timestamp %>">
<%= render partial: "global_activities/activity_list.html.erb" %>
</div>
<div class="text-center">
<a class="btn btn-default btn-more-activities <%= 'hidden' unless @next_page %>"
data-next-page="<%= @next_page %>">
<%= t'activities.index.more_activities' %>
</a>
</div>
<div id="ga-more-activities-placeholder" class="hidden"></div>
</div>
<div class="ga-side perfect-scrollbar">
<%= render partial: "my_modules/activities/side_filters" %>
<div class="ga-side">
<div class="filters-container perfect-scrollbar">
<%= render partial: "my_modules/activities/side_filters" %>
</div>
</div>
</div>
</div>