scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-06 15:05:26 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1591 from urbanrotnik/ur-SCI-3201-rename-button-all-activities

Browse source 
Rename dropdown labels for Activities, Users and Teams [SCI-3201]
This commit is contained in:
Urban Rotnik 2019-03-27 05:49:50 +01:00 committed by GitHub
commit af93694560
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,7 @@
<h6 class="clear"><%= t('global_activities.index.clear') %></h6> <h6 class="clear"><%= t('global_activities.index.clear') %></h6>
<div class="select-container"> <div class="select-container">
<%= select_tag "team", options_from_collection_for_select(@teams, :id, :name, current_user.current_team_id),{ <%= select_tag "team", options_from_collection_for_select(@teams, :id, :name, current_user.current_team_id),{
'data-select-all-button': t('global_activities.index.all_teams'), 'data-select-all-button': t('global_activities.index.all_teams_btn'),
'data-select-multiple-name': t('global_activities.index.l_teams'), 'data-select-multiple-name': t('global_activities.index.l_teams'),
'data-select-multiple-all-selected': t('global_activities.index.all_teams'), 'data-select-multiple-all-selected': t('global_activities.index.all_teams'),
'data-dropdown-position': 'left' 'data-dropdown-position': 'left'
@ -44,7 +44,7 @@
<h6 class="clear"><%= t('global_activities.index.clear') %></h6> <h6 class="clear"><%= t('global_activities.index.clear') %></h6>
<div class="select-container"> <div class="select-container">
<%= select_tag "activity", grouped_options_for_select(@activity_types),{ <%= select_tag "activity", grouped_options_for_select(@activity_types),{
'data-select-all-button': t('global_activities.index.all_activities'), 'data-select-all-button': t('global_activities.index.all_activities_btn'),
'data-select-all': 'true', 'data-select-all': 'true',
'data-select-multiple-name': t('global_activities.index.l_activities'), 'data-select-multiple-name': t('global_activities.index.l_activities'),
'data-select-multiple-all-selected': t('global_activities.index.all_activities'), 'data-select-multiple-all-selected': t('global_activities.index.all_activities'),
@ -59,7 +59,7 @@
<h6 class="clear"><%= t('global_activities.index.clear') %></h6> <h6 class="clear"><%= t('global_activities.index.clear') %></h6>
<div class="select-container"> <div class="select-container">
<%= select_tag "user", options_for_select(@user_list),{ <%= select_tag "user", options_for_select(@user_list),{
'data-select-all-button': t('global_activities.index.all_users'), 'data-select-all-button': t('global_activities.index.all_users_btn'),
'data-select-all': 'true', 'data-select-all': 'true',
'data-select-multiple-name': t('global_activities.index.l_users'), 'data-select-multiple-name': t('global_activities.index.l_users'),
'data-select-multiple-all-selected': t('global_activities.index.all_users'), 'data-select-multiple-all-selected': t('global_activities.index.all_users'),

3
config/locales/global_activities/en.yml
View file

@ -18,10 +18,13 @@ en:
user: "User" user: "User"
object: "Object" object: "Object"
all_teams: "All teams" all_teams: "All teams"
all_teams_btn: "Select All Teams"
l_teams: "teams" l_teams: "teams"
all_users: "All users" all_users: "All users"
all_users_btn: "Select All Users"
l_users: "users" l_users: "users"
all_activities: "All activities" all_activities: "All activities"
all_activities_btn: "Select All Activities"
l_activities: "activities" l_activities: "activities"
clear_filters: "Clear filters" clear_filters: "Clear filters"
content: content: