Changeset 29078 for trunk/plugins/TakeATour/tours

Timestamp:

Jul 26, 2014, 7:42:07 PM (10 years ago)

Author:

flop25

Message:

add new trigger loc_end_photo_add_direct
First Contact tour reviewed and reworked to change dynamically with the new uploader

Location:

trunk/plugins

Files:

• . (modified) (1 prop)
• TakeATour/tours/first_contact/config.inc.php (modified) (2 diffs)
• TakeATour/tours/first_contact/tour.tpl (modified) (9 diffs)

trunk/plugins

@@ -1 @@
-*
+AMetaData
+AdditionalPages
+Autosize
+Comments_on_Albums
+ExtendedDescription
+GMaps
+GThumb
+GrumPluginClasses
+PWG_Stuffs
+Panoramas
+PersonalPlugin
+SmartAlbums
+automatic_size
+dynareceperio
+event_cats
+lightbox
+meta
+piclens
+rv_menutree
+trash
+user_tags

@@ -1 @@
-*
+AMetaData
+AdditionalPages
+Autosize
+Comments_on_Albums
+ExtendedDescription
+GMaps
+GThumb
+GrumPluginClasses
+PWG_Stuffs
+Panoramas
+PersonalPlugin
+SmartAlbums
+automatic_size
+dynareceperio
+event_cats
+lightbox
+meta
+piclens
+rv_menutree
+trash
+user_tags

trunk/plugins/TakeATour/tours/first_contact/config.inc.php

@@ -10 +10 @@
 {
 /* 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');
@@ -16 +18 @@
 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()
 {

trunk/plugins/TakeATour/tours/first_contact/tour.tpl

@@ -1 @@
-{footer_script require='jquery.bootstrap-tour'}{literal}
+{footer_script require='jquery.bootstrap-tour'  load="async"}{literal}
 
 var tour = new Tour({
@@ -57 +57 @@
     title: "{/literal}{'first_contact_title7'|@translate|@escape:'javascript'}{literal}",
     content: "{/literal}{'first_contact_stp7'|@translate|@escape:'javascript'}{literal}",
-    prev:4
-  },
-  {
-    path: "{/literal}{$TAT_path}{literal}admin.php?page=photos_add",
-    placement: "top",
-    element: "#batchLink",
+    prev:3,
+    onPrev: function (tour) {window.location.reload()}
+  },
+  {
+    path: "{/literal}{$TAT_path}{literal}admin.php?page=photos_add",
+    placement: "top",
+    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)/,
-    redirect:function (tour) {window.location = "admin.php?page=batch_manager&filter=prefilter-last_import";},
-    placement: "top",
-    element: "",
+  },
+  {
+    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: "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}"
@@ -151 +153 @@
   {
     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}",
@@ -173 +173 @@
   },
   {
-    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",
@@ -181 +181 @@
   },
   {
-    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",
@@ -189 +189 @@
   },
   {
-    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}"
@@ -258 +259 @@
   {
     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
@@ -325 +327 @@
   },
   {
-    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}"
@@ -338 +338 @@
 // Start the tour
 tour.start();
-
-jQuery( ".plupload_start" ).click(function() {
-  if (tour.getCurrentStep()==5)
-  {
-    tour.goTo(6);
-  }
-});
 {/literal}{/footer_script}

@@ -1 @@
-*
+AMetaData
+AdditionalPages
+Autosize
+Comments_on_Albums
+ExtendedDescription
+GMaps
+GThumb
+GrumPluginClasses
+PWG_Stuffs
+Panoramas
+PersonalPlugin
+SmartAlbums
+automatic_size
+dynareceperio
+event_cats
+lightbox
+meta
+piclens
+rv_menutree
+trash
+user_tags