Changeset 28129

Timestamp:

Apr 8, 2014, 11:06:53 PM (10 years ago)

Author:

flop25

Message:

styling
using enable_synchronization

Location:

extensions/TakeATour

Files:

• css/admin.css (modified) (1 diff)
• language/en_UK/plugin.lang.php (modified) (3 diffs)
• main.inc.php (modified) (3 diffs)
• tours/first_contact/config_preparse.inc.php (modified) (1 diff)
• tours/first_contact/tour.tpl (modified) (1 diff)
• tpl/admin.tpl (modified) (1 diff)

extensions/TakeATour/css/admin.css

@@ -1 @@
-#TAT_Content .TAT_description {
+#helpContent .TAT_description {
   text-align: justify;
   text-indent: 1em;
 }
-#TAT_Content form {
+#helpContent form {
   text-align: center;
 }
-#TAT_Content form input {
+#helpContent form input {
   width: 50%;
   margin-top: 10px;
 }
+#helpContent P {
+  text-indent: 1em;
+  text-align: justify;
+}

extensions/TakeATour/language/en_UK/plugin.lang.php

@@ -4 +4 @@
 $lang['Visit your Piwigo!'] = 'Visit your Piwigo!';
 $lang['Take a tour and discover the features of your Piwigo gallery » Go to the available tours'] = 'Take a tour and discover the features of your Piwigo gallery » Go to the available tours';
-$lang[''] = '';
-$lang[''] = '';
-$lang[''] = '';
+$lang['TAT_descrp'] = 'Welcome! Here are listed all the avalaible tours to discover the features of your Piwigo gallery.<br>Launch a tour below, then follow the instructions. Click Next/Prev (or use the arrows of your keyboard) to navigate during a tour. During a tour, 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.';
+$lang['takeatour_configpage'] = 'Take A Tour » List of Tours';
 $lang[''] = '';
 $lang[''] = '';
@@ -16 +15 @@
 $lang['first_contact_descrp'] = 'Recommended for beginners, this tour introduce you Piwigo, its basic features. It will start by adding pictures, then manage them. The tour continues with album management and permissions, and ends on the customization using the configuration, the themes and the plugins.';
 $lang['first_contact_title1'] = 'Welcome in your Piwigo gallery';
-$lang['first_contact_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 in 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['first_contact_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['first_contact_title2'] = '';
 $lang['first_contact_stp2'] = 'The link is here. Click Next to continue';
@@ -53 +52 @@
 $lang['first_contact_title19'] = 'Manage Albums';
 $lang['first_contact_stp19'] = 'Here are listed all the \'top\' albums, the ones at the root of your gallery. If you see an album with a dashed backgroung, it\'s an real physical album from a FTP synchro, which can\'t be moved or deleted from here. The others albums are called virtual albums.';
+$lang['first_contact_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['first_contact_title20'] = 'Manage Albums';
 $lang['first_contact_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.';

extensions/TakeATour/main.inc.php

@@ -33 +33 @@
 elseif ( pwg_get_session_var('tour_to_launch') and defined('IN_ADMIN') and IN_ADMIN)
 {
-  global $conf;
-  if ((isset($conf['TakeATour_tour_ignored']) and !in_array(pwg_get_session_var('tour_to_launch'), $conf['TakeATour_tour_ignored'])) or !isset($conf['TakeATour_tour_ignored']))
-  {
-      add_event_handler('init', 'TAT_add_js_css');
-      include('tours/'.pwg_get_session_var('tour_to_launch').'/config.inc.php');
-  }
+  add_event_handler('init', 'TAT_add_js_css');
+  include('tours/'.pwg_get_session_var('tour_to_launch').'/config.inc.php');
 }
 
@@ -99 +95 @@
   
   $search = '<div class="bigButton"><a href="{$next_step_url}">{\'I want to add photos\'|@translate}</a></div>';
-  $replacement = '<form class="bigButton" action="{$F_ACTION}" method="post">
+  $replacement = '<form style="text-align:center" action="{$F_ACTION}" method="post">
   <input type="hidden" name="submited_tour" value="first_contact">
   <input type="hidden" name="pwg_token" value="{$pwg_token}">
@@ -105 +101 @@
 </form>
 <div class="bigButton"><a href="{$next_step_url}">{\'I want to add photos\'|@translate}</a></div>';
+  $content=str_replace($search, $replacement, $content);
+  $search = '</style>';
+  $replacement = '
+form input[type="submit"] {
+  font-size: 25px;
+  letter-spacing: 2px;
+  margin: 0 5px;
+  padding: 20px;
+  border:none;
+  background-color:#666666;
+  color:#fff;
+  cursor:pointer;
+}
+form input[type="submit"]:hover {
+  background-color:#ff7700;
+  color:white;
+}
+</style>';
   return(str_replace($search, $replacement, $content));
 }

extensions/TakeATour/tours/first_contact/config_preparse.inc.php

@@ -52 +52 @@
     $template->assign('TAT_cat_id', $row['id']);
   }
+  global $conf;
+  if ( isset($conf['enable_synchronization']) )
+  {
+    $template->assign('TAT_FTP', $conf['enable_synchronization']);
+  }
 ?>

extensions/TakeATour/tours/first_contact/tour.tpl

@@ -156 +156 @@
     element: "#content",
     title: "{/literal}{'first_contact_title19'|@translate}{literal}",
-    content: "{/literal}{'first_contact_stp19'|@translate}{literal}",
+    content: "{/literal}{if $TAT_FTP}{'first_contact_stp19'|@translate}{else}{'first_contact_stp19_b'|@translate}{/if}{literal}",
     onPrev: function (tour) {window.location = "admin.php?page=photo-{/literal}{$TAT_image_id}{literal}";},
 

extensions/TakeATour/tpl/admin.tpl

@@ -2 +2 @@
   <h2>{'takeatour_configpage'|@translate}</h2>
 </div>
-<div id="TAT_Content">
+<div id="helpContent">
+  <p>{'TAT_descrp'|@translate}</p>
   {if !isset($TAT_tour_ignored) or (isset($TAT_tour_ignored) and in_array(first_contact, $TAT_tour_ignored))}
   <fieldset>