From 3f37ec3477f32059b094cab322cd37483d9092e8 Mon Sep 17 00:00:00 2001
From: flop25 <flop25@piwigo.org>
Date: Sat, 26 Jul 2014 17:42:07 +0000
Subject: add new trigger loc_end_photo_add_direct First Contact tour reviewed
 and reworked to change dynamically with the new uploader

git-svn-id: http://piwigo.org/svn/trunk@29078 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 .../TakeATour/tours/first_contact/config.inc.php   | 38 ++++++++++++++++-
 plugins/TakeATour/tours/first_contact/tour.tpl     | 47 +++++++++-------------
 2 files changed, 57 insertions(+), 28 deletions(-)

(limited to 'plugins/TakeATour/tours')

diff --git a/plugins/TakeATour/tours/first_contact/config.inc.php b/plugins/TakeATour/tours/first_contact/config.inc.php
index 30f797c66..dc1dfe2db 100644
--- a/plugins/TakeATour/tours/first_contact/config.inc.php
+++ b/plugins/TakeATour/tours/first_contact/config.inc.php
@@ -9,13 +9,49 @@ $TOUR_PATH = PHPWG_PLUGINS_PATH.'TakeATour/tours/first_contact/tour.tpl';
 if ( defined('IN_ADMIN') and IN_ADMIN )
 {
 /* first contact */
+add_event_handler('loc_end_photo_add_direct', 'TAT_FC_6');
+add_event_handler('loc_end_photo_add_direct', 'TAT_FC_7');
 add_event_handler('loc_end_element_set_global', 'TAT_FC_14');
 add_event_handler('loc_end_picture_modify', 'TAT_FC_16');
 add_event_handler('loc_end_picture_modify', 'TAT_FC_17');
 add_event_handler('loc_end_cat_modify', 'TAT_FC_23');
 add_event_handler('loc_end_themes_installed', 'TAT_FC_35');
 }
-
+      
+function TAT_FC_7()
+{
+  global $template;
+  $template->set_prefilter('photos_add', 'TAT_FC_7_prefilter');
+}
+function TAT_FC_7_prefilter ($content, &$smarty)
+{
+  $search = 'UploadComplete: function(up, files) {';
+  $replacement = 'UploadComplete: function(up, files) {
+  if (tour.getCurrentStep()==5)
+  {
+    tour.goTo(6);
+  }
+';
+  return str_replace($search, $replacement, $content);
+}
+function TAT_FC_6()
+{
+  global $template;
+  $template->set_prefilter('photos_add', 'TAT_FC_6_prefilter');
+}
+function TAT_FC_6_prefilter ($content, &$smarty)
+{
+  $search = 'BeforeUpload:';
+  $replacement = 'FilesAdded: function() {
+    if (tour.getCurrentStep()==4)
+    {
+      tour.goTo(5);
+    }
+  
+  },
+  BeforeUpload:';
+  return str_replace($search, $replacement, $content);
+}
 function TAT_FC_14()
 {
   global $template;
diff --git a/plugins/TakeATour/tours/first_contact/tour.tpl b/plugins/TakeATour/tours/first_contact/tour.tpl
index 92b934c54..e2b597adb 100644
--- a/plugins/TakeATour/tours/first_contact/tour.tpl
+++ b/plugins/TakeATour/tours/first_contact/tour.tpl
@@ -1,4 +1,4 @@
-{footer_script require='jquery.bootstrap-tour'}{literal}
+{footer_script require='jquery.bootstrap-tour'  load="async"}{literal}
 
 var tour = new Tour({
   name: "first_contact",
@@ -56,30 +56,32 @@ tour.addSteps([
     element: "#afterUploadActions",
     title: "{/literal}{'first_contact_title7'|@translate|@escape:'javascript'}{literal}",
     content: "{/literal}{'first_contact_stp7'|@translate|@escape:'javascript'}{literal}",
-    prev:4
+    prev:3,
+    onPrev: function (tour) {window.location.reload()}
   },
   {
     path: "{/literal}{$TAT_path}{literal}admin.php?page=photos_add",
     placement: "top",
-    element: "#batchLink",
+    element: ".batchLink",
     reflex:true,
     title: "{/literal}{'first_contact_title8'|@translate|@escape:'javascript'}{literal}",
     content: "{/literal}{'first_contact_stp8'|@translate|@escape:'javascript'}{literal}",
-    prev:4
   },
   {
-    path: /admin\.php\?page=(photos_add|batch_manager&filter=prefilter-last_import|prefilter-caddie)/,
+    path: /admin\.php\?page=(photos_add|batch_manager&filter=prefilter-last_import|batch_manager&filter=prefilter-caddie)/,
     redirect:function (tour) {window.location = "admin.php?page=batch_manager&filter=prefilter-last_import";},
     placement: "top",
-    element: "",
+    element: "select[name='filter_prefilter']",
     title: "{/literal}{'first_contact_title9'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp9'|@translate|@escape:'javascript'}{literal}"
-  },
+    content: "{/literal}{'first_contact_stp9'|@translate|@escape:'javascript'}{literal}",
+    prev:3,
+    onPrev: function (tour) {window.location = "{/literal}{$ABS_U_ADMIN}{literal}admin.php?page=photos_add"}
+ },
   {//10
     path: /admin\.php\?page=batch_manager&filter=(prefilter-caddie|prefilter-last_import)/,
     redirect:function (tour) {window.location = "admin.php?page=batch_manager&filter=prefilter-last_import";},
     placement: "right",
-    element: ".icon-flag",
+    element: "a[href='./admin.php?page=batch_manager&filter=prefilter-caddie']",
     title: "{/literal}{'first_contact_title10'|@translate|@escape:'javascript'}{literal}",
     content: "{/literal}{'first_contact_stp10'|@translate|@escape:'javascript'}{literal}"
   },
@@ -150,8 +152,6 @@ tour.addSteps([
   },
   {
     path: "{/literal}{$TAT_path}{literal}admin.php?page=cat_list",
-    placement: "left",
-    element: "#content",
     title: "{/literal}{'first_contact_title19'|@translate|@escape:'javascript'}{literal}",
     content: "{/literal}{if $TAT_FTP}{'first_contact_stp19'|@translate|@escape:'javascript'}{else}{'first_contact_stp19_b'|@translate|@escape:'javascript'}{/if}{literal}",
     onPrev: function (tour) {window.location = "admin.php?page=photo-{/literal}{$TAT_image_id}{literal}";},
@@ -172,7 +172,7 @@ tour.addSteps([
     content: "{/literal}{'first_contact_stp21'|@translate|@escape:'javascript'}{literal}"
   },
   {
-    path: /admin\.php\?page=album-/,
+    path: /admin\.php\?page=album-[0-9]+(|-properties)$/,
     redirect:function (tour) {window.location = "admin.php?page=album-{/literal}{$TAT_cat_id}{literal}";},
     placement: "top",
     element: ".selected_tab",
@@ -180,7 +180,7 @@ tour.addSteps([
     content: "{/literal}{'first_contact_stp22'|@translate|@escape:'javascript'}{literal}"
   },
   {
-    path: /admin\.php\?page=album-/,
+    path: /admin\.php\?page=album-[0-9]+(|-properties)$/,
     redirect:function (tour) {window.location = "admin.php?page=album-{/literal}{$TAT_cat_id}{literal}";},
     placement: "top",
     element: "#TAT_FC_23",
@@ -188,10 +188,11 @@ tour.addSteps([
     content: "{/literal}{'first_contact_stp23'|@translate|@escape:'javascript'}{literal}"
   },
   {
-    path: /admin\.php\?page=album-/,
+    path: /admin\.php\?page=album-[0-9]+(|-properties)$/,
     redirect:function (tour) {window.location = "admin.php?page=album-{/literal}{$TAT_cat_id}{literal}";},
     placement: "bottom",
-    element: ".tabsheet",
+    element: "li.normal_tab:nth-child(3) > a:nth-child(1)",
+    reflex: true,
     title: "{/literal}{'first_contact_title24'|@translate|@escape:'javascript'}{literal}",
     content: "{/literal}{'first_contact_stp24'|@translate|@escape:'javascript'}{literal}"
   },
@@ -257,8 +258,9 @@ tour.addSteps([
   },
   {
     path: "{/literal}{$TAT_path}{literal}admin.php?page=configuration",
-    placement: "top",
-    title: "{/literal}{'first_contact_stp33'|@translate|@escape:'javascript'}{literal}",
+    placement: "bottom",
+    element: "li.normal_tab:nth-child(6) > a:nth-child(1)",
+    title: "{/literal}{'first_contact_title33'|@translate|@escape:'javascript'}{literal}",
     content: "{/literal}{'first_contact_stp33'|@translate|@escape:'javascript'}{literal}",
     prev:30
   },
@@ -324,9 +326,7 @@ tour.addSteps([
     content: "{/literal}{'first_contact_stp42'|@translate|@escape:'javascript'}{literal}"
   },
   {
-    path: "{/literal}{$TAT_path}{literal}admin.php?page=plugin-TakeATour",
-    placement: "top",
-    element: "",
+    path: "{/literal}{$TAT_path}{literal}admin.php",
     title: "{/literal}{'first_contact_title43'|@translate|@escape:'javascript'}{literal}",
     content: "{/literal}{'first_contact_stp43'|@translate|@escape:'javascript'}{literal}"
   }
@@ -337,11 +337,4 @@ tour.init();
 
 // Start the tour
 tour.start();
-
-jQuery( ".plupload_start" ).click(function() {
-  if (tour.getCurrentStep()==5)
-  {
-    tour.goTo(6);
-  }
-});
 {/literal}{/footer_script}
\ No newline at end of file
-- 
cgit v1.2.3