API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Oct 5th, 2011
138
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 12.94 KB | None | 0 0
raw download clone embed print report
  1. diff -ur wp-photo-album-plus-old/theme/wppa-style.css wp-photo-album-plus/theme/wppa-style.css
  2. --- wp-photo-album-plus-old/theme/wppa-style.css    2011-10-03 15:37:47.000000000 +0200
  3. +++ wp-photo-album-plus/theme/wppa-style.css    2011-10-05 18:11:00.000000000 +0200
  4. @@ -255,3 +255,27 @@
  5.  /* display: none; */ /* to remove the slideshow / browse photos link frm the album covers */
  6.  }
  7.  
  8. +.wppa-numberbar {
  9. +    position: absolute;
  10. +    bottom: 20px;
  11. +    right: 0;
  12. +    margin-right: 10px;
  13. +    z-index: 1000;
  14. +}
  15. +
  16. +.wppa-numberbar a {
  17. +    display: block;
  18. +    float: left;
  19. +    width: 24px;
  20. +    height: 24px;
  21. +    line-height: 24px;
  22. +    text-align: center;
  23. +    background-color: #ffd800;
  24. +    color: #fff;
  25. +    margin-right: 10px;
  26. +    font-weight: bold;
  27. +}
  28. +
  29. +.wppa-numberbar a.wppa-numbar-current{
  30. +    background-color: #000;
  31. +}
  32. diff -ur wp-photo-album-plus-old/wppa-common-functions.php wp-photo-album-plus/wppa-common-functions.php
  33. --- wp-photo-album-plus-old/wppa-common-functions.php   2011-10-03 15:37:47.000000000 +0200
  34. +++ wp-photo-album-plus/wppa-common-functions.php   2011-10-05 17:09:07.000000000 +0200
  35. @@ -38,6 +38,7 @@
  36.             'browse_on' => '0',
  37.             'name_on' => '0',
  38.             'desc_on' => '0',
  39. +                        'numbar_on' => '0',
  40.             'single_photo' => '',
  41.             'is_mphoto' => '0',
  42.             'start_album' => '',
  43. @@ -235,7 +236,8 @@
  44.             'wppa_apply_newphoto_desc' => '',
  45.             'wppa_newphoto_description' => '',
  46.             'wppa_comments_desc' => '',
  47. -           'wppa_user_upload_on' => ''
  48. +           'wppa_user_upload_on' => '',
  49. +                        'wppa_show_slideshownumbar'  => 'no'
  50.  
  51.         );
  52.         array_walk($wppa_opt, 'wppa_set_options');
  53. diff -ur wp-photo-album-plus-old/wppa-settings.php wp-photo-album-plus/wppa-settings.php
  54. --- wp-photo-album-plus-old/wppa-settings.php   2011-10-03 15:37:47.000000000 +0200
  55. +++ wp-photo-album-plus/wppa-settings.php   2011-10-05 17:09:08.000000000 +0200
  56. @@ -190,9 +190,10 @@
  57.             wppa_update_check('wppa_show_cover_text');
  58.             wppa_update_check('wppa_show_comments');
  59.             wppa_update_check('wppa_show_bbb');
  60. -           wppa_update_check('wppa_show_slideshowbrowselink');
  61. +           wppa_update_check('wppa_show_slideshowbrowselink');                        
  62.             wppa_update_check('wppa_custom_on');
  63.             wppa_update_textarea('wppa_custom_content');
  64. +                        wppa_update_check('wppa_show_slideshownumbar');
  65.        
  66.             // Table 3: Backgrounds
  67.             wppa_update_value('wppa_bgcolor_even');
  68. @@ -739,7 +740,7 @@
  69.                         $slug = 'wppa_show_browse_navigation';
  70.                         $html = wppa_checkbox($slug);
  71.                         wppa_setting($slug, '7', $name, $desc, $html, $help);
  72. -                      
  73. +                                                
  74.                         $name = __('Filmstrip', 'wppa');
  75.                         $desc = __('Show Filmstrip navigation bar.', 'wppa');
  76.                         $help = esc_js(__('If checked: display the filmstrip navigation bar under the full_size images and slideshow', 'wppa'));
  77. @@ -843,8 +844,8 @@
  78.                         $slug = 'wppa_show_slideshowbrowselink';
  79.                         $html = wppa_checkbox($slug);
  80.                         wppa_setting($slug, '20', $name, $desc, $html, $help);
  81. -                      
  82. -                       $name = __('Show custom box', 'wppa');
  83. +                                                
  84. +                           $name = __('Show custom box', 'wppa');
  85.                         $desc = __('Display the custom box in the slideshow', 'wppa');
  86.                         $help = esc_js(__('You can fill the custom box with any html you like. It will not be checked, so it is your own responsability to close tags properly.', 'wppa'));
  87.                         $help .= '\n\n'.esc_js(__('The position of the box can be defined in Table IX item 6.', 'wppa'));
  88. @@ -859,6 +860,13 @@
  89.                         $slug = 'wppa_custom_content';
  90.                         $html = wppa_textarea($slug);
  91.                         wppa_setting($slug, '22', $name, $desc, $html, $help);
  92. +                                                
  93. +                                                $name = __('Slideshow/Number bar', 'wppa');
  94. +                       $desc = __('Display the Slideshow / Number bar.', 'wppa');
  95. +                       $help = esc_js(__('If checked: display the number boxes on slideshow', 'wppa'));
  96. +                       $slug = 'wppa_show_slideshownumbar';
  97. +                       $html = wppa_checkbox($slug);
  98. +                       wppa_setting($slug, '23', $name, $desc, $html, $help);
  99.                        
  100.                         ?>
  101.                     </tbody>
  102. diff -ur wp-photo-album-plus-old/wppa-setup.php wp-photo-album-plus/wppa-setup.php
  103. --- wp-photo-album-plus-old/wppa-setup.php  2011-10-03 15:37:47.000000000 +0200
  104. +++ wp-photo-album-plus/wppa-setup.php  2011-10-05 17:09:08.000000000 +0200
  105. @@ -335,7 +335,8 @@
  106.                         'wppa_apply_newphoto_desc'      => 'no',
  107.                         'wppa_newphoto_description'     => $wppa_npd,
  108.                         'wppa_comments_desc'            => 'no',
  109. -                       'wppa_user_upload_on'           => 'no'
  110. +                       'wppa_user_upload_on'           => 'no',
  111. +                                                'wppa_show_slideshownumbar'             => 'no'
  112.  
  113.                         );
  114.    
  115. diff -ur wp-photo-album-plus-old/wppa-slideshow.js wp-photo-album-plus/wppa-slideshow.js
  116. --- wp-photo-album-plus-old/wppa-slideshow.js   2011-10-03 15:37:47.000000000 +0200
  117. +++ wp-photo-album-plus/wppa-slideshow.js   2011-10-05 17:09:08.000000000 +0200
  118. @@ -172,7 +172,9 @@
  119.  function wppaGoto(mocc, idx) {
  120.     if ( ! _wppaSlideShowRuns[mocc] ) {
  121.         _wppaGoto(mocc, idx);
  122. -   }
  123. +   }else{
  124. +                _wppaGotoRunning(mocc,idx);
  125. +        }
  126.  }
  127.  
  128.  function wppaValidateComment(mocc) {
  129. @@ -183,6 +185,8 @@
  130.     _wppaLog('NextSlide', mocc);
  131.  
  132.     if ( ! _wppaSlideShowRuns[mocc] && mode == 'auto' ) return; // Kill an old timed request, while stopped
  133. +        if ( _wppaSlides[mocc].length < 2 && !_wppaFirst[mocc] ) return; //Do not animate single image
  134. +        if ( ! _wppaSlideShowRuns[mocc] && mode == 'reset' ) _wppaSlideShowRuns[mocc] = true;
  135.     // Set the busy flag
  136.     _wppaIsBusy[mocc] = true;
  137.  
  138. @@ -194,6 +198,8 @@
  139.         _wppaNextIndex[mocc] = _wppaCurrentIndex[mocc] + 1;
  140.         if (_wppaNextIndex[mocc] == _wppaSlides[mocc].length) _wppaNextIndex[mocc] = 0;
  141.     }
  142. +        jQuery('[id^=wppanumbar-' + mocc + '-]').removeClass("wppa-numbar-current");
  143. +        jQuery("#wppanumbar-" + mocc + "-" + _wppaNextIndex[mocc]).addClass("wppa-numbar-current");
  144.      // first:
  145.      if (_wppaFirst[mocc]) {
  146.         if (_wppaCurrentIndex[mocc] != -1) {
  147. @@ -403,6 +409,31 @@
  148.     jQuery(".arrow-"+mocc).stop().fadeTo(400,0.2);
  149.     _wppaNextSlide(mocc, 0);
  150.  }
  151. +function _wppaGotoRunning(mocc, idx) {
  152. +    //wait until not bussy
  153. +    if (_wppaIsBusy[mocc]) {
  154. +        setTimeout('_wppaGotoRunning('+mocc+',' + idx + ')', 10);  // Try again after 10 ms
  155. +        return;
  156. +    }
  157. +    
  158. +    _wppaLog('GotoRunning', mocc);
  159. +    
  160. +    _wppaSlideShowRuns[mocc] = false; // we don't want timed loop to occur during our work
  161. +    
  162. +    _wppaToTheSame = (_wppaNextIndex[mocc] == idx);
  163. +    _wppaNextIndex[mocc] = idx;
  164. +    _wppaNextSlide(mocc, "manual"); // enqueue new transition
  165. +    
  166. +    _wppaGotoContinue(mocc);
  167. +}
  168. +
  169. +function _wppaGotoContinue(mocc){
  170. +       if (_wppaIsBusy[mocc]) {
  171. +       setTimeout('_wppaGotoContinue('+mocc+')', 10);  // Try again after 10 ms
  172. +       return;
  173. +   }
  174. +        setTimeout('_wppaNextSlide('+mocc+', "reset")', _wppaTimeOut[mocc] + 10); //restart slideshow after new timeout
  175. +}
  176.  
  177.  function _wppaStart(mocc, idx) {
  178.     _wppaLog('Start', mocc);
  179. diff -ur wp-photo-album-plus-old/wppa-slideshow.php wp-photo-album-plus/wppa-slideshow.php
  180. --- wp-photo-album-plus-old/wppa-slideshow.php  2011-10-03 15:37:47.000000000 +0200
  181. +++ wp-photo-album-plus/wppa-slideshow.php  2011-10-05 17:09:08.000000000 +0200
  182. @@ -94,7 +94,9 @@
  183.         $wppa['out'] .= wppa_nltab().'<img id="bbb-'.$wppa['master_occur'].'-l" class="bbb-'.$wppa['master_occur'].'" src="'.wppa_get_imgdir().'bbbl.png" style=" opacity:0; filter:alpha(opacity=0); border:none; z-index:903; position: absolute; left:0px; top: 0px; width: '.($wppa['slideframewidth']*0.5).'px; height: '.$wppa['slideframeheight'].'px; box-shadow: none; cursor:default;" onmouseover="wppaBbb('.$wppa['master_occur'].',\'l\',\'show\')" onmouseout="wppaBbb('.$wppa['master_occur'].',\'l\',\'hide\')" onclick="wppaBbb('.$wppa['master_occur'].',\'l\',\'click\')" />';
  184.         $wppa['out'] .= wppa_nltab().'<img id="bbb-'.$wppa['master_occur'].'-r" class="bbb-'.$wppa['master_occur'].'" src="'.wppa_get_imgdir().'bbbr.png" style=" opacity:0; filter:alpha(opacity=0); border:none; z-index:903; position: absolute; left:'.($wppa['slideframewidth']*0.5).'px;top: 0px; width: '.($wppa['slideframewidth']*0.5).'px; height: '.$wppa['slideframeheight'].'px; box-shadow: none; cursor:default;" onmouseover="wppaBbb('.$wppa['master_occur'].',\'r\',\'show\')" onmouseout="wppaBbb('.$wppa['master_occur'].',\'r\',\'hide\')" onclick="wppaBbb('.$wppa['master_occur'].',\'r\',\'click\')" />';
  185.  } /***/
  186. -      
  187. +        
  188. +        wppa_numberbar();     
  189. +        
  190.     $wppa['out'] .= wppa_nltab('-').'</div>';
  191.  }
  192.  
  193. @@ -313,6 +315,33 @@
  194.     }
  195.  }
  196.  
  197. +function wppa_numberbar($opt = ''){
  198. +global $wppa;
  199. +global $wppa_opt;
  200. +        if (is_feed()) {
  201. +                //don't know if it works with feeds, so switch off
  202. +       return;
  203. +   }
  204. +        $do_it = false;
  205. +        if($wppa_opt["wppa_show_slideshownumbar"] && !$wppa['is_slideonly']) $do_it = true;
  206. +        if ($wppa['numbar_on']) $do_it = true;        
  207. +        if(!$do_it){
  208. +            return;
  209. +        }
  210. +        $thumbs = wppa_get_thumbs($alb);
  211. +   if (!$thumbs || count($thumbs) < 1) return;
  212. +        $wppa['out'] .= wppa_nltab('+') . '<div class="wppa-numberbar">';
  213. +        $numid = 0;
  214. +       foreach ($thumbs as $tt) :
  215. +            $wppa['out'] .= wppa_nltab('+') . '<a href="" id="wppanumbar-'.$wppa['master_occur'].'-'.$numid.'" ' . ($numid == 0 ? ' class="wppa-numbar-current" ' : '') .' onclick="wppaGoto('.$wppa['master_occur'].',' . $numid . ');return false;">';
  216. +                $wppa['out'] .= wppa_nltab() . $numid + 1;
  217. +            $wppa['out'] .= wppa_nltab('-') . '</a>';
  218. +            $numid++;
  219. +   endforeach;
  220. +        $wppa['out'] .= wppa_nltab('-') . '</div>';                        
  221. +
  222. +}
  223. +
  224.  
  225.  function wppa_browsebar($opt = '') {
  226.  global $wppa;
  227. diff -ur wp-photo-album-plus-old/wppa-slideshow-widget.php wp-photo-album-plus/wppa-slideshow-widget.php
  228. --- wp-photo-album-plus-old/wppa-slideshow-widget.php   2011-10-03 15:37:47.000000000 +0200
  229. +++ wp-photo-album-plus/wppa-slideshow-widget.php   2011-10-05 17:09:08.000000000 +0200
  230. @@ -43,6 +43,7 @@
  231.                                             'film'      => 'no',
  232.                                             'browse'    => 'no',
  233.                                             'name'      => 'no',
  234. +                                                                                        'numbar'   => 'no',
  235.                                             'desc'      => 'no'
  236.                                             ) );
  237.  
  238. @@ -59,6 +60,7 @@
  239.         $film       = $instance['film'];
  240.         $browse     = $instance['browse'];
  241.         $name       = $instance['name'];
  242. +                $numbar        = $instance['numbar'];
  243.         $desc       = $instance['desc'];
  244.        
  245.         if (is_numeric($album)) {
  246. @@ -79,9 +81,11 @@
  247.                     $wppa['film_on'] = ($film == 'yes');
  248.                     $wppa['browse_on'] = ($browse == 'yes');
  249.                     $wppa['name_on'] = ($name == 'yes');
  250. +                                        $wppa['numbar_on'] = ($numbar == 'yes');
  251.                     $wppa['desc_on'] = ($desc == 'yes');
  252.                         echo wppa_albums($album, 'slideonly', $width, 'center');
  253.                     $wppa['desc_on'] = false;
  254. +                                        $wppa['numbar_on'] = false;
  255.                     $wppa['name_on'] = false;
  256.                     $wppa['browse_on'] = false;
  257.                     $wppa['film_on'] = false;
  258. @@ -133,6 +137,7 @@
  259.         $instance['film'] = $new_instance['film'];
  260.         $instance['browse'] = $new_instance['browse'];
  261.         $instance['name'] = $new_instance['name'];
  262. +                $instance['numbar'] = $new_instance['numbar'];
  263.         $instance['desc'] = $new_instance['desc'];
  264.        
  265.          return $instance;
  266. @@ -157,6 +162,7 @@
  267.                                             'film'      => 'no',
  268.                                             'browse'    => 'no',
  269.                                             'name'      => 'no',
  270. +                                                                                        'numbar'       => 'no',
  271.                                             'desc'      => 'no'
  272.                                             ) );
  273.                                            
  274. @@ -174,6 +180,7 @@
  275.         $film = $instance['film'];
  276.         $browse = $instance['browse'];
  277.         $name = $instance['name'];
  278. +                $numbar = $instance['numbar'];
  279.         $desc = $instance['desc'];
  280.        
  281.     ?>
  282. @@ -230,6 +237,13 @@
  283.                 <option value="yes" <?php if ($browse == 'yes') echo 'selected="selected"' ?>><?php _e('yes.', 'wppa'); ?></option>
  284.             </select>
  285.         </p>
  286. +                <p>
  287. +           <?php _e('Show numbar:', 'wppa'); ?>
  288. +           <select id="<?php echo $this->get_field_id('numbar'); ?>" name="<?php echo $this->get_field_name('numbar'); ?>">
  289. +               <option value="no" <?php if ($numbar == 'no') echo 'selected="selected"' ?>><?php _e('no.', 'wppa'); ?></option>
  290. +               <option value="yes" <?php if ($numbar == 'yes') echo 'selected="selected"' ?>><?php _e('yes.', 'wppa'); ?></option>
  291. +           </select>
  292. +       </p>
  293.  
  294.         <p><span style="color:blue"><small><?php _e('The following text fields support qTranslate', 'wppa') ?></small></span></p>
  295.         <p><label for="<?php echo $this->get_field_id('linktitle'); ?>"><?php _e('Tooltip text:', 'wppa'); ?></label> <input class="widefat" id="<?php echo $this->get_field_id('linktitle'); ?>" name="<?php echo $this->get_field_name('linktitle'); ?>" type="text" value="<?php echo $linktitle; ?>" /></p>
  296.  
  297.  
  298.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!