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

Change activity filter order and reduce custom date label size [SCI-3301] (#1651)

Browse source 
* Change activity filter order and reduce custom date label size

* Fix hound
This commit is contained in:
aignatov-bio 2019-04-09 14:18:22 +02:00 • committed by GitHub
parent e2e299b424
commit 7ef7e2397f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/global_activities.scss
View file

@ -117,6 +117,10 @@
line-height: 20px;
margin-bottom: 5px;
width: calc(100% - 50px);
&.sub {
font-size: 12px;
}
}
.clear {

2
app/views/global_activities/_side_filters.html.erb
View file

@ -27,7 +27,7 @@
<div class="hot-button btn btn-default" data-period="this_month"><%= t('global_activities.index.this_month') %></div>
<div class="hot-button btn btn-default" data-period="last_month"><%= t('global_activities.index.last_month') %></div>
</div>
<h4 class="title">
<h4 class="title sub">
<%= t('global_activities.index.custom_dates_label') %>
</h4>
<div class="to">

2
app/views/my_modules/activities/_side_filters.html.erb
View file

@ -14,7 +14,7 @@
<div class="hot-button btn btn-default" data-period="this_month"><%= t('global_activities.index.this_month') %></div>
<div class="hot-button btn btn-default" data-period="last_month"><%= t('global_activities.index.last_month') %></div>
</div>
<h4 class="title">
<h4 class="title sub">
<%= t('global_activities.index.custom_dates_label') %>
</h4>
<div class="to">

16
config/initializers/extends.rb
View file

@ -212,15 +212,15 @@ class Extends
}
ACTIVITY_GROUPS = {
projects: [*0..7, 32, 33, 34],
task_results: [*23..26, 40, 41, 42, 99],
task: [*8..14, 35, 36, 37, 53, 54, *58..69, 106],
task_protocol: [*15..22, 45, 46, 47, 38, 39, 100],
projects: [*0..7, 32, 33, 34, 95],
task_results: [23, 26, 25, 42, 24, 40, 41, 99],
task: [8, 58, 9, 59, 10, 11, 12, 13, 14, 35, 36, 37, 53, 54, *60..69, 106],
task_protocol: [15, 22, 16, 18, 19, 20, 21, 17, 38, 39, 100, 45, 46, 47],
task_inventory: [55, 56],
experiment: [*27..31, 57],
reports: [48, 49, 50],
inventories: [*70..78, 105, 102],
protocol_repository: [*79..91, 101, 103],
team: [*92..97, 104]
reports: [48, 50, 49],
inventories: [70, 71, 105, 72, 73, 74, 102, 75, 76, 77, 78, 96],
protocol_repository: [80, 103, 89, 87, 79, 90, 91, 88, 85, 86, 84, 81, 82, 83, 101],
team: [92, 94, 93, 97, 104]
}.freeze
end