Closed (fixed)
Project:
Flickr
Version:
7.x-1.x-dev
Component:
flickr_filter
Priority:
Normal
Category:
Feature request
Assigned:
Unassigned
Reporter:
Created:
30 Mar 2014 at 14:06 UTC
Updated:
18 Jan 2015 at 14:35 UTC
Jump to comment: Most recent, Most recent file
Comments
Comment #1
lolandese commentedAttached patch:
[flickr-photoset:id=72157634563269642, size=y][flickr-group:id=91484156@N00]. Only the Flash slideshow is available on this type of filter, whatever size you specify.Based on the patch in #2227571: Flickr Filter: add support to insert a slideshow of a set.
Comment #2
mholve commentedWell how cool is that? I'll apply the patch, give it a try and report back. Thanks!
Comment #3
mholve commentedWorked well on all but one file:
patching file block/flickr_block.module
patching file field/flickrfield.module
patching file filter/flickr_filter.module
Hunk #3 FAILED at 115.
1 out of 3 hunks FAILED -- saving rejects to file filter/flickr_filter.module.rej
patching file flickr.api.inc
patching file flickr.inc
patching file flickr.module
patching file sets/flickr_sets.module
Reject file contains:
--- filter/flickr_filter.module
+++ filter/flickr_filter.module
@@ -115,12 +116,60 @@
if (!isset($config['size'])) {
$config['size'] = variable_get('flickr_default_size', 'm');
}
- return theme('flickr_photoset', array(
- 'photoset' => $photoset,
- 'owner' => $photoset['owner'],
- 'size' => $config['size'],
- 'attribs' => $attribs,
- ));
+ switch ($config['size']) {
+ case "x";
+ return theme('flickr_photoset_flickrcomslideshow', array(
+ 'id' => $photoset['id'],
+ ));
+ break;
+ case "y";
+ return theme('flickr_photoset_flickrcomslideshow_simple', array(
+ 'id' => $photoset['id'],
+ ));
+ break;
+ default:
+ return theme('flickr_photoset', array(
+ 'photoset' => $photoset,
+ 'owner' => $photoset['owner'],
+ 'size' => $config['size'],
+ 'attribs' => $attribs,
+ ));
+ }
+ }
+ }
+ return '';
+}
+
+/**
+ * Filter callback for a group.
+ */
+function flickr_filter_callback_group($matches) {
+ list($config, $attribs) = flickr_filter_split_config($matches[1]);
+
+ if (isset($config['id'])) {
+ if ($photoset = flickr_get_group_photos($config['id'])) {
+ if (!isset($config['size'])) {
+ $config['size'] = variable_get('flickr_default_size', 'm');
+ }
+// switch ($config['size']) {
+// case "x";
+ return theme('flickr_photoset_flickrcomslideshow', array(
+ 'id' => $config['id'],
+ ));
+// break;
+// case "y";
+// return theme('flickr_photoset_flickrcomslideshow_simple', array(
+// 'id' => $config['id'],
+// ));
+// break;
+// default:
+// return theme('flickr_photoset', array(
+// 'photoset' => $photoset,
+// 'owner' => $photoset['owner'],
+// 'size' => $config['size'],
+// 'attribs' => $attribs,
+// ));
+// }
}
}
return '';
Comment #4
lolandese commentedApplies cleanly, see my terminal output below. Try to follow the same steps, using the git version.
Thanks.
Comment #5
mholve commentedAhh, that worked! I used patch rather than git for patching. Followed the steps above - and got a clean patch. Installed and will test...
Thanks! :)
Comment #6
mholve commentedProgress! The modified group filter works - sort of. I created test content with:
[flickr-group:id=16655495@N00, size=x]
...but it doesn't seem to scale to the width of the content area, and no controls, etc. are visible. I tried Mac OS X Safari (sort of works) and Firefox (displays nothing) and Windows IE (works in between the two).
You can test it here: http://lavidaleica.com/content/test
Comment #7
mholve commentedWindows Firefox also displays nothing.
Comment #8
lolandese commentedYou're right. I've overlooked something. Sorry.
Try to substitute line 547 in flickr.module with:
return '<div class="flickr-photoset-slideshow"><object type="application/x-shockwave-flash" data="https://www.flickr.com/apps/slideshow/show.swf?v=140556"><param name="movie" value="https://www.flickr.com/apps/slideshow/show.swf?v=140556"></param><param name="flashvars" value="offsite=true&lang=en-us&page_show_url=%2Fgroups%2F' . $id . '%2Fpool%2Fshow%2F&page_show_back_url=%2Fgroups%2F' . $id . '%2Fpool%2F&group_id=' . $id . '&jump_to=&start_index="></param><param name="allowFullScreen" value="true"><param name="wmode" value="opaque" /></param></object></div>';Thanks.
Comment #9
mholve commentedHmm, didn't seem to make any difference.
Comment #10
lolandese commentedI grabbed the generated HTML from your site (see below) and pasted it in a local test site running Responsive Bartik D7 where it shows and works just fine (see image).
I suspect it's a theme issue. What theme are you using? Have you set the text filter to 'Full HTML'?
<div class="flickr-photoset-slideshow"><object type="application/x-shockwave-flash" data="https://www.flickr.com/apps/slideshow/show.swf?v=140556"><param name="movie" value="https://www.flickr.com/apps/slideshow/show.swf?v=140556"><param name="flashvars" value="offsite=true&lang=en-us&page_show_url=%2Fgroups%2F16655495@N00%2Fpool%2Fshow%2F&page_show_back_url=%2Fgroups%2F16655495@N00%2Fpool%2F&group_id=16655495@N00&jump_to=&start_index="><param name="allowFullScreen" value="true"><param name="wmode" value="opaque"></object></div>Comment #11
mholve commentedUgh. Just my luck, eh? I'm using the Andromeda theme.
Yes, added to the Full HTML text format.
I do recall having oddness with the Flash slideshows in testing; non-Flash worked fine. Any chance of a non-Flash version?
Comment #12
lolandese commentedStrangely enough this works:
<div class="flickr-photoset-slideshow"><object type="text/html" data="https://www.flickr.com/slideShow/index.gne?group_id=&user_id=98518260@N02&set_id=&text="></object></div>..but this doesn't work:
<div class="flickr-photoset-slideshow"><object type="text/html" data="https://www.flickr.com/slideShow/index.gne?group_id=16655495@N00&user_id=&set_id=&text="></object></div>Try to copy and paste into your test site. I can't find much about it in the Flickr forum. It will be appreciated if you can do a more extensive search as i would prefer this solution also for groups.
As an alternative we could implement http://manos.malihu.gr/simple-jquery-fullscreen-image-gallery/ or some other jQuery gallery that maybe is touch enabled (swipe). It should be GNU GPL licensed or compatible. In any case it would take some time to come up with something.
Comment #13
mholve commentedYes, that top one works, at least better. Something shows up, even in Linux Firefox. Still not full-width and the controls are missing, as are the thumbnails below. I've updated the test page with all three examples.
I'll see what I can find also. JQuery for a gallery would be nice as it's built into Drupal, and one that's touch friendly is an additional bonus. Plus, you know, no Flash. :p
So weird, and so frustrating. I'm beginning to think this theme has it out for me. I've been searching for a new one; the problem is finding one that won't require massive work - and supports all the current features, etc. I've narrowed it down somewhat.
Comment #14
lolandese commentedSomehow the changes I made to flickr.css didn't go into the patch. Override it with the extracted attached file.
Sorry (again).
Comment #15
mholve commentedBehold - it WORKS! Using just the filter, with Flash.
Thanks so much for your help! :)
Comment #16
lolandese commentedGood. I guess this is RTBC then. New patch attached that includes #8.
#14 was already in the dev. When doing testing for issues always make sure you use the latest version of dev or, even better, git. Having your test URL to inspect things helped though to find out why it didn't work for you.
Thanks for the cooperation.
Comment #18
lolandese commentedhttp://drupalcode.org/project/flickr.git/commitdiff/cf3393b
Comment #19
lolandese commentedComment #20
lolandese commentedTO DO: Update README.txt and online module documentation.
Comment #21
mholve commentedGlad to help lolandese - thank YOU for all your help and support!
Comment #22
lolandese commentedComment #23
lolandese commentedComment #25
lolandese commentedSee #2367755: D6 maintenance.
Comment #26
lolandese commentedSetting this back to D7 and being 'fixed (closed)'.
Main reason is the fact that links to this issue show the status on hover without revealing the version (6 or 7). This might give the impression that the mentioned issue will not be solved, while in fact it is already fixed for the D7 version. 'Fixed (closed)' reflects the current status correctly for D7. 'Closed (won't fix)' is only valid for the minimally maintained D6 version of the module.