Code cleanup, button colors

civicrm · Oct 11, 2018 · ed9875f · ed9875f
1 parent a16d21e
commit ed9875f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/crm-tutorials/contact-summary.js b/crm-tutorials/contact-summary.js
@@ -1,6 +1,7 @@
 {
     "url": "civicrm/contact/view",
     "title": ts("Introduction to Contacts"),
+    "auto_run": true,
     "steps": [
         {
             "target": "#contactname-block",

diff --git a/css/tutorial-admin.css b/css/tutorial-admin.css
@@ -38,8 +38,8 @@ body.civitutorial-admin-open .hopscotch-nav-button {
   color: white;
   cursor: pointer;
 }
-button#civitutorial-admin-close {
-  background: #aaa334;
+form:not(.tutorial-saved) #civitutorial-admin-close {
+  background: #d2c600;
 }
 button#civitutorial-admin-delete {
   background: #aa323b;

diff --git a/js/tutorial-admin.js b/js/tutorial-admin.js
@@ -52,11 +52,13 @@
     if (!tutorial.steps.length) {
       addStep();
     }
+    setSaved(tutorial.saved);
   }
 
   function setSaved(val) {
     tutorial.saved = val;
     $('#civitutorial-admin-save').prop('disabled', val);
+    $('#civitutorial-admin').toggleClass('tutorial-saved', val);
   }
 
   function addStep() {

diff --git a/js/tutorial.js b/js/tutorial.js
@@ -85,7 +85,7 @@
     if (autoStartTutorial) {
       poll = setInterval(function() {
         if ($(autoStartTutorial.steps[0].target).length) {
-          startTour(autoStartTutorial.id);
+          startTutorial(autoStartTutorial.id);
           clearInterval(poll);
           poll = null;
         }
@@ -95,10 +95,10 @@
 
   function clickStart(e) {
     e.preventDefault();
-    startTour($(this).data('tutorial'));
+    startTutorial($(this).data('tutorial'));
   }
 
-  function startTour(id) {
+  function startTutorial(id) {
     hopscotch.endTour();
 
     var defaults = {
@@ -108,33 +108,33 @@
         prevBtn: ts('Back')
       }
     };
-    defaults.onClose = defaults.onEnd = endTour;
+    defaults.onClose = defaults.onEnd = endTutorial;
 
     CRM.vars.tutorial.items[id].viewed = true;
-    var tour = _.extend(defaults, _.cloneDeep(CRM.vars.tutorial.items[id]));
+    var tutorial = _.extend(defaults, _.cloneDeep(CRM.vars.tutorial.items[id]));
 
     // Place icons in the step number circle if provided
-    tour.i18n.stepNums = _.map(tour.steps, function(step, i) {
+    tutorial.i18n.stepNums = _.map(tutorial.steps, function(step, i) {
       return step.icon ? '<i class="crm-i ' + step.icon + '"></i>' : i + 1;
     });
 
-    hopscotch.startTour(tour);
+    hopscotch.startTour(tutorial);
 
     CRM.api3('Tutorial', 'mark', {id: id});
   }
 
-  function endTour() {
+  function endTutorial() {
     var supportMenu = $('.menumain a[href$="#tutorial-start"]').closest('.menumain');
     if (supportMenu.length) {
       window.setTimeout(function() {
         hopscotch.startTour({
-          id: 'tour-closed',
+          id: 'tutorial-closed',
           steps: [
             {
               target: $(supportMenu)[0],
               placement: 'bottom',
               nextOnTargetClick: true,
-              content: ts('To see this tour again, or for more ways to learn and get help, open the Support menu.')
+              content: ts('To see this tutorial again, or for more ways to learn and get help, open the Support menu.')
             }
           ],
           i18n: {