complete features-tour for settings page

app/assets/javascripts/controllers/admin/settings.js.erb

@@ -330,10 +330,18 @@ Application.Controllers.controller('SettingsController', ['$scope', '$rootScope'
         placement: 'bottom',
         orphan: true
       });
+      uitour.createStep({
+        selector: '.admin-settings .general-page-tab',
+        stepId: 'general',
+        order: 1,
+        title: _t('app.admin.tour.settings.general.title'),
+        content: _t('app.admin.tour.settings.general.content'),
+        placement: 'bottom',
+      });
       uitour.createStep({
         selector: '.admin-settings .home-page-content h4',
         stepId: 'home',
-        order: 1,
+        order: 2,
         title: _t('app.admin.tour.settings.home.title'),
         content: _t('app.admin.tour.settings.home.content'),
         placement: 'bottom'
@@ -341,7 +349,7 @@ Application.Controllers.controller('SettingsController', ['$scope', '$rootScope'
       uitour.createStep({
         selector: '.admin-settings .home-page-content .note-toolbar .note-insert div',
         stepId: 'components',
-        order: 2,
+        order: 3,
         title: _t('app.admin.tour.settings.components.title'),
         content: _t('app.admin.tour.settings.components.content'),
         placement: 'bottom'
@@ -349,7 +357,7 @@ Application.Controllers.controller('SettingsController', ['$scope', '$rootScope'
       uitour.createStep({
         selector: '.admin-settings .home-page-content .note-toolbar .btn-codeview',
         stepId: 'codeview',
-        order: 3,
+        order: 4,
         title: _t('app.admin.tour.settings.codeview.title'),
         content: _t('app.admin.tour.settings.codeview.content'),
         placement: 'bottom'
@@ -357,7 +365,7 @@ Application.Controllers.controller('SettingsController', ['$scope', '$rootScope'
       uitour.createStep({
         selector: '.admin-settings .reset-button',
         stepId: 'reset',
-        order: 4,
+        order: 5,
         title: _t('app.admin.tour.settings.reset.title'),
         content: _t('app.admin.tour.settings.reset.content'),
         placement: 'left'
@@ -365,7 +373,7 @@ Application.Controllers.controller('SettingsController', ['$scope', '$rootScope'
       uitour.createStep({
         selector: '.admin-settings .home-page-style',
         stepId: 'css',
-        order: 5,
+        order: 6,
         title: _t('app.admin.tour.settings.css.title'),
         content: _t('app.admin.tour.settings.css.content'),
         placement: 'top'
@@ -373,7 +381,7 @@ Application.Controllers.controller('SettingsController', ['$scope', '$rootScope'
       uitour.createStep({
         selector: '.admin-settings .about-page-tab',
         stepId: 'about',
-        order: 6,
+        order: 7,
         title: _t('app.admin.tour.settings.about.title'),
         content: _t('app.admin.tour.settings.about.content'),
         placement: 'bottom'
@@ -381,7 +389,7 @@ Application.Controllers.controller('SettingsController', ['$scope', '$rootScope'
       uitour.createStep({
         selector: '.admin-settings .privacy-page-tab',
         stepId: 'privacy',
-        order: 7,
+        order: 8,
         title: _t('app.admin.tour.settings.privacy.title'),
         content: _t('app.admin.tour.settings.privacy.content'),
         placement: 'bottom'
@@ -389,15 +397,24 @@ Application.Controllers.controller('SettingsController', ['$scope', '$rootScope'
       uitour.createStep({
         selector: '.admin-settings .history-select',
         stepId: 'draft',
-        order: 8,
+        order: 9,
         title: _t('app.admin.tour.settings.draft.title'),
         content: _t('app.admin.tour.settings.draft.content'),
         placement: 'bottom'
       });
+      uitour.createStep({
+        selector: '.admin-settings .reservations-page-tab',
+        stepId: 'reservations',
+        order: 10,
+        title: _t('app.admin.tour.settings.reservations.title'),
+        content: _t('app.admin.tour.settings.reservations.content'),
+        placement: 'bottom',
+        popupClass: 'shift-left-50'
+      });
       uitour.createStep({
         selector: 'body',
         stepId: 'conclusion',
-        order: 9,
+        order: 11,
         title: _t('app.admin.tour.conclusion.title'),
         content: _t('app.admin.tour.conclusion.content'),
         placement: 'bottom',
@@ -405,9 +422,11 @@ Application.Controllers.controller('SettingsController', ['$scope', '$rootScope'
       });
       // on step change, change the active tab if needed
       uitour.on('stepChanged', function (nextStep) {
+        if (nextStep.stepId === 'general') { $scope.tabs.active = 0; }
         if (nextStep.stepId === 'home' || nextStep.stepId === 'css') { $scope.tabs.active = 1; }
         if (nextStep.stepId === 'about') { $scope.tabs.active = 2; }
         if (nextStep.stepId === 'privacy' || nextStep.stepId === 'draft') { $scope.tabs.active = 3; }
+        if (nextStep.stepId === 'reservations') { $scope.tabs.active = 4; }
       });
       // on tour end, save the status in database
       uitour.on('ended', function () {

app/assets/templates/admin/settings/index.html.erb

@@ -26,7 +26,7 @@
     <div class="col-md-12">
       <uib-tabset justified="true" active="tabs.active">
 
-        <uib-tab heading="{{ 'app.admin.settings.general.general' | translate }}" index="0">
+        <uib-tab heading="{{ 'app.admin.settings.general.general' | translate }}" index="0" class="general-page-tab">
           <ng-include src="'<%= asset_path "admin/settings/general.html" %>'"></ng-include>
         </uib-tab>
 
@@ -42,7 +42,7 @@
           <ng-include src="'<%= asset_path "admin/settings/privacy.html" %>'"></ng-include>
         </uib-tab>
 
-        <uib-tab heading="{{ 'app.admin.settings.reservations' | translate }}" index="4">
+        <uib-tab heading="{{ 'app.admin.settings.reservations' | translate }}" index="4" class="reservations-page-tab">
           <ng-include src="'<%= asset_path "admin/settings/reservations.html" %>'"></ng-include>
         </uib-tab>
       </uib-tabset>

config/locales/app.admin.en.yml

@@ -1384,7 +1384,10 @@ en:
         settings:
           welcome:
             title: "Application customization"
-            content: "From here, you can configure the general settings of Fab-manager as well as customize various elements of the interface."
+            content: "From here, you can configure the general settings of Fab-manager, enable or disable the optional modules and customize various elements of the interface."
+          general:
+            title: "General settings"
+            content: "A lot a settings can be customized from here. Take time to look all over this page, it will let you customize messages, documents, optional modules, registrations, visual aspect of Fab-manager, and much more."
           home:
             title: "Customize home page"
             content: "<p>This WYSIWYG editor allows you to customize the appearance of the home page while using different components (last tweet, brief, etc.).</p><p><strong>Warning:</strong> Keep in mind that any uncontrolled changes can break the appearance of the home page.</p>"
@@ -1409,6 +1412,9 @@ en:
           draft:
             title: "Draft"
             content: "Click here to view a privacy policy draft with holes, which you just need to read and complete."
+          reservations:
+            title: "Reservations"
+            content: "Opening hours, chance to cancel reservations... Each Fablab has its own reservation rules, which you can define on this page."
         open_api:
           welcome:
             title: "OpenAPI"

config/locales/app.admin.fr.yml

@@ -1384,7 +1384,10 @@ fr:
         settings:
           welcome:
             title: "Personnalisation de l'application"
-            content: "D'ici, vous pourrez configurer les réglages généraux de Fab-manager ainsi que personnaliser différents éléments de l'interface."
+            content: "D'ici, vous pourrez configurer les réglages généraux de Fab-manager, activer ou désactiver les modules optionnels ainsi que personnaliser différents éléments de l'interface."
+          general:
+            title: "Paramètres généraux"
+            content: "Beaucoup de paramètres peuvent être personnalisés d'ici. Prenez le temps de parcourir toute cette page, elle vous permettra de personnaliser des messages, documents, modules optionnels, créations de comptes, l'aspect visuel de Fab-manager et beaucoup d'autre choses."
           home:
             title: "Personnaliser la page d'accueil"
             content: "<p>Cet éditeur WYSIWYG vous permet de personnaliser l'apparence de la page d'accueil tout en utilisant différents composants (dernier tweet, brève, etc.).</p><p><strong>Attention :</strong> Gardez à l'esprit que toute modification non maîtrisée peut casser l'apparence de la page d'accueil.</p>"
@@ -1409,6 +1412,9 @@ fr:
           draft:
             title: "Brouillon"
             content: "Cliquez ici pour afficher un brouillon à trous d'une politique de confidentialité, qu'il ne vous reste plus qu'à relire et à compléter."
+          reservations:
+            title: "Réservations"
+            content: "Horaires d'ouverture, possibilité d'annuler les réservations ... Chaque Fab Lab possède ses propres règles de réservation, que vous pourrez définir sur cette page."
         open_api:
           welcome:
             title: "OpenAPI"