Merge pull request #831 from biosistemika/revert-830-revert-820-lm-sci-1675

Add Add-ons page to User -> Settings -> Account [SCI-1675], vol. 2
This commit is contained in:
okriuchykhin 2017-10-27 11:14:39 +02:00 committed by GitHub
commit 2e0bf91467
6 changed files with 47 additions and 1 deletions

View file

@ -0,0 +1,8 @@
module Users
module Settings
module Account
class AddonsController < ApplicationController
end
end
end
end

View file

@ -1,7 +1,8 @@
module UserSettingsHelper module UserSettingsHelper
def on_settings_account_page? def on_settings_account_page?
controller_name == 'registrations' && action_name == 'edit' || controller_name == 'registrations' && action_name == 'edit' ||
controller_name == 'preferences' && action_name == 'index' controller_name == 'preferences' && action_name == 'index' ||
controller_name == 'addons' && action_name == 'index'
end end
def on_settings_account_profile_page? def on_settings_account_profile_page?
@ -12,6 +13,10 @@ module UserSettingsHelper
controller_name == 'preferences' controller_name == 'preferences'
end end
def on_settings_account_addons_page?
controller_name == 'addons'
end
def on_settings_team_page? def on_settings_team_page?
controller_name.in?(%w(teams audits)) && controller_name.in?(%w(teams audits)) &&
action_name.in?(%w(index new create show audits_index)) action_name.in?(%w(index new create show audits_index))

View file

@ -5,4 +5,7 @@
<li role="presentation" class="<%= 'active' if on_settings_account_preferences_page? %>"> <li role="presentation" class="<%= 'active' if on_settings_account_preferences_page? %>">
<%= link_to t('users.settings.account.navigation.preferences'), preferences_path %> <%= link_to t('users.settings.account.navigation.preferences'), preferences_path %>
</li> </li>
<li role="presentation" class="<%= 'active' if on_settings_account_addons_page? %>">
<%= link_to t('users.settings.account.navigation.addons'), addons_path %>
</li>
</ul> </ul>

View file

@ -0,0 +1,22 @@
<% provide(:head_title, t('users.settings.account.addons.head_title')) %>
<%= render partial: 'users/settings/navigation.html.erb' %>
<div class="tab-content">
<div class="tab-pane tab-pane-settings active" role="tabpanel">
<div class="row">
<div class="col-xs-12 col-sm-3">
<%= render partial: 'users/settings/account/navigation.html.erb' %>
</div>
<div class="col-xs-12 col-sm-9">
<h4><%= t('users.settings.account.addons.title') %></h4>
<div data-hook="settings-addons-container">
<em data-hook="settings-addons-no-addons">
<%= t('users.settings.account.addons.no_addons') %>
</em>
</div>
</div>
</div>
</div>
<div class="tab-pane tab-pane-settings" role="tabpanel"></div>
</div>

View file

@ -1282,6 +1282,7 @@ en:
navigation: navigation:
profile: "Profile" profile: "Profile"
preferences: "Preferences" preferences: "Preferences"
addons: "Add-ons"
preferences: preferences:
head_title: "Settings | My preferences" head_title: "Settings | My preferences"
edit: edit:
@ -1297,6 +1298,10 @@ en:
select_team: "Select team" select_team: "Select team"
tutorial_reset_flash: "Tutorial can now be repeated." tutorial_reset_flash: "Tutorial can now be repeated."
tutorial_reset_error: "Tutorial could not be repeated." tutorial_reset_error: "Tutorial could not be repeated."
addons:
head_title: "Settings | Add-ons"
title: "Add-ons"
no_addons: "You have no sciNote Add-ons."
teams: teams:
head_title: "Settings | Teams" head_title: "Settings | Teams"
breadcrumbs: breadcrumbs:

View file

@ -28,6 +28,9 @@ Rails.application.routes.draw do
get 'users/settings/account/preferences', get 'users/settings/account/preferences',
to: 'users/settings/account/preferences#index', to: 'users/settings/account/preferences#index',
as: 'preferences' as: 'preferences'
get 'users/settings/account/addons',
to: 'users/settings/account/addons#index',
as: 'addons'
put 'users/settings/account/preferences', put 'users/settings/account/preferences',
to: 'users/settings/account/preferences#update', to: 'users/settings/account/preferences#update',
as: 'update_preferences' as: 'update_preferences'