Changeset 29007

Timestamp:

Jul 8, 2014, 6:41:46 PM (10 years ago)

Author:

flop25

Message:

Take A Tour:
css for roma
en_UK force_fallback'ed
privacy wip

Location:

trunk/plugins/TakeATour

Files:

• css/bootstrap-essential.css (deleted)
• css/bootstrap-tour-standalone.css (added)
• css/bootstrap-tour.min.css (deleted)
• css/clear.css (added)
• css/roma.css (added)
• language/fr_FR/plugin.lang.php (modified) (1 diff)
• main.inc.php (modified) (1 diff)
• tours/first_contact/tour.tpl.bak (added)
• tours/privacy/Text-1.txt (modified) (1 diff)
• tours/privacy/tour.tpl (modified) (36 diffs)
• tpl/js_css.tpl (modified) (1 diff)

trunk/plugins/TakeATour/language/fr_FR/plugin.lang.php

@@ -97 +97 @@
 $lang['first_contact_stp28'] = 'Nous allons maintenant observer les options disponibles pour faire  fonctionner Piwigo à votre façon. Cliquez sur Configuration->Options juste sur Suivant.';
 $lang['first_contact_stp25'] = 'Comme vous pouvez le lire dans l\'aide de votre Piwigo (lien en haut à droite), les permissions sur les albums sont positionnées par groupe ou par utilisateur. Vous pouvez rendre publique/privé plusieurs albums simultanément en utilisant la page d\'administration des propriétés des albums.';
-$lang['2_7_0_stp10'] = '';
-$lang['2_7_0_stp4'] = '';
-$lang['2_7_0_stp5'] = '';
-$lang['2_7_0_stp6'] = '';
-$lang['2_7_0_stp7'] = '';
-$lang['2_7_0_stp8'] = '';
-$lang['2_7_0_stp9'] = '';
-$lang['2_7_0_title10'] = '';
-$lang['2_7_0_title4'] = '';
-$lang['2_7_0_title5'] = '';
-$lang['2_7_0_title6'] = '';
-$lang['2_7_0_title7'] = '';
-$lang['2_7_0_title8'] = '';
-$lang['2_7_0_title9'] = '';
 $lang['2_7_0_stp3'] = 'La recherche rapide a été retravaillée :<br/>
 - ajout de l\'opérateur OR<br/>

trunk/plugins/TakeATour/main.inc.php

@@ -42 +42 @@
 function TAT_tour_setup()
 {
-  global $template, $TAT_restart;
+  global $template, $TAT_restart, $conf;
   $tour_to_launch=pwg_get_session_var('tour_to_launch');
-  load_language('plugin.lang', PHPWG_PLUGINS_PATH .'TakeATour/');
-  load_language('lang', PHPWG_ROOT_PATH.PWG_LOCAL_DIR, array('no_fallback'=>true, 'local'=>true) );
+  load_language('plugin.lang', PHPWG_PLUGINS_PATH .'TakeATour/', array('force_fallback'=>'en_UK'));
   $template->set_filename('TAT_js_css', PHPWG_PLUGINS_PATH.'TakeATour/tpl/js_css.tpl');
-  $template->parse('TAT_js_css');//http://piwigo.org/forum/viewtopic.php?id=23248
+  $template->assign(
+  array(
+    'ADMIN_THEME'    => $conf['admin_theme'],
+    )
+  );
+  $template->parse('TAT_js_css');
   if (isset($TAT_restart) and $TAT_restart)
   {

trunk/plugins/TakeATour/tours/privacy/Text-1.txt

@@ -1 +1 @@
 $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 your Piwigo gallery';
-$lang['privacy_stp1'] = 'Hello! I will be your guide to discover 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 by adding pictures!';
-$lang['privacy_title2'] = '';
-$lang['privacy_stp2'] = 'The link is here. Click Next to continue';
-$lang['privacy_title3'] = 'Add Photo Page';
-$lang['privacy_stp3'] = 'This first tab is where you add photos directly from your browser. The other tabs are about the other ways to upload photos';
-$lang['privacy_title4'] = 'Lets add photo!';
-$lang['privacy_stp4'] = 'First choose an album; create one if there is no album yet.';
-$lang['privacy_title5'] = '';
-$lang['privacy_stp5'] = 'Then click the button to select photos to send from your computer';
-$lang['privacy_title6'] = '';
-$lang['privacy_stp6'] = 'You see that photos are being listed. Add at least 2 pictures and when you\'re ready click the button Start Upload';
-$lang['privacy_title7'] = '';
-$lang['privacy_stp7'] = 'Here a summary of your uploaded pictures. See that Piwigo has generated itself the thumbnails. You can know add more photos with the link at the bottom, edit the properties of a picture by clicking on it, or click to manage all the uploaded pictures in the Batch Manager...';
-$lang['privacy_title8'] = '';
-$lang['privacy_stp8'] = 'Let\'s edit them! Click on the link. If you don\'t see it click Prev to add at least 2 photos.';
-$lang['privacy_title9'] = 'The Batch Manager';
-$lang['privacy_stp9'] = 'You are know in the Batch Manager, where you can batch edit multiple pictures. Here the Caddy is set as a filter because we comes from the upload result page.';
-$lang['privacy_title10'] = '';
+$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';

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

@@ -23 +23 @@
   {
     path: "{/literal}{$TAT_path}{literal}admin.php",
-    title: "{/literal}{'2_7_0_title1'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'2_7_0_stp1'|@translate|@escape:'javascript'}{literal}"
+    title: "{/literal}{'privacy_title1'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp1'|@translate|@escape:'javascript'}{literal}"
   },
   {
     path: "{/literal}{$TAT_path}{literal}admin.php",
-    placement: "right",
-    element: ".icon-plus-circled",
-    reflex:true,
-    title: "{/literal}{'first_contact_title2'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp2'|@translate|@escape:'javascript'}{literal}",
-  },
-  {
-    path: "{/literal}{$TAT_path}{literal}admin.php?page=photos_add",
-    placement: "bottom",
-    element: ".selected_tab",
-    title: "{/literal}{'first_contact_title3'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp3'|@translate|@escape:'javascript'}{literal}",
-  },
-  {
-    path: "{/literal}{$TAT_path}{literal}admin.php?page=photos_add",
-    placement: "left",
-    element: "#albumSelection",
-    title: "{/literal}{'first_contact_title4'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp4'|@translate|@escape:'javascript'}{literal}"
+    placement: "bottom",
+    element: ".icon-help-circled",
+    title: "{/literal}{'privacy_title2'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp2'|@translate|@escape:'javascript'}{literal}",
+  },
+  {
+    path: "{/literal}{$TAT_path}{literal}admin.php?page=help&section=permissions",
+    placement: "top",
+    element: "#helpContent",
+    title: "{/literal}{'privacy_title3'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp3'|@translate|@escape:'javascript'}{literal}",
+  },
+  {
+    path: "{/literal}{$TAT_path}{literal}admin.php?page=help&section=permissions",
+    placement: "top",
+    element: "#helpContent",
+    title: "{/literal}{'privacy_title4'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp4'|@translate|@escape:'javascript'}{literal}"
   },
   {//5
-    path: "{/literal}{$TAT_path}{literal}admin.php?page=photos_add",
+    path: "{/literal}{$TAT_path}{literal}admin.php?page=help&section=groups",
     placement: "top",
     element: "#uploadify",
-    title: "{/literal}{'first_contact_title5'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp5'|@translate|@escape:'javascript'}{literal}"
+    title: "{/literal}{'privacy_title5'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp5'|@translate|@escape:'javascript'}{literal}"
   },
   {
@@ -60 +59 @@
     placement: "left",
     element: "#fileQueue",
-    title: "{/literal}{'first_contact_title6'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp6'|@translate|@escape:'javascript'}{literal}"
+    title: "{/literal}{'privacy_title6'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp6'|@translate|@escape:'javascript'}{literal}"
   },
   {
@@ -68 +67 @@
     placement: "top",
     element: "#photosAddContent legend",
-    title: "{/literal}{'first_contact_title7'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp7'|@translate|@escape:'javascript'}{literal}",
+    title: "{/literal}{'privacy_title7'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp7'|@translate|@escape:'javascript'}{literal}",
     prev:4
   },
@@ -78 +77 @@
     element: "#batchLink",
     reflex:true,
-    title: "{/literal}{'first_contact_title8'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp8'|@translate|@escape:'javascript'}{literal}",
+    title: "{/literal}{'privacy_title8'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp8'|@translate|@escape:'javascript'}{literal}",
     prev:4
   },
@@ -87 +86 @@
     placement: "top",
     element: "",
-    title: "{/literal}{'first_contact_title9'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp9'|@translate|@escape:'javascript'}{literal}"
+    title: "{/literal}{'privacy_title9'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp9'|@translate|@escape:'javascript'}{literal}"
   },
   {//10
@@ -95 +94 @@
     placement: "right",
     element: ".icon-flag",
-    title: "{/literal}{'first_contact_title10'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp10'|@translate|@escape:'javascript'}{literal}"
+    title: "{/literal}{'privacy_title10'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp10'|@translate|@escape:'javascript'}{literal}"
   },
   {
@@ -103 +102 @@
     placement: "left",
     element: "#checkActions",
-    title: "{/literal}{'first_contact_title11'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp11'|@translate|@escape:'javascript'}{literal}"
+    title: "{/literal}{'privacy_title11'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp11'|@translate|@escape:'javascript'}{literal}"
   },
   {
@@ -111 +110 @@
     placement: "top",
     element: "#action",
-    title: "{/literal}{'first_contact_title12'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp12'|@translate|@escape:'javascript'}{literal}"
+    title: "{/literal}{'privacy_title12'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp12'|@translate|@escape:'javascript'}{literal}"
   },
   {
@@ -119 +118 @@
     placement: "bottom",
     element: "#tabsheet .normal_tab",
-    title: "{/literal}{'first_contact_title13'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp13'|@translate|@escape:'javascript'}{literal}"
+    title: "{/literal}{'privacy_title13'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp13'|@translate|@escape:'javascript'}{literal}"
   },
   {
@@ -128 +127 @@
     element: "#TAT_FC_14",
     reflex:true,
-    title: "{/literal}{'first_contact_title14'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp14'|@translate|@escape:'javascript'}{literal}",
+    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}";}
   },
@@ -137 +136 @@
     placement: "bottom",
     element: ".selected_tab",
-    title: "{/literal}{'first_contact_title15'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp15'|@translate|@escape:'javascript'}{literal}"
+    title: "{/literal}{'privacy_title15'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp15'|@translate|@escape:'javascript'}{literal}"
   },
   {
@@ -145 +144 @@
     placement: "top",
     element: "#TAT_FC_16",
-    title: "{/literal}{'first_contact_title16'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp16'|@translate|@escape:'javascript'}{literal}"
+    title: "{/literal}{'privacy_title16'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp16'|@translate|@escape:'javascript'}{literal}"
   },
   {
@@ -153 +152 @@
     placement: "top",
     element: "#TAT_FC_17",
-    title: "{/literal}{'first_contact_title17'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp17'|@translate|@escape:'javascript'}{literal}"
+    title: "{/literal}{'privacy_title17'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp17'|@translate|@escape:'javascript'}{literal}"
   },
   {
@@ -160 +159 @@
     redirect:function (tour) {window.location = "admin.php?page=photo-{/literal}{$TAT_image_id}{literal}";},
     placement: "top",
-    title: "{/literal}{'first_contact_title18'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp18'|@translate|@escape:'javascript'}{literal}"
+    title: "{/literal}{'privacy_title18'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp18'|@translate|@escape:'javascript'}{literal}"
   },
   {
@@ -167 +166 @@
     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}",
+    title: "{/literal}{'privacy_title19'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{if $TAT_FTP}{'privacy_stp19'|@translate|@escape:'javascript'}{else}{'privacy_stp19_b'|@translate|@escape:'javascript'}{/if}{literal}",
     onPrev: function (tour) {window.location = "admin.php?page=photo-{/literal}{$TAT_image_id}{literal}";},
 
@@ -176 +175 @@
     placement: "top",
     element: "#categoryOrdering",
-    title: "{/literal}{'first_contact_title20'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp20'|@translate|@escape:'javascript'}{literal}"
+    title: "{/literal}{'privacy_title20'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp20'|@translate|@escape:'javascript'}{literal}"
   },
   {
@@ -183 +182 @@
     placement: "left",
     element: "#tabsheet:first-child",
-    title: "{/literal}{'first_contact_title21'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp21'|@translate|@escape:'javascript'}{literal}"
+    title: "{/literal}{'privacy_title21'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp21'|@translate|@escape:'javascript'}{literal}"
   },
   {
@@ -191 +190 @@
     placement: "top",
     element: ".selected_tab",
-    title: "{/literal}{'first_contact_title22'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp22'|@translate|@escape:'javascript'}{literal}"
+    title: "{/literal}{'privacy_title22'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp22'|@translate|@escape:'javascript'}{literal}"
   },
   {
@@ -199 +198 @@
     placement: "top",
     element: "#TAT_FC_23",
-    title: "{/literal}{'first_contact_title23'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp23'|@translate|@escape:'javascript'}{literal}"
+    title: "{/literal}{'privacy_title23'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp23'|@translate|@escape:'javascript'}{literal}"
   },
   {
@@ -207 +206 @@
     placement: "bottom",
     element: ".tabsheet",
-    title: "{/literal}{'first_contact_title24'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp24'|@translate|@escape:'javascript'}{literal}"
+    title: "{/literal}{'privacy_title24'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp24'|@translate|@escape:'javascript'}{literal}"
   },
   {//25
@@ -215 +214 @@
     placement: "left",
     element: "#content",
-    title: "{/literal}{'first_contact_title25'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp25'|@translate|@escape:'javascript'}{literal}"
+    title: "{/literal}{'privacy_title25'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp25'|@translate|@escape:'javascript'}{literal}"
   },
   {
@@ -223 +222 @@
     placement: "top",
     element: "#selectStatus",
-    title: "{/literal}{'first_contact_title26'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp26'|@translate|@escape:'javascript'}{literal}"
+    title: "{/literal}{'privacy_title26'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp26'|@translate|@escape:'javascript'}{literal}"
   },
   {
@@ -231 +230 @@
     placement: "top",
     element: "#selectStatus",
-    title: "{/literal}{'first_contact_title27'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp27'|@translate|@escape:'javascript'}{literal}"
+    title: "{/literal}{'privacy_title27'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp27'|@translate|@escape:'javascript'}{literal}"
   },
   {
@@ -238 +237 @@
     redirect:function (tour) {window.location = "admin.php?page=album-{/literal}{$TAT_cat_id}{literal}-permissions";},
     placement: "top",
-    title: "{/literal}{'first_contact_title28'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp28'|@translate|@escape:'javascript'}{literal}"
-  },
-  {
-    path: "{/literal}{$TAT_path}{literal}admin.php?page=configuration",
-    placement: "top",
-    element: "",
-    title: "{/literal}{'first_contact_title29'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp29'|@translate|@escape:'javascript'}{literal}"
+    title: "{/literal}{'privacy_title28'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp28'|@translate|@escape:'javascript'}{literal}"
+  },
+  {
+    path: "{/literal}{$TAT_path}{literal}admin.php?page=configuration",
+    placement: "top",
+    element: "",
+    title: "{/literal}{'privacy_title29'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp29'|@translate|@escape:'javascript'}{literal}"
   },
   {//30
@@ -252 +251 @@
     placement: "right",
     element: "#gallery_title",
-    title: "{/literal}{'first_contact_title30'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp30'|@translate|@escape:'javascript'}{literal}"
+    title: "{/literal}{'privacy_title30'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp30'|@translate|@escape:'javascript'}{literal}"
   },
   {
@@ -259 +258 @@
     placement: "right",
     element: "#page_banner",
-    title: "{/literal}{'first_contact_title31'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp31'|@translate|@escape:'javascript'}{literal}"
+    title: "{/literal}{'privacy_title31'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp31'|@translate|@escape:'javascript'}{literal}"
   },
   {
@@ -267 +266 @@
     placement: "top",
     element: ".formButtons input",
-    title: "{/literal}{'first_contact_title32'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp32'|@translate|@escape:'javascript'}{literal}"
-  },
-  {
-    path: "{/literal}{$TAT_path}{literal}admin.php?page=configuration",
-    placement: "top",
-    title: "{/literal}{'first_contact_stp33'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp33'|@translate|@escape:'javascript'}{literal}",
+    title: "{/literal}{'privacy_title32'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp32'|@translate|@escape:'javascript'}{literal}"
+  },
+  {
+    path: "{/literal}{$TAT_path}{literal}admin.php?page=configuration",
+    placement: "top",
+    title: "{/literal}{'privacy_stp33'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp33'|@translate|@escape:'javascript'}{literal}",
     prev:30
   },
@@ -281 +280 @@
     placement: "top",
     element: "",
-    title: "{/literal}{'first_contact_title34'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp34'|@translate|@escape:'javascript'}{literal}"
+    title: "{/literal}{'privacy_title34'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp34'|@translate|@escape:'javascript'}{literal}"
   },
   {//35
@@ -288 +287 @@
     placement: "top",
     element: "#TAT_FC_35",
-    title: "{/literal}{'first_contact_title35'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp35'|@translate|@escape:'javascript'}{literal}"
+    title: "{/literal}{'privacy_title35'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp35'|@translate|@escape:'javascript'}{literal}"
   },
   {
@@ -295 +294 @@
     placement: "top",
     element: "",
-    title: "{/literal}{'first_contact_title36'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp36'|@translate|@escape:'javascript'}{literal}"
+    title: "{/literal}{'privacy_title36'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp36'|@translate|@escape:'javascript'}{literal}"
   },
   {
@@ -302 +301 @@
     placement: "right",
     element: ".tabsheet",
-    title: "{/literal}{'first_contact_title37'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp37'|@translate|@escape:'javascript'}{literal}"
+    title: "{/literal}{'privacy_title37'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp37'|@translate|@escape:'javascript'}{literal}"
   },
   {
@@ -309 +308 @@
     placement: "left",
     element: "",
-    title: "{/literal}{'first_contact_title38'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp38'|@translate|@escape:'javascript'}{literal}"
+    title: "{/literal}{'privacy_title38'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp38'|@translate|@escape:'javascript'}{literal}"
   },
   {
@@ -316 +315 @@
     placement: "left",
     element: "#content",
-    title: "{/literal}{'first_contact_title39'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp39'|@translate|@escape:'javascript'}{literal}"
+    title: "{/literal}{'privacy_title39'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp39'|@translate|@escape:'javascript'}{literal}"
   },
   {//40
@@ -323 +322 @@
     placement: "bottom",
     element: "#TakeATour",
-    title: "{/literal}{'first_contact_title40'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp40'|@translate|@escape:'javascript'}{literal}"
+    title: "{/literal}{'privacy_title40'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp40'|@translate|@escape:'javascript'}{literal}"
   },
   {
@@ -330 +329 @@
     placement: "right",
     element: ".tabsheet",
-    title: "{/literal}{'first_contact_title41'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp41'|@translate|@escape:'javascript'}{literal}"
+    title: "{/literal}{'privacy_title41'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp41'|@translate|@escape:'javascript'}{literal}"
   },
   {
     path: "{/literal}{$TAT_path}{literal}admin.php?page=languages",
-    title: "{/literal}{'first_contact_title42'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp42'|@translate|@escape:'javascript'}{literal}"
+    title: "{/literal}{'privacy_title42'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp42'|@translate|@escape:'javascript'}{literal}"
   },
   {
@@ -342 +341 @@
     placement: "top",
     element: "",
-    title: "{/literal}{'first_contact_title43'|@translate|@escape:'javascript'}{literal}",
-    content: "{/literal}{'first_contact_stp43'|@translate|@escape:'javascript'}{literal}"
+    title: "{/literal}{'privacy_title43'|@translate|@escape:'javascript'}{literal}",
+    content: "{/literal}{'privacy_stp43'|@translate|@escape:'javascript'}{literal}"
   }
 ]);

trunk/plugins/TakeATour/tpl/js_css.tpl

@@ -1 +1 @@
 {combine_script id='jquery.bootstrap-tour' load='header' require='jquery' path='plugins/TakeATour/js/custom-bootstrap-tour-standalone.js'}
-{combine_css path="plugins/TakeATour/css/bootstrap-essential.css"}
-{combine_css path="plugins/TakeATour/css/bootstrap-tour.min.css"}
+{combine_css path="plugins/TakeATour/css/bootstrap-tour-standalone.css"}
+{if $ADMIN_THEME=='clear'}{combine_css path="plugins/TakeATour/css/clear.css"}{/if}
+{if $ADMIN_THEME=='roma'}{combine_css path="plugins/TakeATour/css/roma.css"}{/if}