Changes for block/flickr_block.module: 90 added lines, 16 removed lines.
Original line number
Diff line number
Diff line
@@ -23,32 +23,32 @@ function flickr_block_help($path, $arg) {
*/
functionflickr_block_info(){
// User blocks.
$blocks[0]['info']=t("Flickr: Node author photos optionally tagged as a taxonomy term or near the location attached to the node that is on the same page as this block (dynamic content)");
$blocks[0]['info']=t("Flickr: Node author photos corresponding with a node's taxonomy term, location or date field (1)");
$blocks[2]['info']=t("Flickr: Node author photos optionally tagged as a taxonomy term or near the location attached to the node that is on the same page as this block (dynamic content) (extra instance)");
$blocks[2]['info']=t("Flickr: Node author photos corresponding with a node's taxonomy term, location or date field (2)");
// Site wide blocks.
$blocks[3]['info']=t('Flickr: User photos optionally tagged as a taxonomy term or near the location attached to the node that is on the same page as this block (dynamic content)');
$blocks[3]['info']=t("Flickr: User photos corresponding with a node's taxonomy term, location or date field (1)");
$blocks[4]['info']=t('Flickr: User recent photosets');
$blocks[5]['info']=t('Flickr: User photos optionally tagged as a taxonomy term or near the location attached to the node that is on the same page as this block (dynamic content) (extra instance)');
$blocks[6]['info']=t('Flickr: Group photos optionally tagged as a taxonomy term attached to the node that is on the same page as this block (dynamic content)');
$blocks[5]['info']=t("Flickr: User photos corresponding with a node's taxonomy term, location or date field (2)");
$blocks[6]['info']=t("Flickr: Group photos corresponding with a node's taxonomy term (1)");
// Photoset blocks.
$blocks[7]['info']=t('Flickr: Set photos optionally tagged as a taxonomy term attached to the node that is on the same page as this block (dynamic content)');
$blocks[8]['info']=t('Flickr: Set photos optionally tagged as a taxonomy term attached to the node that is on the same page as this block (dynamic content) (extra instance)');
$blocks[7]['info']=t("Flickr: Set photos corresponding with a node's taxonomy term (1)");
$blocks[8]['info']=t("Flickr: Set photos corresponding with a node's taxonomy term (2)");
// Returns a list of favorite public photos for the given user.
$blocks[9]['info']=t("Flickr: Favorites optionally tagged as a taxonomy term attached to the node that is on the same page as this block (dynamic content)");
$blocks[9]['info']=t("Flickr: Favorites corresponding with a node's taxonomy term (1)");
$blocks[10]['info']=t("Flickr: Group photos optionally tagged as a taxonomy term attached to the node that is on the same page as this block (dynamic content) (extra instance)");
$blocks[10]['info']=t("Flickr: Group photos corresponding with a node's taxonomy term (2)");
$blocks[11]['info']=t("Flickr: User photos with specific tags");
$blocks[12]['info']=t("Flickr: Favorites optionally tagged as a taxonomy term attached to the node that is on the same page as this block (dynamic content) (extra instance)");
$blocks[12]['info']=t("Flickr: Favorites corresponding with a node's taxonomy term (2)");
$blocks[13]['info']=t("Flickr: Node author favorites (what they like from others, but all together) optionally tagged as a taxonomy term attached to the node that is on the same page as this block (dynamic content)");
$blocks[14]['info']=t("Flickr: Node author favorites optionally tagged as a taxonomy term attached to the node that is on the same page as this block (dynamic content) (extra instance)");
$blocks[13]['info']=t("Flickr: Node author favorites (what they like from others, but all together) corresponding with a node's taxonomy term (1)");
$blocks[14]['info']=t("Flickr: Node author favorites corresponding with a node's taxonomy term (2)");
$blocks[15]['info']=t("Flickr: Node author gallery photos (arbitrary selection by author of other's photos) optionally with gallery title as a taxonomy term attached to the node that is on the same page as this block (dynamic content)");
$blocks[16]['info']=t("Flickr: Node author gallery photos optionally titled as a taxonomy term attached to the node that is on the same page as this block (dynamic content) (extra instance)");
$blocks[15]['info']=t("Flickr: Node author gallery photos (arbitrary selection by author of other's photos) corresponding with a node's taxonomy term (1)");
$blocks[16]['info']=t("Flickr: Node author gallery photos corresponding with a node's taxonomy term (2)");
for($i=0;$i<17;$i++){
$blocks[$i]['cache']=DRUPAL_CACHE_CUSTOM;
@@ -80,6 +80,7 @@ function flickr_block_configure($delta = '') {
@@ -280,6 +284,24 @@ function flickr_block_configure($delta = '') {
'#description'=>t("Limit the Flickr images to those that have a geo location near to the geofield found for the node on the page the block is displayed on.<br />If not on a node page, all photos will be diplayed. To avoid this set the visibility settings below to <em>Only the listed pages</em> specified as <em>node/*</em>."),
'#title'=>t('Filter by a date field (machine names)'),
'#position'=>'left',
'#options'=>$checklist_fields_array,
'#default_value'=>$settings['date'],
'#description'=>t("Limit the Flickr images to those that have are taken on or between the dates attached to the node on the page the block is displayed on.<br />If not on a node page, all photos will be diplayed. To avoid this set the visibility settings below to <em>Only the listed pages</em> specified as <em>node/*</em>."),
);
}
// Override default settings to force or suppress the display of the caption
$form["flickr_block_{$delta}_user_id"]['#description']=t("A Flickr user ID (number@number, alias, username or email). Leave empty or use the keyword <em>public</em> to grab CC licensed Public photos.");