Changeset 29078


Ignore:
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
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/photos_add_direct.php

    r28919 r29078  
    6767// |                           sending html code                           |
    6868// +-----------------------------------------------------------------------+
     69trigger_notify('loc_end_photo_add_direct');
    6970
    7071$template->assign_var_from_handle('ADMIN_CONTENT', 'photos_add');
  • trunk/plugins

    • Property svn:ignore
      •  

        old new  
        1 *
         1AMetaData
         2AdditionalPages
         3Autosize
         4Comments_on_Albums
         5ExtendedDescription
         6GMaps
         7GThumb
         8GrumPluginClasses
         9PWG_Stuffs
         10Panoramas
         11PersonalPlugin
         12SmartAlbums
         13automatic_size
         14dynareceperio
         15event_cats
         16lightbox
         17meta
         18piclens
         19rv_menutree
         20trash
         21user_tags
  • trunk/plugins/TakeATour/css/roma.css

    r29007 r29078  
    5757  background-color: #222;
    5858  border: 1px solid #333333;
    59   box-shadow: 0 5px 10px rgba(170, 170, 170, 0.2);
     59}
     60.popover.right {
     61  box-shadow: -5px 5px 10px rgba(170, 170, 170, 0.2);
     62}
     63.popover.left {
     64  box-shadow: 5px 5px 10px rgba(170, 170, 170, 0.2);
     65}
     66.popover.top {
     67  box-shadow: 0px 5px 10px rgba(170, 170, 170, 0.2);
     68}
     69.popover.bottom {
     70  box-shadow: 0px -5px 10px rgba(170, 170, 170, 0.2);
    6071}
    6172.popover-title, .popover-content {
  • trunk/plugins/TakeATour/language/en_UK/plugin.lang.php

    r29077 r29078  
    1313$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!';
    1414$lang['first_contact_title2'] = '';
    15 $lang['first_contact_stp2'] = 'The link is here. Click Next to continue';
     15$lang['first_contact_stp2'] = 'The link is here. Click on it or click Next to continue';
    1616$lang['first_contact_title3'] = 'Add Photo Page';
    1717$lang['first_contact_stp3'] = 'This first tab is where you add photos directly from your browser. The other tabs are about the other ways to upload photos';
     
    2121$lang['first_contact_stp5'] = 'Then click the button to select photos to send from your computer, or just drag and drop files in the zone above.';
    2222$lang['first_contact_title6'] = '';
    23 $lang['first_contact_stp6'] = 'You see that photos are being listed. Add pictures and when you\'re ready click the button Start Upload';
     23$lang['first_contact_stp6'] = 'You see that photos are being listed. When you\'re ready click the button Start Upload';
    2424$lang['first_contact_title7'] = '';
    25 $lang['first_contact_stp7'] = 'Here a summary of your uploaded pictures. See that Piwigo has generated itself the thumbnails. You can now click to manage all the uploaded pictures in the Batch Manager, edit the properties of a picture by clicking on it or add more photos...';
     25$lang['first_contact_stp7'] = 'Here a summary of your uploaded pictures. See that Piwigo has generated itself the thumbnails. You can:<ul><li>manage all the uploaded pictures in the Batch Manager</li><li>edit the properties of a picture by clicking on it</li><li>add more photos</li></ul>';
    2626$lang['first_contact_title8'] = '';
    2727$lang['first_contact_stp8'] = 'Let\'s edit them! Click on the link.';
    2828$lang['first_contact_title9'] = 'The Batch Manager';
    29 $lang['first_contact_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.';
     29$lang['first_contact_stp9'] = 'You are know in the Batch Manager, where you can batch edit multiple pictures.<br><br>Here the prefilter is already set on "Caddie" because we come from the upload page.';
    3030$lang['first_contact_title10'] = '';
    31 $lang['first_contact_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';
     31$lang['first_contact_stp10'] = 'Here is the link to directly access to your caddie: that\'s a tool for administrators to easily pick pictures when browsing the public part in order to edit them in the Batch Manager.<br><br>You can add photos to the caddie from the public picture page when logged as an admin, or using the action "Add to caddie" on the Batch Manager.';
    3232$lang['first_contact_title11'] = 'How to edit a photos';
    3333$lang['first_contact_stp11'] = 'So you can select from here one or more photos';
    3434$lang['first_contact_title12'] = '';
    35 $lang['first_contact_stp12'] = 'then edit them using and action. But for instance, you can\'t -for now- batch edit descriptions since they are mostly unique';
     35$lang['first_contact_stp12'] = 'then edit them using an action. But for instance, you can\'t batch edit descriptions since they are mostly unique';
    3636$lang['first_contact_title13'] = '';
    3737$lang['first_contact_stp13'] = 'You can edit descriptions and more from the batch manager in unit mode. But for now, let\'s stay in the global mode';
    3838$lang['first_contact_title14'] = '';
    39 $lang['first_contact_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';
     39$lang['first_contact_stp14'] = 'We will see now the <b>edition page</b> of one picture. That page is reachable from here but also from the public picture page when logged as an administrator.<br><br>Hover the thumbnail then click on Edit.';
    4040$lang['first_contact_title15'] = 'The edition page of a picture';
    4141$lang['first_contact_stp15'] = 'On that page you can edit all the properties of a photo, for instance...';
    4242$lang['first_contact_title16'] = '';
    43 $lang['first_contact_stp16'] = 'here to add or remove the photo from albums. The link is virtual, no photos will be physically moved ever.';
     43$lang['first_contact_stp16'] = '...in which album(s) is the photo.<br><br>So here you can add or remove the photo from albums. The link is virtual, no photos will be physically moved ever.';
    4444$lang['first_contact_title17'] = '';
    45 $lang['first_contact_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.';
     45$lang['first_contact_stp17'] = 'Here you can set the photo as a picture representative of any album.<br><br>So you can set a photo in a private album, as a representative of a public album which is great to set custom thumbnails for 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.';
    4646$lang['first_contact_title18'] = 'Manage albums';
    47 $lang['first_contact_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 <em>On album » Manage</em> or hit Next';
     47$lang['first_contact_stp18'] = 'That previous example was just a small overview of tricks and how powerful Piwigo is. So I\'ve told you about private albums, but how can we manage albums? Click <em>On album » Manage</em> or hit Next';
    4848$lang['first_contact_title19'] = 'Manage Albums';
    4949$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 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.';
     
    6060$lang['first_contact_stp24'] = 'Certainly, one of the most important page is the permission page of a private album. Click on the permission tab or click next';
    6161$lang['first_contact_title25'] = 'Album Permission';
    62 $lang['first_contact_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 <em>Administration » Albums » Properties</em> page.';
     62$lang['first_contact_stp25'] = 'As you can read in the Help of your Piwigo -link at the top right-, album permissions are set by groups and users.';
    6363$lang['first_contact_title26'] = '';
    64 $lang['first_contact_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.';
     64$lang['first_contact_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 to browse to the album.';
    6565$lang['first_contact_title27'] = '';
    66 $lang['first_contact_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.';
     66$lang['first_contact_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.<br><br>More details in the Privacy Tour.';
    6767$lang['first_contact_title28'] = 'Configuration';
    6868$lang['first_contact_stp28'] = 'Now we will look at the options available to set Piwigo working your way. Click on Configuration->Options or just hit Next.';
     
    8282$lang['first_contact_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.';
    8383$lang['first_contact_title36'] = 'Themes';
    84 $lang['first_contact_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.';
     84$lang['first_contact_stp36'] = 'Themes have a system of dependency:<ul><li>some theme can\'t be deleted: a parent theme can\'t be deleted if a child theme is enabled</li><li>or others can\'t be enabled: a child theme needs its parent theme</li></ul>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.';
    8585$lang['first_contact_title37'] = 'Themes';
    86 $lang['first_contact_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 <em>Plugin » Manage</em>';
     86$lang['first_contact_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><br>Let\'s discover the plugins now! Click on <em>Plugin » Manage</em>';
    8787$lang['first_contact_title38'] = 'Plugins';
    8888$lang['first_contact_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.';
    8989$lang['first_contact_title39'] = 'Plugins';
    90 $lang['first_contact_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.';
     90$lang['first_contact_stp39'] = 'On that first page, are listed the installed plugins.<br><br>At the top, are listed the plugins activated, which are currently running.<br><br>At the bottom, the plugins which are installed in the /plugins folder, but disabled.<br><br>Deleting a plugin means that any trace of the plugin will be removed (files, options etc). For most of the plugins, a deactivation will keep the data registered by the plugin.';
    9191$lang['first_contact_title40'] = '';
    9292$lang['first_contact_stp40'] = 'Here it\'s me! Don\'t disable me now, but you can see you can Disable or Restore an activated plugin.';
     
    9494$lang['first_contact_stp41'] = 'You can see on the last tab all the plugins available for your version of Piwigo. Hundred of plugins are there!';
    9595$lang['first_contact_title42'] = 'Languages';
    96 $lang['first_contact_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.';
     96$lang['first_contact_stp42'] = 'Piwigo is multilingual. By default, the language displayed by Piwigo change according to the language of the browser of the visitor.<br><br>If the language of the visitor is not available, the language set by default is used.';
    9797$lang['first_contact_title43'] = 'It\'s been a great time';
    98 $lang['first_contact_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.';
     98$lang['first_contact_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><br>You can discover much deeper the features of Piwigo by taking an other tour or reading our documentation, on the piwigo.org website.<br><br>Don\'t forget also the Help link at the upper right corner of any administration page.<p style="text-align:center">Enjoy your Piwigo!</p>';
    9999
    100100
  • trunk/plugins/TakeATour/tours/first_contact/config.inc.php

    r29046 r29078  
    1010{
    1111/* first contact */
     12add_event_handler('loc_end_photo_add_direct', 'TAT_FC_6');
     13add_event_handler('loc_end_photo_add_direct', 'TAT_FC_7');
    1214add_event_handler('loc_end_element_set_global', 'TAT_FC_14');
    1315add_event_handler('loc_end_picture_modify', 'TAT_FC_16');
     
    1618add_event_handler('loc_end_themes_installed', 'TAT_FC_35');
    1719}
    18 
     20     
     21function TAT_FC_7()
     22{
     23  global $template;
     24  $template->set_prefilter('photos_add', 'TAT_FC_7_prefilter');
     25}
     26function TAT_FC_7_prefilter ($content, &$smarty)
     27{
     28  $search = 'UploadComplete: function(up, files) {';
     29  $replacement = 'UploadComplete: function(up, files) {
     30  if (tour.getCurrentStep()==5)
     31  {
     32    tour.goTo(6);
     33  }
     34';
     35  return str_replace($search, $replacement, $content);
     36}
     37function TAT_FC_6()
     38{
     39  global $template;
     40  $template->set_prefilter('photos_add', 'TAT_FC_6_prefilter');
     41}
     42function TAT_FC_6_prefilter ($content, &$smarty)
     43{
     44  $search = 'BeforeUpload:';
     45  $replacement = 'FilesAdded: function() {
     46    if (tour.getCurrentStep()==4)
     47    {
     48      tour.goTo(5);
     49    }
     50 
     51  },
     52  BeforeUpload:';
     53  return str_replace($search, $replacement, $content);
     54}
    1955function TAT_FC_14()
    2056{
  • trunk/plugins/TakeATour/tours/first_contact/tour.tpl

    r29046 r29078  
    1 {footer_script require='jquery.bootstrap-tour'}{literal}
     1{footer_script require='jquery.bootstrap-tour'  load="async"}{literal}
    22
    33var tour = new Tour({
     
    5757    title: "{/literal}{'first_contact_title7'|@translate|@escape:'javascript'}{literal}",
    5858    content: "{/literal}{'first_contact_stp7'|@translate|@escape:'javascript'}{literal}",
    59     prev:4
    60   },
    61   {
    62     path: "{/literal}{$TAT_path}{literal}admin.php?page=photos_add",
    63     placement: "top",
    64     element: "#batchLink",
     59    prev:3,
     60    onPrev: function (tour) {window.location.reload()}
     61  },
     62  {
     63    path: "{/literal}{$TAT_path}{literal}admin.php?page=photos_add",
     64    placement: "top",
     65    element: ".batchLink",
    6566    reflex:true,
    6667    title: "{/literal}{'first_contact_title8'|@translate|@escape:'javascript'}{literal}",
    6768    content: "{/literal}{'first_contact_stp8'|@translate|@escape:'javascript'}{literal}",
    68     prev:4
    69   },
    70   {
    71     path: /admin\.php\?page=(photos_add|batch_manager&filter=prefilter-last_import|prefilter-caddie)/,
    72     redirect:function (tour) {window.location = "admin.php?page=batch_manager&filter=prefilter-last_import";},
    73     placement: "top",
    74     element: "",
     69  },
     70  {
     71    path: /admin\.php\?page=(photos_add|batch_manager&filter=prefilter-last_import|batch_manager&filter=prefilter-caddie)/,
     72    redirect:function (tour) {window.location = "admin.php?page=batch_manager&filter=prefilter-last_import";},
     73    placement: "top",
     74    element: "select[name='filter_prefilter']",
    7575    title: "{/literal}{'first_contact_title9'|@translate|@escape:'javascript'}{literal}",
    76     content: "{/literal}{'first_contact_stp9'|@translate|@escape:'javascript'}{literal}"
    77   },
     76    content: "{/literal}{'first_contact_stp9'|@translate|@escape:'javascript'}{literal}",
     77    prev:3,
     78    onPrev: function (tour) {window.location = "{/literal}{$ABS_U_ADMIN}{literal}admin.php?page=photos_add"}
     79 },
    7880  {//10
    7981    path: /admin\.php\?page=batch_manager&filter=(prefilter-caddie|prefilter-last_import)/,
    8082    redirect:function (tour) {window.location = "admin.php?page=batch_manager&filter=prefilter-last_import";},
    8183    placement: "right",
    82     element: ".icon-flag",
     84    element: "a[href='./admin.php?page=batch_manager&filter=prefilter-caddie']",
    8385    title: "{/literal}{'first_contact_title10'|@translate|@escape:'javascript'}{literal}",
    8486    content: "{/literal}{'first_contact_stp10'|@translate|@escape:'javascript'}{literal}"
     
    151153  {
    152154    path: "{/literal}{$TAT_path}{literal}admin.php?page=cat_list",
    153     placement: "left",
    154     element: "#content",
    155155    title: "{/literal}{'first_contact_title19'|@translate|@escape:'javascript'}{literal}",
    156156    content: "{/literal}{if $TAT_FTP}{'first_contact_stp19'|@translate|@escape:'javascript'}{else}{'first_contact_stp19_b'|@translate|@escape:'javascript'}{/if}{literal}",
     
    173173  },
    174174  {
    175     path: /admin\.php\?page=album-/,
     175    path: /admin\.php\?page=album-[0-9]+(|-properties)$/,
    176176    redirect:function (tour) {window.location = "admin.php?page=album-{/literal}{$TAT_cat_id}{literal}";},
    177177    placement: "top",
     
    181181  },
    182182  {
    183     path: /admin\.php\?page=album-/,
     183    path: /admin\.php\?page=album-[0-9]+(|-properties)$/,
    184184    redirect:function (tour) {window.location = "admin.php?page=album-{/literal}{$TAT_cat_id}{literal}";},
    185185    placement: "top",
     
    189189  },
    190190  {
    191     path: /admin\.php\?page=album-/,
     191    path: /admin\.php\?page=album-[0-9]+(|-properties)$/,
    192192    redirect:function (tour) {window.location = "admin.php?page=album-{/literal}{$TAT_cat_id}{literal}";},
    193193    placement: "bottom",
    194     element: ".tabsheet",
     194    element: "li.normal_tab:nth-child(3) > a:nth-child(1)",
     195    reflex: true,
    195196    title: "{/literal}{'first_contact_title24'|@translate|@escape:'javascript'}{literal}",
    196197    content: "{/literal}{'first_contact_stp24'|@translate|@escape:'javascript'}{literal}"
     
    258259  {
    259260    path: "{/literal}{$TAT_path}{literal}admin.php?page=configuration",
    260     placement: "top",
    261     title: "{/literal}{'first_contact_stp33'|@translate|@escape:'javascript'}{literal}",
     261    placement: "bottom",
     262    element: "li.normal_tab:nth-child(6) > a:nth-child(1)",
     263    title: "{/literal}{'first_contact_title33'|@translate|@escape:'javascript'}{literal}",
    262264    content: "{/literal}{'first_contact_stp33'|@translate|@escape:'javascript'}{literal}",
    263265    prev:30
     
    325327  },
    326328  {
    327     path: "{/literal}{$TAT_path}{literal}admin.php?page=plugin-TakeATour",
    328     placement: "top",
    329     element: "",
     329    path: "{/literal}{$TAT_path}{literal}admin.php",
    330330    title: "{/literal}{'first_contact_title43'|@translate|@escape:'javascript'}{literal}",
    331331    content: "{/literal}{'first_contact_stp43'|@translate|@escape:'javascript'}{literal}"
     
    338338// Start the tour
    339339tour.start();
    340 
    341 jQuery( ".plupload_start" ).click(function() {
    342   if (tour.getCurrentStep()==5)
    343   {
    344     tour.goTo(6);
    345   }
    346 });
    347340{/literal}{/footer_script}
  • trunk/tools/triggers_list.php

    r29066 r29078  
    549549  'vars' => array(),
    550550  'files' => array('include\page_tail.php'),
     551),
     552array(
     553  'name' => 'loc_end_photo_add_direct',
     554  'type' => 'trigger_notify',
     555  'vars' => array(),
     556  'files' => array('admin\photo_add_direct.php'),
    551557),
    552558array(
Note: See TracChangeset for help on using the changeset viewer.