Changeset 1174023
- Timestamp:
- 06/03/2015 11:39:51 PM (11 years ago)
- Location:
- awesome-flickr-gallery-plugin/trunk
- Files:
-
- 12 added
- 4 edited
-
README.txt (modified) (3 diffs)
-
afg_admin_settings.php (modified) (3 diffs)
-
afg_libs.php (modified) (1 diff)
-
index.php (modified) (8 diffs)
-
swipebox (added)
-
swipebox/css (added)
-
swipebox/css/swipebox.css (added)
-
swipebox/css/swipebox.min.css (added)
-
swipebox/img (added)
-
swipebox/img/icons.png (added)
-
swipebox/img/icons.svg (added)
-
swipebox/img/loader.gif (added)
-
swipebox/js (added)
-
swipebox/js/jquery.swipebox.js (added)
-
swipebox/js/jquery.swipebox.min.js (added)
-
swipebox/myswipebox.js (added)
Legend:
- Unmodified
- Added
- Removed
-
awesome-flickr-gallery-plugin/trunk/README.txt
r1173938 r1174023 5 5 Requires at least: 3.0 6 6 Tested up to: 4.2.2 7 Stable tag: 3. 3.67 Stable tag: 3.5.2 8 8 License: GPLv2 or later 9 9 … … 113 113 114 114 == Upgrade Notice == 115 116 = 3.5.2 = 117 [MAJOR CHANGE] I had to remove the Highslide option from list of slideshows. Apparently it is not compatible with WordPress's set of rules for licensing. 118 [Enhancement] Highslide is replaced with Swipebox. A much better slideshow plugin which also supports touch swipes. 115 119 116 120 = 3.3.5 = … … 282 286 == Changelog == 283 287 288 = 3.5.2 = 289 * [MAJOR CHANGE] I had to remove the Highslide option from list of slideshows. Apparently it is not compatible with WordPress's set of rules for licensing. 290 * [Enhancement] Highslide is replaced with Swipebox. A much better slideshow plugin which also supports touch swipes. 291 284 292 = 3.3.5 = 285 293 * [Bug Fix] Add support for Flickr API changes related to SSL. -
awesome-flickr-gallery-plugin/trunk/afg_admin_settings.php
r912354 r1174023 58 58 if (get_option('afg_credit_note') == '0') update_option('afg_credit_note', 'off'); 59 59 if (!get_option('afg_pagination')) update_option('afg_pagination', 'on'); 60 if (get_option('afg_slideshow_option') == '' || get_option('afg_slideshow_option') == 'highslide') update_option('afg_slideshow_option', ' colorbox');60 if (get_option('afg_slideshow_option') == '' || get_option('afg_slideshow_option') == 'highslide') update_option('afg_slideshow_option', 'swipebox'); 61 61 if (get_option('afg_custom_css') == '') update_option('afg_custom_css', '/* Start writing your custom CSS here */'); 62 62 if (get_option('afg_disable_slideshow')) update_option('afg_slideshow_option', 'disable'); … … 179 179 if ($galleries) { 180 180 foreach ($galleries as &$gallery) { 181 if (!isset($gallery['slideshow_option']) )182 $gallery['slideshow_option'] = ' colorbox';181 if (!isset($gallery['slideshow_option']) && $gallery['slideshow_option'] == 'highslide') 182 $gallery['slideshow_option'] = 'swipebox'; 183 183 } 184 184 update_option('afg_galleries', $galleries); 185 185 } 186 186 unset($gallery); 187 188 187 } 189 188 … … 358 357 <td>Slideshow Behavior</td> 359 358 <td><select name='afg_slideshow_option'> 360 <?php echo afg_generate_options($afg_slideshow_map, get_option('afg_slideshow_option', ' colorbox')); ?>359 <?php echo afg_generate_options($afg_slideshow_map, get_option('afg_slideshow_option', 'swipebox')); ?> 361 360 </select></td> 362 361 </tr> -
awesome-flickr-gallery-plugin/trunk/afg_libs.php
r912354 r1174023 19 19 'default' => 'Default', 20 20 'colorbox' => 'Colorbox', 21 'swipebox' => 'Swipebox (Touch Enabled)', 21 22 'disable' => 'No Slideshow', 22 23 'flickr' => 'Link to Flickr Photo page', -
awesome-flickr-gallery-plugin/trunk/index.php
r1173938 r1174023 4 4 Plugin URI: http://www.ronakg.com/projects/awesome-flickr-gallery-wordpress-plugin/ 5 5 Description: Awesome Flickr Gallery is a simple, fast and light plugin to create a gallery of your Flickr photos on your WordPress enabled website. This plugin aims at providing a simple yet customizable way to create stunning Flickr gallery. 6 Version: 3. 3.66 Version: 3.5.2 7 7 Author: Ronak Gandhi 8 8 Author URI: http://www.ronakg.com … … 35 35 } 36 36 37 function afg_enqueue_swipebox_scripts() { 38 wp_enqueue_script('jquery'); 39 wp_enqueue_script('afg_swipebox_script', BASE_URL . "/swipebox/js/jquery.swipebox.min.js" , array('jquery')); 40 wp_enqueue_script('afg_swipebox_js', BASE_URL . "/swipebox/myswipebox.js" , array('jquery')); 41 } 42 37 43 function afg_enqueue_cbox_styles() { 38 44 wp_enqueue_style('afg_colorbox_css', BASE_URL . "/colorbox/colorbox.css"); 39 45 } 40 46 47 function afg_enqueue_swipebox_styles() { 48 wp_enqueue_style('afg_swipebox_css', BASE_URL . "/swipebox/css/swipebox.min.css"); 49 } 50 41 51 function afg_enqueue_styles() { 42 52 wp_enqueue_style('afg_css', BASE_URL . "/afg.css"); … … 44 54 45 55 $enable_colorbox = get_option('afg_slideshow_option') == 'colorbox'; 56 $enable_swipebox = get_option('afg_slideshow_option') == 'swipebox'; 46 57 47 58 if (!is_admin()) { 59 global $enable_colorbox, $enable_swipebox; 48 60 /* Short code to load Awesome Flickr Gallery plugin. Detects the word 49 61 * [AFG_gallery] in posts or pages and loads the gallery. … … 58 70 break; 59 71 } 72 73 if ($gallery['slideshow_option'] == 'swipebox') { 74 $enable_swipebox = true; 75 break; 76 } 60 77 } 61 78 … … 63 80 add_action('wp_print_scripts', 'afg_enqueue_cbox_scripts'); 64 81 add_action('wp_print_styles', 'afg_enqueue_cbox_styles'); 82 } 83 84 if ($enable_swipebox) { 85 add_action('wp_print_scripts', 'afg_enqueue_swipebox_scripts'); 86 add_action('wp_print_styles', 'afg_enqueue_swipebox_styles'); 65 87 } 66 88 … … 218 240 $photos = array(); 219 241 for($i=1; $i<($total_photos/500)+1; $i++) { 242 $flickr_api = 'photos'; 220 243 if ($photoset_id) { 221 244 $flickr_api = 'photoset'; … … 224 247 } 225 248 else if ($gallery_id) { 226 $flickr_api = 'photos';227 249 $rsp_obj_total = $pf->galleries_getPhotos($gallery_id, $extras, 500, $i); 228 250 if ($pf->error_code) return afg_error(); 229 251 } 230 252 else if ($group_id) { 231 $flickr_api = 'photos';232 253 $rsp_obj_total = $pf->groups_pools_getPhotos($group_id, NULL, NULL, NULL, $extras, 500, $i); 233 254 if ($pf->error_code) return afg_error(); 234 255 } 235 256 else if ($tags) { 236 $flickr_api = 'photos';237 257 $rsp_obj_total = $pf->photos_search(array('user_id'=>$user_id, 'tags'=>$tags, 'extras'=>$extras, 'per_page'=>500, 'page'=>$i)); 238 258 if ($pf->error_code) return afg_error(); 239 259 } 240 260 else if ($popular) { 241 $flickr_api = 'photos';242 261 $rsp_obj_total = $pf->photos_search(array('user_id'=>$user_id, 'sort'=>'interestingness-desc', 'extras'=>$extras, 'per_page'=>500, 'page'=>$i)); 243 262 if ($pf->error_code) return afg_error(); 244 263 } 245 264 else { 246 $flickr_api = 'photos';247 265 if (get_option('afg_flickr_token')) $rsp_obj_total = $pf->people_getPhotos($user_id, array('extras' => $extras, 'per_page' => 500, 'page' => $i)); 248 266 else $rsp_obj_total = $pf->people_getPublicPhotos($user_id, NULL, $extras, 500, $i); … … 283 301 $class = "class='afgcolorbox'"; 284 302 $rel = "rel='example4{$id}'"; 303 $click_event = ""; 304 } 305 else if ($slideshow_option == 'swipebox') { 306 $class = "class='swipebox'"; 307 //$rel = "rel='gallery-{$id}'"; 285 308 $click_event = ""; 286 309 }
Note: See TracChangeset
for help on using the changeset viewer.