Merge branch 'edge' into edge

7 files changed, 12 insertions, 13 deletions

diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js
index 6d1f95d4..393f890b 100644
--- a/client/components/main/layouts.js
+++ b/client/components/main/layouts.js
@@ -7,7 +7,7 @@ const i18nTagToT9n = (i18nTag) => {
 };
 
 const validator = {
-  set: function(obj, prop, value) {
+  set(obj, prop, value) {
     if (prop === 'state' && value !== 'signIn') {
       $('.at-form-authentication').hide();
     } else if (prop === 'state' && value === 'signIn') {
@@ -17,7 +17,7 @@ const validator = {
     obj[prop] = value;
     // Indicate success
     return true;
-  }
+  },
 };
 
 Template.userFormsLayout.onRendered(() => {
@@ -82,7 +82,7 @@ Template.userFormsLayout.events({
     });
   },
   'click #at-btn'(event) {
-    /* All authentication method can be managed/called here. 
+    /* All authentication method can be managed/called here.
        !! DON'T FORGET to correctly fill the fields of the user during its creation if necessary authenticationMethod : String !!
     */
     const authenticationMethodSelected = $('.select-authentication').val();
diff --git a/client/components/rules/ruleDetails.jade b/client/components/rules/ruleDetails.jade
index 1f351357..7183cf96 100644
--- a/client/components/rules/ruleDetails.jade
+++ b/client/components/rules/ruleDetails.jade
@@ -17,6 +17,4 @@ template(name="ruleDetails")
     div.rules-back
         button.js-goback
           i.fa.fa-chevron-left
-          | {{{_ 'r-back'}}}
-    
-    
\ No newline at end of file
+          | {{{_ 'back'}}}
diff --git a/client/components/rules/rulesActions.jade b/client/components/rules/rulesActions.jade
index 4bcff769..3ac04e1c 100644
--- a/client/components/rules/rulesActions.jade
+++ b/client/components/rules/rulesActions.jade
@@ -26,4 +26,4 @@ template(name="rulesActions")
   div.rules-back
         button.js-goback
           i.fa.fa-chevron-left
-          | {{{_ 'r-back'}}}
\ No newline at end of file
+          | {{{_ 'back'}}}
diff --git a/client/components/rules/rulesTriggers.jade b/client/components/rules/rulesTriggers.jade
index 01c0cad5..79d9d98e 100644
--- a/client/components/rules/rulesTriggers.jade
+++ b/client/components/rules/rulesTriggers.jade
@@ -22,4 +22,4 @@ template(name="rulesTriggers")
   div.rules-back
         button.js-goback
           i.fa.fa-chevron-left
-          | {{{_ 'r-back'}}}
\ No newline at end of file
+          | {{{_ 'back'}}}
diff --git a/client/components/settings/connectionMethod.js b/client/components/settings/connectionMethod.js
index 3d5cfd76..9fe8f382 100644
--- a/client/components/settings/connectionMethod.js
+++ b/client/components/settings/connectionMethod.js
@@ -31,4 +31,4 @@ Template.connectionMethod.helpers({
   authentications() {
     return Template.instance().authenticationMethods.get();
   },
-});
\ No newline at end of file
+});
diff --git a/client/components/settings/peopleBody.js b/client/components/settings/peopleBody.js
index acc94081..a4d70974 100644
--- a/client/components/settings/peopleBody.js
+++ b/client/components/settings/peopleBody.js
@@ -67,12 +67,12 @@ Template.editUserPopup.onCreated(function() {
 
   Meteor.call('getAuthenticationsEnabled', (_, result) => {
     if (result) {
-      // TODO : add a management of different languages 
+      // TODO : add a management of different languages
       // (ex {value: ldap, text: TAPi18n.__('ldap', {}, T9n.getLanguage() || 'en')})
       this.authenticationMethods.set([
         {value: 'password'},
         // Gets only the authentication methods availables
-        ...Object.entries(result).filter(e => e[1]).map(e => ({value: e[0]})),
+        ...Object.entries(result).filter((e) => e[1]).map((e) => ({value: e[0]})),
       ]);
     }
   });
@@ -94,7 +94,7 @@ Template.editUserPopup.helpers({
     const userId = Template.instance().data.userId;
     const selected = Users.findOne(userId).authenticationMethod;
     return selected === 'ldap';
-  }
+  },
 });
 
 BlazeComponent.extendComponent({
@@ -131,7 +131,7 @@ Template.editUserPopup.events({
         'profile.fullname': fullname,
         'isAdmin': isAdmin === 'true',
         'loginDisabled': isActive === 'true',
-        'authenticationMethod': authentication
+        'authenticationMethod': authentication,
       },
     });
 
diff --git a/client/components/swimlanes/swimlanes.styl b/client/components/swimlanes/swimlanes.styl
index dce298b0..abcc90d4 100644
--- a/client/components/swimlanes/swimlanes.styl
+++ b/client/components/swimlanes/swimlanes.styl
@@ -32,6 +32,7 @@
     border-bottom: 1px solid #CCC
 
     .swimlane-header
+      -ms-writing-mode: tb-rl;
       writing-mode: vertical-rl;
       transform: rotate(180deg);
       font-size: 14px;