Skip to content
Snippets Groups Projects
Commit 42c3baee authored by Marcelo Schmidt's avatar Marcelo Schmidt
Browse files

Changed /usersettings to /account; fixed user language not being selected on... 

Changed /usersettings to /account; fixed user language not being selected on language selecion; fixed menu not closing on mobile after clicking a link. Closes #465
parent a481333b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 44 additions and 38 deletions
client/routes/router.coffee
+ 3
− 3
View file @ 42c3baee
...@@ -51,14 +51,14 @@ FlowRouter.route '/settings/:group?', ...@@ -51,14 +51,14 @@ FlowRouter.route '/settings/:group?',
action: -> action: ->
BlazeLayout.render 'main', {center: 'settings'} BlazeLayout.render 'main', {center: 'settings'}
FlowRouter.route '/usersettings/:group?', FlowRouter.route '/account/:group?',
name: 'userSettings' name: 'account'
action: (params) -> action: (params) ->
unless params.group unless params.group
params.group = 'Profile' params.group = 'Profile'
params.group = _.capitalize params.group, true params.group = _.capitalize params.group, true
BlazeLayout.render 'main', { center: "userSettings#{params.group}" } BlazeLayout.render 'main', { center: "account#{params.group}" }
FlowRouter.route '/history/private', FlowRouter.route '/history/private',
name: 'privateHistory' name: 'privateHistory'
......
client/views/usersettings/userSettings.coffee → client/views/account/account.coffee
+ 3
− 3
View file @ 42c3baee
Template.userSettings.helpers Template.account.helpers
flexOpened: -> flexOpened: ->
return 'opened' if Session.equals('flexOpened', true) return 'opened' if Session.equals('flexOpened', true)
arrowPosition: -> arrowPosition: ->
console.log 'room.helpers arrowPosition' if window.rocketDebug console.log 'room.helpers arrowPosition' if window.rocketDebug
return 'left' unless Session.equals('flexOpened', true) return 'left' unless Session.equals('flexOpened', true)
Template.userSettings.onRendered -> Template.account.onRendered ->
Tracker.afterFlush -> Tracker.afterFlush ->
SideNav.setFlex "userSettingsFlex" SideNav.setFlex "accountFlex"
SideNav.openFlex() SideNav.openFlex()
client/views/usersettings/userSettings.html → client/views/account/account.html
+ 1
− 1
View file @ 42c3baee
<template name="userSettings"> <template name="account">
<section class="page-container page-home page-static"> <section class="page-container page-home page-static">
<head class="fixed-title"> <head class="fixed-title">
{{> burger}} {{> burger}}
......
client/views/usersettings/userSettingsFlex.coffee → client/views/account/accountFlex.coffee
+ 4
− 1
View file @ 42c3baee
Template.userSettingsFlex.events Template.accountFlex.events
'mouseenter header': -> 'mouseenter header': ->
SideNav.overArrow() SideNav.overArrow()
...@@ -10,3 +10,6 @@ Template.userSettingsFlex.events ...@@ -10,3 +10,6 @@ Template.userSettingsFlex.events
'click .cancel-settings': -> 'click .cancel-settings': ->
SideNav.closeFlex() SideNav.closeFlex()
'click .account-link': ->
menu.close()
client/views/account/accountFlex.html 0 → 100644
+ 19
− 0
View file @ 42c3baee
<template name="accountFlex">
<header>
<div>
<h4>{{_ "My_Account"}}</h4>
</div>
</header>
<div class="content">
<div class="wrapper">
<ul>
<li>
<a href="{{pathFor 'account' group='profile'}}" class="account-link">{{_ "Profile"}}</a>
{{!-- <a href="{{pathFor 'account' group='account'}}" class="account-link">{{_ "Account_Settings"}}</a> --}}
{{!-- <a href="{{pathFor 'account' group='notification'}}" class="account-link">{{_ "Notification"}}</a> --}}
<a href="{{pathFor 'changeAvatar'}}" class="account-link">{{_ "Change_avatar"}}</a> {{!-- move this to profile --}}
</li>
</ul>
</div>
</div>
</template>
client/views/usersettings/userSettingsProfile.coffee → client/views/account/accountProfile.coffee
+ 6
− 6
View file @ 42c3baee
Template.userSettingsProfile.helpers Template.accountProfile.helpers
flexOpened: -> flexOpened: ->
return 'opened' if Session.equals('flexOpened', true) return 'opened' if Session.equals('flexOpened', true)
arrowPosition: -> arrowPosition: ->
...@@ -12,9 +12,9 @@ Template.userSettingsProfile.helpers ...@@ -12,9 +12,9 @@ Template.userSettingsProfile.helpers
return _.sortBy(result, 'key') return _.sortBy(result, 'key')
userLanguage: (key) -> userLanguage: (key) ->
return localStorage.getItem('userLanguage')?.split('-').shift().toLowerCase() is key return (localStorage.getItem('userLanguage') or defaultUserLanguage())?.split('-').shift().toLowerCase() is key
Template.userSettingsProfile.onCreated -> Template.accountProfile.onCreated ->
settingsTemplate = this.parentTemplate(3) settingsTemplate = this.parentTemplate(3)
settingsTemplate.child ?= [] settingsTemplate.child ?= []
settingsTemplate.child.push this settingsTemplate.child.push this
...@@ -49,11 +49,11 @@ Template.userSettingsProfile.onCreated -> ...@@ -49,11 +49,11 @@ Template.userSettingsProfile.onCreated ->
if error if error
toastr.error error.reason toastr.error error.reason
Template.userSettingsProfile.onRendered -> Template.accountProfile.onRendered ->
Tracker.afterFlush -> Tracker.afterFlush ->
SideNav.setFlex "userSettingsFlex" SideNav.setFlex "accountFlex"
SideNav.openFlex() SideNav.openFlex()
Template.userSettingsProfile.events Template.accountProfile.events
'click .submit button': (e, t) -> 'click .submit button': (e, t) ->
t.save() t.save()
client/views/usersettings/userSettingsProfile.html → client/views/account/accountProfile.html
+ 1
− 1
View file @ 42c3baee
<template name="userSettingsProfile"> <template name="accountProfile">
<section class="page-container page-home page-static"> <section class="page-container page-home page-static">
<head class="fixed-title"> <head class="fixed-title">
{{> burger}} {{> burger}}
......
client/views/usersettings/avatar/prompt.coffee → client/views/account/avatar/prompt.coffee
+ 1
− 1
View file @ 42c3baee
...@@ -14,7 +14,7 @@ Template.avatarPrompt.onCreated -> ...@@ -14,7 +14,7 @@ Template.avatarPrompt.onCreated ->
Template.avatarPrompt.onRendered -> Template.avatarPrompt.onRendered ->
Tracker.afterFlush -> Tracker.afterFlush ->
SideNav.setFlex "userSettingsFlex" SideNav.setFlex "accountFlex"
SideNav.openFlex() SideNav.openFlex()
Template.avatarPrompt.helpers Template.avatarPrompt.helpers
......
client/views/app/sideNav/userStatus.coffee
+ 5
− 2
View file @ 42c3baee
...@@ -36,9 +36,12 @@ Template.userStatus.events ...@@ -36,9 +36,12 @@ Template.userStatus.events
FlowRouter.go 'changeAvatar' FlowRouter.go 'changeAvatar'
'click #settings': (event) -> 'click #settings': (event) ->
SideNav.setFlex "userSettingsFlex" SideNav.setFlex "accountFlex"
SideNav.openFlex() SideNav.openFlex()
FlowRouter.go 'userSettings' FlowRouter.go 'account'
'click .account-link': ->
menu.close()
Template.userStatus.rendered = -> Template.userStatus.rendered = ->
AccountBox.init() AccountBox.init()
client/views/app/sideNav/userStatus.html
+ 1
− 1
View file @ 42c3baee
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<a href="" data-status="away" class="status away"><span>{{_ "Away" context="male"}}</span></a> <a href="" data-status="away" class="status away"><span>{{_ "Away" context="male"}}</span></a>
<a href="" data-status="busy" class="status busy"><span>{{_ "Busy" context="male"}}</span></a> <a href="" data-status="busy" class="status busy"><span>{{_ "Busy" context="male"}}</span></a>
<a href="" data-status="offline" class="status offline"><span>{{_ "Invisible"}}</span></a> <a href="" data-status="offline" class="status offline"><span>{{_ "Invisible"}}</span></a>
<a href="" id="settings"><i class="icon-sliders"></i><span>{{_ "My_Account"}}</span></a> <a href="" id="settings" class='account-link'><i class="icon-sliders"></i><span>{{_ "My_Account"}}</span></a>
<a href="" id="logout"><i class="icon-logout"></i><span>{{_ "Logout"}}</span></a> <a href="" id="logout"><i class="icon-logout"></i><span>{{_ "Logout"}}</span></a>
</div> </div>
</nav> </nav>
......
client/views/usersettings/userSettingsFlex.html deleted 100644 → 0
+ 0
− 19
View file @ a481333b
<template name="userSettingsFlex">
<header>
<div>
<h4>{{_ "My_Account"}}</h4>
</div>
</header>
<div class="content">
<div class="wrapper">
<ul>
<li>
<a href="{{pathFor 'userSettings' group='profile'}}">{{_ "Profile"}}</a>
{{!-- <a href="{{pathFor 'userSettings' group='account'}}">{{_ "Account_Settings"}}</a> --}}
{{!-- <a href="{{pathFor 'userSettings' group='notification'}}">{{_ "Notification"}}</a> --}}
<a href="{{pathFor 'changeAvatar'}}">{{_ "Change_avatar"}}</a> {{!-- move this to profile --}}
</li>
</ul>
</div>
</div>
</template>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment