take a tour: privacy tour wip

git-svn-id: http://piwigo.org/svn/trunk@29058 68402e56-0260-453c-a942-63ccdbb3a9ee

4 files changed, 91 insertions, 146 deletions

diff --git a/plugins/TakeATour/language/en_UK/plugin.lang.php b/plugins/TakeATour/language/en_UK/plugin.lang.php
index 363d2c89f..afd22a10e 100644
--- a/plugins/TakeATour/language/en_UK/plugin.lang.php
+++ b/plugins/TakeATour/language/en_UK/plugin.lang.php
@@ -132,4 +132,47 @@ $lang['2_7_0_stp10'] = '';
 $lang['2_7_0_title11'] = 'See you soon!';
 $lang['2_7_0_stp11'] = 'This tour is over.<p style="text-align:center">Enjoy your Piwigo 2.7!</p>If you like Piwigo and want to support us, you can contribute by helping for translations, donating, etc. <a href="http://piwigo.org/basics/contribute" target="_blank">Click here to support us</a>';
 
+
+
+
+
+$lang['privacy_descrp'] = 'This tour present you all the ways to protect your photo from public access with the permission systems per album and per picture, and from copying using image protections';
+$lang['privacy_title1'] = 'Welcome in the Privacy Tour';
+$lang['privacy_stp1'] = 'Hello! I will be your guide to discover how to protect your pictures in Piwigo. Please follow my instructions, and click Next (or use the arrows of your keyboard) to navigate. If you go to an other page of the administration, you will be redirected to the current page of the Tour. If you are stuck and can\'t end the tour, going to <em>Plugins » Take A Tour</em> will end the tour.<br>Let\'s start!';
+$lang['privacy_title2'] = 'Help inside your Piwigo';
+$lang['privacy_stp2'] = 'You can access here to the Help integrated. Click Next to continue directly to the Help page about managing permissions';
+$lang['privacy_title3'] = 'Permissions';
+$lang['privacy_stp3'] = 'Take a moment to read the informations bellow.';
+$lang['privacy_title4'] = 'Permissions';
+$lang['privacy_stp4'] = 'So we have two systems for managing the permissions to access to the pictures. They are independent, so you can create a group called Family, but that group has nothing to do with the privacy level Family. <br><br>The levels of privacy are applied per picture, and the group/user permissions are applied per album. You can use both or only one system, that\'s flexible.<br><br>The next Tab is about group managment.';
+$lang['privacy_title5'] = 'Permissions > Groups';
+$lang['privacy_stp5'] = 'Bellow is explained how you can manage the Groups.<br>Those permissions are only for the access of the pictures and the albums, when browsing on the public part or for the external applications. We will see later other protections, but let\'s now practice!';
+$lang['privacy_title6'] = 'Privacy Level';
+$lang['privacy_stp6'] = 'When you upload the pictures, you can change the Privacy Level of the uploaded pictures right there...';
+$lang['privacy_title7'] = 'Privacy Level';
+$lang['privacy_stp7'] = '... or you can do that later one, here in the Batch Manager in Global Mode.<br><br>This is the page <em>Photos » Recent photos</em>, so the filter "Last Import" is set.';
+$lang['privacy_title8'] = 'Privacy Level';
+$lang['privacy_stp8'] = 'Select one or more pictures...';
+$lang['privacy_title9'] = 'Privacy Level';
+$lang['privacy_stp9'] = '... and select the action "Who can see the pictures?". Now you can change the privacy level of the selected pictures.<br><br>But you can also do that for a specific picture, on its edition page. You can access to it from the public part, or from here.<br><br>Now, I will show you the other system of permission per album based on the groups and users.';
+$lang['privacy_title10'] = 'Album permissions';
+$lang['privacy_stp10'] = 'We are in the Album list management available from the menu using <em>Albums » Manage</em><br><br>Edit on album by hovering it and then click on Edit.';
+$lang['privacy_title11'] = 'Album permissions';
+$lang['privacy_stp11'] = 'Now click on the Permissions tab';
+$lang['privacy_title12'] = 'Album permissions';
+$lang['privacy_stp12'] = 'On that page, you can choose if the album will be available for anyone or will be restricted to some users';
+$lang['privacy_title13'] = '';
+$lang['privacy_stp13'] = 'Now click on private.';
+$lang['privacy_title14'] = '';
+$lang['privacy_stp14'] = 'Then users and groups of users can be granted to access to the album.';
+$lang['privacy_title15'] = 'Tip';
+$lang['privacy_stp15'] = 'Just before explaining the groups, a pro tip: here is the link to a page to set as private/public several albums at once. Click on it';
+$lang['privacy_title16'] = '';
+$lang['privacy_stp16'] = 'Like on your computer, you can select several albums using the keys Maj and Control, then click on the arrow to switch them.';
+$lang['privacy_title17'] = '';
+$lang['privacy_stp17'] = '';
+$lang['privacy_title18'] = '';
+$lang['privacy_stp18'] = '';
+$lang['privacy_title19'] = '';
+$lang['privacy_stp19'] = '';
 ?>
\ No newline at end of file
diff --git a/plugins/TakeATour/tours/privacy/Text-1.txt b/plugins/TakeATour/tours/privacy/Text-1.txt
deleted file mode 100644
index 8a8ff8239..000000000
--- a/plugins/TakeATour/tours/privacy/Text-1.txt
+++ /dev/null
@@ -1,88 +0,0 @@
-$lang['privacy_descrp'] = 'This tour present you all the ways to protect your photo from the permission systems per album and per picture, and the image protection from copying';

-$lang['privacy_title1'] = 'Welcome in the Privacy Tour';

-$lang['privacy_stp1'] = 'Hello! I will be your guide to discover how to protect your pictures in Piwigo. Please follow my instructions, and click Next (or use the arrows of your keyboard) to navigate. If you go to an other page of the administration, you will be redirected to the current page of the Tour. If you are stuck and can\'t end the tour, going to <em>Plugins » Take A Tour</em> will end the tour.<br>Let\'s start!';

-$lang['privacy_title2'] = 'Help inside your Piwigo';

-$lang['privacy_stp2'] = 'You can access here to the Help integrated. Click Next to continue directly to the Help page about managing permissions';

-$lang['privacy_title3'] = 'Permissions';

-$lang['privacy_stp3'] = 'Take a moment to read the informations bellow.';

-$lang['privacy_title4'] = 'Permissions';

-$lang['privacy_stp4'] = 'So we have two systems for managing the permissions to access to the pictures. They are independent, so you can create a group called Family, but that group has nothing to do with the privacy level Family. The levels of privacy are applied per picture, and the group/user permissions are applied per album. You can use both or only one system, that's flexible.<br>The next Tab is about group managment.';

-$lang['privacy_title5'] = 'Permissions > Groups';

-$lang['privacy_stp5'] = 'Bellow is explained how you can manage the Groups.<br>Those permissions are only for the access of the pictures and the albums, when browsing on the public part or for the external applications. We will see later other protections, but let's now practice!';

-$lang['privacy_title6'] = 'Privacy Level';

-$lang['privacy_stp6'] = 'When you upload the pictures, you can change the Privacy Level of the uploaded pictures right there...';

-$lang['privacy_title7'] = 'Privacy Level';

-$lang['privacy_stp7'] = '... or you can do that later one, here in the Batch Manager in Global Mode. This is the page <em>Photos » Recent photos</em>, so the filter "Last Import" is set.';

-$lang['privacy_title8'] = 'Privacy Level';

-$lang['privacy_stp8'] = 'Select one or more pictures...';

-$lang['privacy_title9'] = 'Privacy Level';

-$lang['privacy_stp9'] = '... and select the action "Who can see the pictures?". Now you can change the privacy level of the selected pictures.<br>But you can also do that for a specific picture, on its edition page. You can access to it from the public part, or from here.<br>Now, I will show you the other system of permission per album based on the groups and users.';

-$lang['privacy_title10'] = 'Album permissions';

-$lang['privacy_stp10'] = 'Here is the link to directly access to your caddy: that/s a tool for administrators to easily add pictures to a set in order to edit them in the Batch Manager. You can add photos to the caddy from the public picture page when logged as an admin, or using the action \"Add to caddy\" on the Batch Manager';

-$lang['privacy_title11'] = 'How to edit a photos';

-$lang['privacy_stp11'] = 'So you can select from here one or more photos';

-$lang['privacy_title12'] = '';

-$lang['privacy_stp12'] = 'then edit them using and action. But for instance, you can\'t -for now- batch edit descriptions since they are mostly unique';

-$lang['privacy_title13'] = '';

-$lang['privacy_stp13'] = 'You can edit descriptions and more from the batch manager in unit mode. But for now, let\'s stay in the global mode';

-$lang['privacy_title14'] = '';

-$lang['privacy_stp14'] = 'We will see now the edition page of one picture. That page is reachable from here but also from the public picture page when logged as an administrator. Click on Edit or go next';

-$lang['privacy_title15'] = 'The edition page of a picture';

-$lang['privacy_stp15'] = 'On that page you can edit all the properties of a photo, for instance...';

-$lang['privacy_title16'] = '';

-$lang['privacy_stp16'] = 'here to add or remove the photo from albums. The link is virtual, no photos will be physically moved ever.';

-$lang['privacy_title17'] = '';

-$lang['privacy_stp17'] = 'and here to set the photo as a picture representative of an album. So you can set as a representative of a public album, a photo in a private album, which is ideal to set custom thumbnails for albums but the user won\'t see those pictures inside those albums. Like setting a portrait of someone as representative, for an album which contains photos of nature; it would be weird to see that photo of the man/woman among trees or animals.';

-$lang['privacy_title18'] = 'Manage albums';

-$lang['privacy_stp18'] = 'That previous example was just a small overview of tricks and how powerful Piwigo is. So I\'ve told about private albums, but how can we manage albums? Click On album->Manage or hit Next';

-$lang['privacy_title19'] = 'Manage Albums';

-$lang['privacy_stp19'] = 'Here are listed all the \'top\' albums, the ones at the root of your gallery. If you see an album with a dashed background, it\'s an real physical album from a FTP synchronisation, which can\'t be moved or deleted from here. The others albums are called virtual albums.';

-$lang['privacy_stp19_b'] = 'All the albums are called \'virtual albums\'. Here are listed all the \'top\' albums, the ones at the root of your gallery.';

-$lang['privacy_title20'] = 'Manage Albums';

-$lang['privacy_stp20'] = 'When your mouse is hover a album, links and information appear. When you drag and drop an album -a rounded block-, you will change its position and then you can save or cancel your manual order.';

-$lang['privacy_title21'] = 'Other Tabs';

-$lang['privacy_stp21'] = 'The next tab is a page where you can move any virtual album.<br>The permalink tab is to set a particular url for an album, for technical reasons like to set a specific template or for just sending cool customized links.<br>But let\'s edit an album: click on Edit of a album';

-$lang['privacy_title22'] = 'Album Edition Page';

-$lang['privacy_stp22'] = 'Like for a picture, here you can edit the properties of an album';

-$lang['privacy_title23'] = '';

-$lang['privacy_stp23'] = 'Locking a album means only administrators will be able to see that album: it\'s usually used when an admin is managing the properties of an album or don\'t want to publish the album immediately';

-$lang['privacy_title24'] = '';

-$lang['privacy_stp24'] = 'Certainly, one of the most important page is the permission page of a private album. Click on the permission tab or click next';

-$lang['privacy_title25'] = 'Album Permission';

-$lang['privacy_stp25'] = 'As you can read in the Help of your Piwigo -link at the top right-, album permissions are set by groups and users. You can directly set private/public multiple albums using the Administration » Albums » Properties page.';

-$lang['privacy_title26'] = '';

-$lang['privacy_stp26'] = 'Here you can set the current album as private, then grant access to users and groups. By default, permissions are not recursive for sub albums, but upper-albums will be granted with the same permission in order to let the granted users browse to the album.';

-$lang['privacy_title27'] = '';

-$lang['privacy_stp27'] = 'Important fact: the webmasters and administrators are not omniscient when browsing the public part, but they can access to every album and photos on the admin part.';

-$lang['privacy_title28'] = 'Configuration';

-$lang['privacy_stp28'] = 'Now we will look at the options available to set Piwigo working your way. Click on Configuration->Options or just hit Next.';

-$lang['privacy_title29'] = 'Configuration->Options->General';

-$lang['privacy_stp29'] = 'Here, on that first page, you will set the essential and basic configuration of your gallery.';

-$lang['privacy_title30'] = '';

-$lang['privacy_stp30'] = 'Let\'s start by changing the tittle';

-$lang['privacy_title31'] = '';

-$lang['privacy_stp31'] = 'Then the banner, which will be displayed on top of every pages. As you can see, HTML tags are allowed here. You can also use the %gallery_title% tag to display the tittle you just typed above.';

-$lang['privacy_title32'] = '';

-$lang['privacy_stp32'] = 'Now save you changes';

-$lang['privacy_title33'] = 'Guest settings';

-$lang['privacy_stp33'] = 'Just a final word about the options, the \'Guest settings\' page is to set the preferences of unregistered visitors. Each time Piwigo refers to \'guest\' that means unregistered visitors.<br>Let\'s continue about Configuration: click on Configuration->Themes or just hit Next.';

-$lang['privacy_title34'] = 'Themes';

-$lang['privacy_stp34'] = 'Themes are one of the three way to customize your Piwigo, with Plugins and Templates. Themes installed are listed here.<br>More than one theme can be enabled: users can change their theme by choosing one among the one enabled here, if the option \'Allow user customization\' is checked on the Option page.';

-$lang['privacy_title35'] = 'Themes';

-$lang['privacy_stp35'] = 'Themes can also be set as Default, which means that\'s the theme for unregistered visitors (guests, you remember?) and any new registered user will be have this theme. But for any previously registered users, the theme won\'t change until you do it from the User Management page or you disable their theme: be careful, you might disturb your users by changing their whole display.';

-$lang['privacy_title36'] = 'Themes';

-$lang['privacy_stp36'] = 'Themes have a system of dependency: that\'s why some theme can\'t be deleted (a parent theme can\'t be deleted if a child theme is enabled) or others can\'t be enabled (a child theme need its parent theme). For instance, when you put you\'re mouse over a Delete link, if the theme can\'t be deleted, a information bubble will explain you why.';

-$lang['privacy_title37'] = 'Themes';

-$lang['privacy_stp37'] = 'To install new themes, you can directly download them from the tab \'Add a theme\'. Only the themes marked as compatible with your version of Piwigo are showed.<br>Let\'s discover the plugins now! Click on Plugin->Manage';

-$lang['privacy_title38'] = 'Plugins';

-$lang['privacy_stp38'] = 'Plugins are very easy ways to customize your Piwigo. They can do almost anything you can imagine from small text addition to complete features, like the Community plugin which allows non administrators users to upload without entering to the administration part.';

-$lang['privacy_title39'] = 'Plugins';

-$lang['privacy_stp39'] = 'On that first page, are listed the installed plugins. At the top, are listed the plugins activated, which are currently running. At the bottom, the plugins which are installed in the /plugins folder, but disabled. Deleting a plugin means that any trace of the plugin will be removed (files, options etc). For most of the plugins, disabling will keep the data registered by the plugins.';

-$lang['privacy_title40'] = '';

-$lang['privacy_stp40'] = 'Here it\'s me! Don\'t disable me now, but you can see you can Disable or Restore an activated plugin.';

-$lang['privacy_title41'] = '';

-$lang['privacy_stp41'] = 'You can see on the last tab all the plugins available for your version of Piwigo. Hundred of plugins are there!';

-$lang['privacy_title42'] = 'Languages';

-$lang['privacy_stp42'] = 'Piwigo is multilingual. By default, the language displayed by Piwigo change according to the language of the browser of the visitor. If the language of the visitor is not available, the language set by default is used.';

-$lang['privacy_title43'] = 'It\'s been a great time';

-$lang['privacy_stp43'] = 'This tour was quite long, but we only have seen a small part of how powerful Piwigo is. Everything has a end, this overview is finished.<br>You can discover much deeper the features of Piwigo by taking an other tour or reading our documentation, on the piwigo.org website.';

diff --git a/plugins/TakeATour/tours/privacy/tour.tpl b/plugins/TakeATour/tours/privacy/tour.tpl
index fa2270f51..581f736b1 100644
--- a/plugins/TakeATour/tours/privacy/tour.tpl
+++ b/plugins/TakeATour/tours/privacy/tour.tpl
@@ -3,19 +3,8 @@
 var tour = new Tour({

   name: "privacy",

   orphan: true,

-  onEnd: function (tour) {window.location = "{/literal}{$ABS_U_ADMIN}{literal}admin.php?tour_ended=privacy";},

-  template: "<div class='popover tour'>

-  <div class='arrow'></div>

-  <h3 class='popover-title'></h3>

-  <div class='popover-content'></div>

-  <div class='popover-navigation'>

-      <button class='btn btn-default' data-role='prev'>« {/literal}{'Prev'|@translate|@escape:'javascript'}{literal}</button>

-      <span data-role='separator'>|</span>

-      <button class='btn btn-default' data-role='next'>{/literal}{'Next '|@translate|@escape:'javascript'}{literal} »</button>

-  </div>

-  <button class='btn btn-default' data-role='end'>{/literal}{'End tour'|@translate|@escape:'javascript'}{literal}</button>

-  </nav>

-</div>",

+  onEnd: function (tour) {window.location = "{/literal}{$ABS_U_ADMIN}{literal}admin.php?page=plugin-TakeATour&tour_ended=privacy"},

+  template: "<div class='popover'>          <div class='arrow'></div>          <h3 class='popover-title'></h3>          <div class='popover-content'></div>          <div class='popover-navigation'>            <div class='btn-group'>              <button class='btn btn-sm btn-default' data-role='prev'>&laquo; {/literal}{'Prev'|@translate|@escape:'javascript'}{literal}</button>              <button class='btn btn-sm btn-default' data-role='next'>{/literal}{'Next '|@translate|@escape:'javascript'}{literal} &raquo;</button>            </div>            <button class='btn btn-sm btn-default' data-role='end'>{/literal}{'End tour'|@translate|@escape:'javascript'}{literal}</button>          </div>        </div>",

 });

 {/literal}{if $TAT_restart}tour.restart();{/if}{literal}

 

@@ -49,100 +38,90 @@ tour.addSteps([
   {//5

     path: "{/literal}{$TAT_path}{literal}admin.php?page=help&section=groups",

     placement: "top",

-    element: "#uploadify",

+    element: "#helpContent>p:first",

     title: "{/literal}{'privacy_title5'|@translate|@escape:'javascript'}{literal}",

     content: "{/literal}{'privacy_stp5'|@translate|@escape:'javascript'}{literal}"

   },

   {

-    path: /admin\.php\?page=photos_add/,

-    redirect:function (tour) {window.location = "admin.php?page=photos_add";},

-    placement: "left",

-    element: "#fileQueue",

+    path: "{/literal}{$TAT_path}{literal}admin.php?page=photos_add",

+    placement: "top",

+    element: "#showPermissions",

     title: "{/literal}{'privacy_title6'|@translate|@escape:'javascript'}{literal}",

     content: "{/literal}{'privacy_stp6'|@translate|@escape:'javascript'}{literal}"

   },

   {

-    path: /admin\.php\?page=photos_add/,

-    redirect:function (tour) {window.location = "admin.php?page=photos_add";},

+    path: "{/literal}{$TAT_path}{literal}admin.php?page=batch_manager&filter=prefilter-last_import",

     placement: "top",

-    element: "#photosAddContent legend",

+    element: "",

     title: "{/literal}{'privacy_title7'|@translate|@escape:'javascript'}{literal}",

     content: "{/literal}{'privacy_stp7'|@translate|@escape:'javascript'}{literal}",

-    prev:4

   },

   {

-    path: /admin\.php\?page=photos_add/,

-    redirect:function (tour) {window.location = "admin.php?page=photos_add";},

-    placement: "bottom",

-    element: "#batchLink",

-    reflex:true,

+    path: "{/literal}{$TAT_path}{literal}admin.php?page=batch_manager&filter=prefilter-last_import",

+    placement: "top",

+    element: ".thumbnails",

     title: "{/literal}{'privacy_title8'|@translate|@escape:'javascript'}{literal}",

     content: "{/literal}{'privacy_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";},

+    path: "{/literal}{$TAT_path}{literal}admin.php?page=batch_manager&filter=prefilter-last_import",

     placement: "top",

-    element: "",

+    element: "#action",

     title: "{/literal}{'privacy_title9'|@translate|@escape:'javascript'}{literal}",

     content: "{/literal}{'privacy_stp9'|@translate|@escape:'javascript'}{literal}"

   },

   {//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",

+    path: "{/literal}{$TAT_path}{literal}admin.php?page=cat_list",

+    placement: "left",

+    element: "#content",

     title: "{/literal}{'privacy_title10'|@translate|@escape:'javascript'}{literal}",

     content: "{/literal}{'privacy_stp10'|@translate|@escape:'javascript'}{literal}"

   },

   {

-    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: "left",

-    element: "#checkActions",

+    path: /admin\.php\?page=album-/,

+    redirect:function (tour) {window.location = "admin.php?page=album-{/literal}{$TAT_cat_id}{literal}";},

+    placement: "bottom",

+    element: ".icon-lock",

     title: "{/literal}{'privacy_title11'|@translate|@escape:'javascript'}{literal}",

     content: "{/literal}{'privacy_stp11'|@translate|@escape:'javascript'}{literal}"

   },

   {

-    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";},

+    path: /admin\.php\?page=album-[0-9]+-permissions/,

+    redirect:function (tour) {window.location = "admin.php?page=album-{/literal}{$TAT_cat_id}{literal}-permissions";},

     placement: "top",

-    element: "#action",

+    element: "#categoryPermissions",

     title: "{/literal}{'privacy_title12'|@translate|@escape:'javascript'}{literal}",

     content: "{/literal}{'privacy_stp12'|@translate|@escape:'javascript'}{literal}"

   },

   {

-    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";},

+    path: /admin\.php\?page=album-[0-9]+-permissions/,

+    redirect:function (tour) {window.location = "admin.php?page=album-{/literal}{$TAT_cat_id}{literal}-permissions";},

     placement: "bottom",

-    element: "#tabsheet .normal_tab",

+    element: "input[value='private']",

+    reflex:true,

     title: "{/literal}{'privacy_title13'|@translate|@escape:'javascript'}{literal}",

     content: "{/literal}{'privacy_stp13'|@translate|@escape:'javascript'}{literal}"

   },

   {

-    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";},

+    path: /admin\.php\?page=album-[0-9]+-permissions/,

+    redirect:function (tour) {window.location = "admin.php?page=album-{/literal}{$TAT_cat_id}{literal}-permissions";},

     placement: "top",

-    element: "#TAT_FC_14",

-    reflex:true,

+    element: "#privateOptions",

     title: "{/literal}{'privacy_title14'|@translate|@escape:'javascript'}{literal}",

     content: "{/literal}{'privacy_stp14'|@translate|@escape:'javascript'}{literal}",

-    onNext:function (tour) {window.location = "admin.php?page=photo-{/literal}{$TAT_image_id}{literal}";}

   },

   {//15

-    path: /admin\.php\?page=photo-/,

-    redirect:function (tour) {window.location = "admin.php?page=photo-{/literal}{$TAT_image_id}{literal}";},

-    placement: "bottom",

-    element: ".selected_tab",

+    path: /admin\.php\?page=album-[0-9]+-permissions/,

+    redirect:function (tour) {window.location = "admin.php?page=album-{/literal}{$TAT_cat_id}{literal}-permissions";},

+    element: "a[href='./admin.php?page=cat_options']",

+    reflex:true,

     title: "{/literal}{'privacy_title15'|@translate|@escape:'javascript'}{literal}",

     content: "{/literal}{'privacy_stp15'|@translate|@escape:'javascript'}{literal}"

   },

   {

-    path: /admin\.php\?page=photo-/,

-    redirect:function (tour) {window.location = "admin.php?page=photo-{/literal}{$TAT_image_id}{literal}";},

+    path: "{/literal}{$TAT_path}{literal}admin.php?page=cat_options",

     placement: "top",

-    element: "#TAT_FC_16",

+    element: ".doubleSelect",

     title: "{/literal}{'privacy_title16'|@translate|@escape:'javascript'}{literal}",

     content: "{/literal}{'privacy_stp16'|@translate|@escape:'javascript'}{literal}"

   },

diff --git a/plugins/TakeATour/tpl/admin.tpl b/plugins/TakeATour/tpl/admin.tpl
index 8da067aeb..c89494fbc 100644
--- a/plugins/TakeATour/tpl/admin.tpl
+++ b/plugins/TakeATour/tpl/admin.tpl
@@ -8,7 +8,18 @@
     <legend>{'First Contact'|@translate}</legend>
     <div class="TAT_description">{'first_contact_descrp'|@translate}</div>
     <form action="{$F_ACTION}" method="post">
-      <input type="hidden" name="submited_tour_path" value=".../../admin/themes/first_contact">
+      <input type="hidden" name="submited_tour_path" value="tours/first_contact">
+      <input type="hidden" name="pwg_token" value="{$pwg_token}">
+      <input type="submit" name="button2" id="button2" value="{'Start the Tour'|@translate}">
+    </form>
+  </fieldset>
+  {/if}
+  {if !isset($TAT_tour_ignored) or (isset($TAT_tour_ignored) and in_array(privacy, $TAT_tour_ignored))}
+  <fieldset>
+    <legend>{'Privacy'|@translate}</legend>
+    <div class="TAT_description">{'privacy_descrp'|@translate}</div>
+    <form action="{$F_ACTION}" method="post">
+      <input type="hidden" name="submited_tour_path" value="tours/privacy">
       <input type="hidden" name="pwg_token" value="{$pwg_token}">
       <input type="submit" name="button2" id="button2" value="{'Start the Tour'|@translate}">
     </form>