From 7c735a5de2fd7f559e11281a3b53518c76e3d074 Mon Sep 17 00:00:00 2001
From: Vincent Widmer <eodecorp@hotmail.com>
Date: Sun, 21 Jul 2019 09:14:47 +0200
Subject: [PATCH] Minor changes

- Add input focus for author login
- Change mail sending to HTML
- Change space name max length to 35
- Add favicon
- Change version number
---
 .../templates/account/reset-password.html     | 31 ++++++++++---------
 .../templates/account/reset-password.js       |  7 +++++
 .../templates/admin/admin_space_submit.js     |  2 +-
 .../templates/headers/space_header.html       |  4 +--
 .../templates/headers/users_header.html       |  6 ++--
 .../templates/space/home/home_post_edit.html  |  2 +-
 .../space/settings/general_settings.js        |  4 +--
 src/client/templates/space/space_sidebar.html |  1 +
 src/client/templates/space/space_submit.js    |  2 +-
 src/client/templates/space/space_users.html   |  4 +--
 .../space/space_users_first_connection.html   |  2 +-
 .../space/space_users_first_connection.js     |  9 +++++-
 src/lib/collections/authors.js                |  8 ++++-
 src/lib/collections/posts.js                  |  4 +++
 src/lib/i18n/en.i18n.json                     |  1 +
 src/lib/i18n/fr-FR.i18n.json                  |  1 +
 src/main.html                                 |  1 +
 src/private/version.json                      |  2 +-
 src/server/methods.js                         | 12 +++----
 19 files changed, 67 insertions(+), 36 deletions(-)

diff --git a/src/client/templates/account/reset-password.html b/src/client/templates/account/reset-password.html
index a1aa439..a5f6a0b 100644
--- a/src/client/templates/account/reset-password.html
+++ b/src/client/templates/account/reset-password.html
@@ -1,19 +1,22 @@
 <template name="resetPassword">
     <div class="reset-password">
-        <div class="page-title">{{_ 'reset-password--page-title'}}</div>
-        <form id="login--form" class="login--form">        
-            <div class="login--wrapper">
-                <label><b>{{_ 'reset-password--new-password'}}</b></label><br />
-                <input type="password" name="" class="form-control" id="password" value=""><br />
-            </div> 
-            <div class="login--button-wrapper">
-                <button type="submit" class="button button-primary reset-password--button-submit">{{_ 'reset-password--button-submit'}}</button>
-            </div>   
-        </form>
-        <div class="login--register-link-wrapper">
-            <span>{{_ 'login--register'}}<br /><br />
-                <a href="{{pathFor 'register'}}"> {{_ 'login--register-link'}}</a> !
-            </span>
+        <div class="container">
+            <div class="row justify-content-center">
+                <div class="col-sm-12 col-lg-8 pt-4 pl-4 pr-4 pb-3 text-center">
+                    <h1 class="mb-5">{{_ 'reset-password--page-title'}}</h1>
+                    <div class="text-justify">
+                       <form id="login--form" class="login--form">        
+                            <div class="login--wrapper">
+                                <label><b>{{_ 'reset-password--new-password'}}</b></label><br />
+                                <input type="password" name="" class="form-control" id="password" value=""><br />
+                            </div> 
+                            <div class="login--button-wrapper">
+                                <button type="button" class="btn btn-primary w-100 reset-password--button-submit">{{_ 'reset-password--button-submit'}}</button>
+                            </div>   
+                        </form>                 
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
 </template>
\ No newline at end of file
diff --git a/src/client/templates/account/reset-password.js b/src/client/templates/account/reset-password.js
index 9d348ac..2b03874 100644
--- a/src/client/templates/account/reset-password.js
+++ b/src/client/templates/account/reset-password.js
@@ -1,3 +1,10 @@
+Template.resetPassword.onRendered(function () {
+
+    // Enable autofocus
+    $('#password').focus();
+});
+
+
 Template.resetPassword.events({
     
     'submit form': function(e) {
diff --git a/src/client/templates/admin/admin_space_submit.js b/src/client/templates/admin/admin_space_submit.js
index 1ed8ccc..a6efd40 100644
--- a/src/client/templates/admin/admin_space_submit.js
+++ b/src/client/templates/admin/admin_space_submit.js
@@ -5,7 +5,7 @@ Template.adminSpaceSubmit.onRendered(function () {
             "spaceName": {
                 required: true,
                 minlength: 3,
-                maxlength: 20
+                maxlength: 35
             }
         }
     }); 
diff --git a/src/client/templates/headers/space_header.html b/src/client/templates/headers/space_header.html
index 03b7d44..1ef0191 100644
--- a/src/client/templates/headers/space_header.html
+++ b/src/client/templates/headers/space_header.html
@@ -2,7 +2,7 @@
 	<nav class="bg-white" style="z-index:500;height:52px;line-height:52px;border-bottom:solid 1px #efefef;">
 		<div class="container h-100">
 			<div class="row justify-content-center h-100">
-				<div class="col-4 col-lg-3" style="">
+				<div class="col-4 col-lg-4" style="">
 					<a role="button" id="sidebarCollapse" class="btn-icon d-inline d-lg-none">
                     	<i class="fas fa-bars fa-lg d-inline"></i>
                 	</a>
@@ -11,7 +11,7 @@
 					</a>
 					<span class="d-none d-sm-none d-lg-inline">{{space.title}}</span>
 				</div>
-				<div class="col-8 text-right">
+				<div class="col-8 col-lg-7 text-right">
 					{{#if ownSpace}}
 						<a href="{{pathFor 'userSettings'}}" class="px-3 mr-4">
 							<i class="fa fa-user fa-fw"></i> 
diff --git a/src/client/templates/headers/users_header.html b/src/client/templates/headers/users_header.html
index 0bf7897..adb0ada 100644
--- a/src/client/templates/headers/users_header.html
+++ b/src/client/templates/headers/users_header.html
@@ -1,10 +1,10 @@
 <template name="usersHeader">	
 	<nav class="bg-white" style="z-index:500;height:52px;line-height:52px;border-bottom:solid 1px #efefef;">
 		<div class="container h-100">
-			<div class="row justify-content-center">
+			<div class="row justify-content-center h-100">
 				<div class="col-6" style="">
-					<a class="navbar-brand menu-item" data-id="1" href="#">
-						<img alt="logo" height="55" src="/img/logo_black.svg">
+					<a class="menu-item h-100" href="#">
+						<img alt="logo" style="height: 55px; padding: 0px 10px 5px 0;" src="/img/logo_black.svg">
 					</a>
 					<span>{{space.title}}</span>
 				</div>
diff --git a/src/client/templates/space/home/home_post_edit.html b/src/client/templates/space/home/home_post_edit.html
index e078fd1..a74dffa 100644
--- a/src/client/templates/space/home/home_post_edit.html
+++ b/src/client/templates/space/home/home_post_edit.html
@@ -12,7 +12,7 @@ <h5 class="modal-title" id="exampleModalLabel">{{_ 'home-post-edit--title'}}</h5
       	<form name="home-post-edit--form" id="home-post-edit--form">
 
        	<div class="form-group">
-       		    <input type="text" class="form-control" name="title" id="title" aria-describedby="title" placeholder="Title of the section" value="{{post.title}}"></div>
+       		    <input type="text" class="form-control" name="title" id="title" aria-describedby="title" placeholder="{{_ 'home-post-submit--placeholder'}}" value="{{post.title}}"></div>
        		           	<div class="form-group">
 
 				<textarea name="body" id="body-edit-tinymce" class="form-control home-post-edit--textarea" placeholder="" aria-label="" aria-describedby="basic-addon2">{{post.body}}</textarea>
diff --git a/src/client/templates/space/settings/general_settings.js b/src/client/templates/space/settings/general_settings.js
index b279d15..058c85a 100644
--- a/src/client/templates/space/settings/general_settings.js
+++ b/src/client/templates/space/settings/general_settings.js
@@ -46,8 +46,8 @@ Template.generalSettings.events({
 
 		var newName = prompt(TAPi18n.__('space-edit--rename-space-message')+" :", this.space.title);
 		if (newName && newName != currentSpaceName && newName !="") {
-			if (newName.length < 4 || newName.length > 19) {
-				alert("The name must be at least 3 characters and at most 20");
+			if (newName.length < 4 || newName.length > 35) {
+				alert("The name must be at least 3 characters and at most 35");
 			}
 			else {
 				var spaceProperties = {
diff --git a/src/client/templates/space/space_sidebar.html b/src/client/templates/space/space_sidebar.html
index 5aebe4e..b30bb76 100644
--- a/src/client/templates/space/space_sidebar.html
+++ b/src/client/templates/space/space_sidebar.html
@@ -1,6 +1,7 @@
 <template name="spaceSidebar">
 	<div class="bg-beekee pt-5 d-lg-none">
 		<img style="height: 80px;" class="pl-2 pb-2 mt-3" alt="logo" src="/img/logo_white.svg">
+		<div class="pl-2 pb-2 small">{{space.title}}</div>
 	</div>
 	<ul class="sidebar nav flex-column align-items-start justify-content-between">
 		<li class="nav-item sidebar-item {{selectedMenuItemBg 1}}">
diff --git a/src/client/templates/space/space_submit.js b/src/client/templates/space/space_submit.js
index d4c80ea..34fc187 100644
--- a/src/client/templates/space/space_submit.js
+++ b/src/client/templates/space/space_submit.js
@@ -5,7 +5,7 @@ Template.spaceSubmit.onRendered(function () {
             "spaceName": {
                 required: true,
                 minlength: 3,
-                maxlength: 20
+                maxlength: 35
             }
         }
     }); 
diff --git a/src/client/templates/space/space_users.html b/src/client/templates/space/space_users.html
index ad7c2b6..f41599b 100644
--- a/src/client/templates/space/space_users.html
+++ b/src/client/templates/space/space_users.html
@@ -13,8 +13,8 @@ <h4>{{_ 'space-users--page-title'}}</h4>
 	    						<div class="text-secondary">{{numChars}}/15</div>
 	  						</div>
 	  						<div class="text-right">
-	  	    	    			<a href="{{pathFor 'space' _id=this.space._id}}" role="button" class="btn btn-secondary">Cancel</a>
-	  	    	  				<a href="#" role="button" class="btn btn-primary space-users--button-submit-author">Change</a>
+	  	    	    			<a href="{{pathFor 'space' _id=this.space._id}}" role="button" class="btn btn-secondary">{{_ 'modal--cancel'}}</a>
+	  	    	  				<a href="#" role="button" class="btn btn-primary space-users--button-submit-author">{{_ 'modal--submit'}}</a>
 							</div>
 						</form>
 					</div>
diff --git a/src/client/templates/space/space_users_first_connection.html b/src/client/templates/space/space_users_first_connection.html
index b9f901f..307f76a 100644
--- a/src/client/templates/space/space_users_first_connection.html
+++ b/src/client/templates/space/space_users_first_connection.html
@@ -9,7 +9,7 @@ <h4>{{_ 'space-users-first-connection--page-title'}}</h4>
 						<p class="text-secondary">{{_ 'space-users--page-description'}}</p>
 						<form id="space-users--form" name="space-users--form">
 	 						<div class="form-group">
-	    						<input type="text" class="form-control" id="space-users--input" aria-describedby="emailHelp" placeholder="{{_ 'space-users--input-choose-author-placeholder'}}">
+	    						<input type="text" class="form-control" id="space-users-first-connection--author-name" aria-describedby="emailHelp" placeholder="{{_ 'space-users--input-choose-author-placeholder'}}">
 	  						</div>
 	  						<div class="text-right">
 	  	    	    			<a href="{{pathFor 'indexStudent'}}" role="button" class="btn btn-secondary">Cancel</a>
diff --git a/src/client/templates/space/space_users_first_connection.js b/src/client/templates/space/space_users_first_connection.js
index 9bafa99..6bb6431 100644
--- a/src/client/templates/space/space_users_first_connection.js
+++ b/src/client/templates/space/space_users_first_connection.js
@@ -1,9 +1,16 @@
+Template.spaceUsersFirstConnection.onRendered(function () {
+
+    // Enable autofocus
+	$('#space-users-first-connection--author-name').focus();
+});
+
+
 Template.spaceUsersFirstConnection.events({
 	
 	'submit form': function(event, template) {
 		event.preventDefault();
 
-		var authorName = $('#space-users--input').val().trim();
+		var authorName = $('#space-users-first-connection--author-name').val().trim();
 
 		if (authorName != "") {
 			if (Authors.findOne({name:authorName})) {
diff --git a/src/lib/collections/authors.js b/src/lib/collections/authors.js
index 527f9dd..658f73d 100644
--- a/src/lib/collections/authors.js
+++ b/src/lib/collections/authors.js
@@ -14,7 +14,13 @@ Authors.allow({
 Meteor.methods({
 
 	authorInsert: function(name, spaceId) {
-		Authors.insert({name: name, spaceId: spaceId, nRefs: 0});
+		Authors.insert({name: name, spaceId: spaceId, nRefs: 0},function(error) {
+			if (error) {
+				console.log("Error when inserting author  : "+error.message);
+			} else {
+				console.log("Author inserted");
+			}
+		});
 	},
 	authorEdit: function(spaceId, oldName, newName) {
 		var author = Authors.findOne({name: oldName, spaceId: spaceId});
diff --git a/src/lib/collections/posts.js b/src/lib/collections/posts.js
index f1b3327..9cd5b36 100644
--- a/src/lib/collections/posts.js
+++ b/src/lib/collections/posts.js
@@ -166,6 +166,10 @@ Meteor.methods({
 			// postFromCloud: postFromCloud // Workaround bug sync
 		});
 
+		// Get client IP address
+		if (Meteor.isServer)
+			post = _.extend(postAttributes, {clientIP: this.connection.clientAddress});
+
 		var space = Spaces.findOne(postAttributes.spaceId);
 
 		category = Categories.findOne({spaceId: postAttributes.spaceId, name: postAttributes.category}); // Increment category nRefs
diff --git a/src/lib/i18n/en.i18n.json b/src/lib/i18n/en.i18n.json
index 5dadf81..5e8ba16 100644
--- a/src/lib/i18n/en.i18n.json
+++ b/src/lib/i18n/en.i18n.json
@@ -214,6 +214,7 @@
 	"home-post-submit--placeholder":"Title of the section",
 	"home-post-submit--confirm-toast":"The new section has been added.",
 	"modal--close":"Close",
+	"modal--cancel":"Cancel",
 	"modal--delete":"Delete",
 	"modal--submit":"Submit",
 	"modal--save":"Save changes",
diff --git a/src/lib/i18n/fr-FR.i18n.json b/src/lib/i18n/fr-FR.i18n.json
index 11b825c..794eb8d 100644
--- a/src/lib/i18n/fr-FR.i18n.json
+++ b/src/lib/i18n/fr-FR.i18n.json
@@ -210,6 +210,7 @@
 	"home-post-delete--title":"Supprimer cette section",
 	"home-post-delete--confirm":"Supprimer cette section ?",
 	"modal--close":"Fermer",
+	"modal--cancel":"Annuler",
 	"modal--delete":"Supprimer",
 	"modal--save":"Sauver les changements",
 	"modal--submit":"Soumettre",
diff --git a/src/main.html b/src/main.html
index 69f84af..5c56242 100644
--- a/src/main.html
+++ b/src/main.html
@@ -9,4 +9,5 @@
 	<meta name="google-site-verification" content="YxY2zGSnW7iGyAkXqQjh21ZrI9CTQhOFUztqlrbDeY4" />
 	<link rel="stylesheet" href="/fonts/font-awesome/css/fontawesome-all.min.css">
 	<link rel="stylesheet" href="/fonts/ionicons/css/ionicons.min.css">
+	<link rel="shortcut icon" type="image/ico" href="/img/favicon.png" />
 </head>
\ No newline at end of file
diff --git a/src/private/version.json b/src/private/version.json
index a9dffac..efc4cbd 100644
--- a/src/private/version.json
+++ b/src/private/version.json
@@ -1,3 +1,3 @@
 {
-  "version": "1.29"
+  "version": "1.3"
 }
diff --git a/src/server/methods.js b/src/server/methods.js
index 427f0eb..6ee2927 100644
--- a/src/server/methods.js
+++ b/src/server/methods.js
@@ -3,22 +3,22 @@ Meteor.startup(function() {
 
 	// ###  Mail configuration  ###
 	process.env.MAIL_URL = 'smtp://'+Meteor.settings.mailAddress+':'+Meteor.settings.mailPassword+'@'+Meteor.settings.mailServer;          
-	Accounts.emailTemplates.from = "beekee.ch <vincent.widmer@beekee.ch>";
+	Accounts.emailTemplates.from = "Beekee Live <vincent.widmer@beekee.ch>";
 
 	// Reset Password mail configuration
 	Accounts.emailTemplates.resetPassword.text = function (user, url) {
- 		return "Hi, \n\n You recently requested to reset your password for your Beekee account.\n\n Click the link below to reset it. : \n"
+ 		return "Hi, \n\n You recently requested to reset your password for your Beekee Live account.\n\n Click the link below to reset it. : \n"
 		+ url
 		+ "\n\n If you did not requested a password reset, please ignore this email."
 		+ "\n\n Thanks,"
-		+ "\n\n Beekee Team";
+		+ "\n\n Beekee Live Team";
 	};
 	Accounts.emailTemplates.resetPassword.subject = function () {
- 		return "Reset your Beekee password";
+ 		return "Reset your Beekee Live password";
 	};
 
 	Accounts.urls.resetPassword = function(token) {
-		return 'http://web.beekee.ch/reset-password/' + token;
+		return 'http://live.beekee.ch/reset-password/' + token;
 	};
 });
 
@@ -37,7 +37,7 @@ Meteor.methods({
 			to: to,
 			from: from,
 			subject: subject,
-			text: text
+			html: text
 		});
 	},
 	'adminSetNewPassword': function(adminId, userId, newPassword) { // Admin can forcibly change the password for a user