diff --git a/app/helpers/sidemenu_helper.rb b/app/helpers/sidemenu_helper.rb index 2a49028..5b43fdd 100644 --- a/app/helpers/sidemenu_helper.rb +++ b/app/helpers/sidemenu_helper.rb @@ -3,12 +3,15 @@ # Module for building side menu module SidemenuHelper def build_side_menu - ret = nav_link('Home', '/', 'home', 'fa-home') + ret = nav_link('home', '/', 'home', 'fa-home') ret += divider ret += heading('Admin') - submenu = ['other components:', ['Zarządzanie', '/admin/users', 'admin/users'], - ['Cards', '/home/index', 'home']] - ret += nav_link_submenu(['Użytkownicy', 'fa-users', 'Users'], + submenu = ['users.user_management', + ['users.accounts', '/admin/users', 'admin/users', 'fa-user-circle'], + 'users.finance', + ['users.orders', '/home/index', 'home', 'fa-file-alt'], + ['users.discount_codes', '/home/index', 'home', 'fa-search-dollar']] + ret += nav_link_submenu(['users.menu_name', 'fa-users', 'Users'], submenu, ['admin/users', 'home']) ret.html_safe @@ -36,10 +39,10 @@ module SidemenuHelper def nav_link_to(text, icon, link, name = nil, expand = nil) icon_text = icon.nil? ? '' : "" if name.nil? - link_to(raw("#{icon_text}#{text}"), + link_to(raw("#{icon_text}#{I18n.t(text)}"), link, class: 'nav-link') else - link_to(raw("#{icon_text}#{text}"), + link_to(raw("#{icon_text}#{I18n.t(text)}"), link, class: "nav-link#{expand ? '' : ' collapsed'}", data: { toggle: 'collapse', target: "#collapse#{name}" }, aria: { expanded: "#{expand}", controls: "collapse#{name}" }) @@ -89,11 +92,13 @@ module SidemenuHelper tag.div class: 'collapse-divider' elsif sub.class.to_s == 'String' # header - content_tag :h6, sub, class: 'collapse-header' + content_tag :h6, I18n.t(sub), class: 'collapse-header' elsif sub.class.to_s == 'Array' # link (menu item) activecl = check_link_active(sub[2]) ? ' active' : '' - link_to(sub[0], sub[1], class: "collapse-item#{activecl}") + icon = sub[3].nil? ? '' : "" + nm = I18n.t(sub[0]) + link_to(raw("#{icon} #{nm}"), sub[1], class: "collapse-item#{activecl}") end end diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index 3fd8f00..34a272e 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -5,9 +5,20 @@

Responsive 16:9 Vimeo

-
- +
+
+ 1 of 3 +
+
+
+ +
+
+
+ 3 of 3 +
+
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index bb5f543..7179778 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -176,7 +176,7 @@ Devise.setup do |config| # ==> Configuration for :timeoutable # The time you want to timeout the user session without activity. After this # time the user will be asked for credentials again. Default is 30 minutes. - # config.timeout_in = 30.minutes + config.timeout_in = 10.hours # ==> Configuration for :lockable # Defines which strategy will be used to lock an account. @@ -196,7 +196,7 @@ Devise.setup do |config| # Number of authentication tries before locking an account if lock_strategy # is failed attempts. - # config.maximum_attempts = 20 + config.maximum_attempts = 10 # Time interval to unlock the account if :time is enabled as unlock_strategy. # config.unlock_in = 1.hour diff --git a/config/locales/pl/menu.yml b/config/locales/pl/menu.yml new file mode 100644 index 0000000..e695641 --- /dev/null +++ b/config/locales/pl/menu.yml @@ -0,0 +1,13 @@ +pl: + home: 'Home' + users: + menu_name: 'Użytkownicy' + user_management: 'Zarządzanie' + accounts: 'Konta' + finance: 'Finanse' + orders: 'Zamówienia' + discount_codes: 'Kody Rabatowe' + admin: 'Admin' + settings: 'Ustawienia' + configuration: 'Konfiguracja' + placeholder: 'plac'