User settings dynamic templates

d20c9eac · Marcelo Schmidt · 386802e2 · d20c9eac · d20c9eac · d20c9eac
Commit d20c9eac authored 9 years ago by Marcelo Schmidt
--- a/client/routes/router.coffee
+++ b/client/routes/router.coffee
@@ -51,7 +51,10 @@ FlowRouter.route '/usersettings/:group?',
 	name: 'userSettings'

 	action: (params) ->
-		BlazeLayout.render 'main', {center: 'userSettings'}
+		unless params.group
+			params.group = 'Profile'
+		params.group = _.capitalize params.group, true
+		BlazeLayout.render 'main', { center: 'userSettings', settings: "userSettings#{params.group}" }

 FlowRouter.route '/history/private',
 	name: 'privateHistory'

--- a/client/views/usersettings/userSettings.coffee
+++ b/client/views/usersettings/userSettings.coffee
@@ -9,3 +9,7 @@ Template.userSettings.onRendered ->
 	Tracker.afterFlush ->
 		SideNav.setFlex "userSettingsFlex"
 		SideNav.openFlex()
+
+Template.userSettings.events
+	'click .submit button': ->
+		console.log 'submit button clicked'
\ No newline at end of file
--- a/client/views/usersettings/userSettings.html
+++ b/client/views/usersettings/userSettings.html
@@ -12,7 +12,7 @@
 				<h3>{{description}}</h3>
 			</div>
 			<div class="rocket-form">
-				
+				{{> Template.dynamic template=settings}}
 				<div class="submit">
 					<button class="button"><i class="icon-send"></i><span>{{_ "Save_changes"}}</span></button>
 				</div>

--- a/client/views/usersettings/userSettingsFlex.html
+++ b/client/views/usersettings/userSettingsFlex.html
@@ -8,7 +8,7 @@
 		<div class="wrapper">
 			<ul>
 				<li>
-					<a href="{{pathFor 'userSettings' group='general'}}">{{_ "General"}}</a>
+					<a href="{{pathFor 'userSettings' group='profile'}}">{{_ "Profile"}}</a>
 					<a href="{{pathFor 'changeAvatar'}}">{{_ "Change_avatar"}}</a>
 				</li>
 			</ul>

--- a/client/views/usersettings/userSettingsGeneral.html
+++ b/client/views/usersettings/userSettingsGeneral.html
-<template name="userSettings-general">
-	<section class="page-container page-home page-static">
-		<head class="fixed-title">
-			{{> burger}}
-			<h2>
-				<span class="room-title">{{_ "General"}}</span>
-			</h2>
-		</head>
-		<div class="content">
-			<div class="info">
-				<h3>{{_ "General"}}</h3>
-				<h3>{{_ "General"}}</h3>
-			</div>
-			<div class="rocket-form">
-				<fieldset>
-					
-				</fieldset>
-				<div class="submit">
-					<button class="button"><i class="icon-send"></i><span>{{_ "Save_changes"}}</span></button>
-				</div>
-			</div>
-		</div>
-	</section>
-</template>
\ No newline at end of file
--- a/client/views/app/sideNav/userSettingsFlex2.coffee
+++ b/client/views/app/sideNav/userSettingsFlex2.coffee
-Template.userSettingsFlex2.helpers
+Template.userSettingsProfile.helpers
 	languages: ->
 		languages = TAPi18n.getLanguages()
 		result = []
@@ -9,39 +9,12 @@ Template.userSettingsFlex2.helpers
 	userLanguage: (key) ->
 		return localStorage.getItem('userLanguage')?.split('-').shift().toLowerCase() is key

-Template.userSettingsFlex2.events
-	'mouseenter header': ->
-		SideNav.overArrow()
-
-	'mouseleave header': ->
-		SideNav.leaveArrow()
-
-	'click header': ->
-		SideNav.closeFlex()
-
-	'click .cancel-settings': ->
-		SideNav.closeFlex()
-
-	'click .input-submit .save': (e, instance) ->
-		selectedLanguage = $('#language').val()
-		if localStorage.getItem('userLanguage') isnt selectedLanguage
-			localStorage.setItem 'userLanguage', selectedLanguage
-			Meteor._reload.reload()
-
-		if $('#password').val()
-			Meteor.call 'setPassword', $('#password').val(), (err, results) ->
-				if results 
-					toastr.success t('Password_changed_successfully')
-				if err
-					toastr.error error.reason
-
-
-		SideNav.closeFlex()
-		instance.clearForm()
-
-Template.userSettingsFlex2.onCreated ->
+Template.userSettingsProfile.onCreated ->
 	instance = this
 	
 	@clearForm = ->
 		instance.find('#language').value = localStorage.getItem('userLanguage')
 		instance.find('#password').value = ''
+
+	@save = ->
+		console.log 'Save called'
\ No newline at end of file
--- a/client/views/usersettings/userSettingsProfile.html
+++ b/client/views/usersettings/userSettingsProfile.html
+<template name="userSettingsProfile">
+	<fieldset>
+		<div class="input-line">
+			<label for="language">{{_ "Language"}}</label>
+			<div>
+				<select id="language" class="required">
+					{{#each languages}}
+					<option value="{{key}}" selected="{{userLanguage key}}" dir="auto">{{name}}</option>
+					{{/each}}
+				</select>
+			</div>
+		</div>
+		<div class="input-line">
+			<label for="password">{{_ "Password"}}</label>
+			<div>
+				<input type="password" name="password" id="password" />
+			</div>
+		</div>
+	</fieldset>
+</template>
\ No newline at end of file