diff --git a/block/flickr_block.admin.inc b/block/flickr_block.admin.inc index 2ccc42b..8b36c71 100644 --- a/block/flickr_block.admin.inc +++ b/block/flickr_block.admin.inc @@ -21,6 +21,8 @@ function flickr_block_form_flickr_admin_settings_alter(&$form, &$form_state) { '#required' => TRUE, '#default_value' => variable_get('flickr_block_heading', 'h2'), '#description' => t("Use 'p' for no style, e.g. 'h2' for a heading or 'none' to not display an album title."), + '#field_prefix' => t('<'), + '#field_suffix' => t('>'), '#size' => 4, '#maxlength' => 4, ); @@ -32,6 +34,7 @@ function flickr_block_form_flickr_admin_settings_alter(&$form, &$form_state) { '#field_suffix' => t('hours.'), '#size' => 3, '#maxlength' => 3, + '#attributes' => array('class' => array('flickr-form-align')), ); $cache_warming = l(t('cache warming'), 'https://drupal.org/node/1576686/', array( 'attributes' => array( @@ -48,6 +51,7 @@ function flickr_block_form_flickr_admin_settings_alter(&$form, &$form_state) { '#field_suffix' => t('hours.'), '#size' => 3, '#maxlength' => 3, + '#attributes' => array('class' => array('flickr-form-align')), ); $form['block_settings']['flickr_block_photos_per_set'] = array( '#type' => 'textfield', @@ -65,19 +69,19 @@ function flickr_block_form_flickr_admin_settings_alter(&$form, &$form_state) { * Validate user input. */ function flickr_block_admin_settings_validate($form, &$form_state) { - $limit5 = trim($form_state['values']['flickr_block_refresh_random']); - $limit6 = trim($form_state['values']['flickr_block_refresh_others']); - $limit10 = trim($form_state['values']['flickr_block_photos_per_set']); // Validate refresh rate random blocks. - if (!is_numeric($limit5) || $limit5 < 2) { + $limit = trim($form_state['values']['flickr_block_refresh_random']); + if (!is_numeric($limit) || $limit < 2) { form_set_error('flickr_block_refresh_random', t('Set a number from 2 to 999.')); } // Validate refresh rate other blocks. - if (!is_numeric($limit6) || $limit6 < 2) { + $limit = trim($form_state['values']['flickr_block_refresh_others']); + if (!is_numeric($limit) || $limit < 2) { form_set_error('flickr_block_refresh_others', t('Set a number from 2 to 999.')); } // Validate photos per set. - if (!is_numeric($limit10) || $limit10 < 1) { - form_set_error('flickr_block_photos_per_set', t('Set a number from 1 to 99.')); + $limit = trim($form_state['values']['flickr_block_photos_per_set']); + if (!ctype_digit($limit) || $limit < 1) { + form_set_error('flickr_block_photos_per_set', t('Set an integer from 1 to 99.')); } } diff --git a/cachewarmer/flickrcachewarmer.admin.inc b/cachewarmer/flickrcachewarmer.admin.inc index 10784d5..c703b47 100644 --- a/cachewarmer/flickrcachewarmer.admin.inc +++ b/cachewarmer/flickrcachewarmer.admin.inc @@ -59,7 +59,7 @@ function flickrcachewarmer_form_flickr_admin_settings_alter(&$form, &$form_state '#type' => 'checkbox', '#title' => t("Rebuild the cache on form submit to enhance performance for all page visits after saving this form."), '#default_value' => variable_get('flickrcachewarmer_run', 0), - '#description' => t("Note that form submit will very slow. The cache will be rebuilt for the nodes of the selected content types for cache warming.") . '
' . t("If you get errors, try to !runcron.", array('!runcron' => $runcron)), + '#description' => t("Note that form submit will be very slow. The cache will be rebuilt for the nodes of the selected content types for cache warming.") . '
' . t("If you get errors, try to !runcron.", array('!runcron' => $runcron)), '#weight' => 98, ); } @@ -68,6 +68,7 @@ function flickrcachewarmer_form_flickr_admin_settings_alter(&$form, &$form_state * Validate user input. */ function flickrcachewarmer_admin_settings_validate($form, &$form_state) { + // Put validation rules here. } /** diff --git a/filter/flickr_filter.admin.inc b/filter/flickr_filter.admin.inc index 511ab04..10430c9 100644 --- a/filter/flickr_filter.admin.inc +++ b/filter/flickr_filter.admin.inc @@ -40,6 +40,8 @@ function flickr_filter_form_flickr_admin_settings_alter(&$form, &$form_state) { '#required' => TRUE, '#default_value' => variable_get('flickr_filter_heading', 'p'), '#description' => t("Use 'p' for no style, e.g. 'h3' for a heading or 'none' to not display an album title."), + '#field_prefix' => t('<'), + '#field_suffix' => t('>'), '#size' => 4, '#maxlength' => 4, ); diff --git a/flickr.admin.inc b/flickr.admin.inc index b8a82b3..c2e337c 100644 --- a/flickr.admin.inc +++ b/flickr.admin.inc @@ -48,7 +48,7 @@ function flickr_admin_settings() { '#type' => 'textfield', '#title' => t('Default Flickr User ID'), '#default_value' => $default, - '#description' => t('An, optional, default Flickr user (number@number, alias, username or email). This will be used when no user is specified.'), + '#description' => t('An optional default Flickr user (number@number, alias, username or email). This will be used when no user is specified.'), ); // We need an api key before we can verify usernames. if (!$form['credentials']['flickr_api_key']['#default_value']) { @@ -109,6 +109,7 @@ function flickr_admin_settings() { '#field_suffix' => t('px'), '#size' => 3, '#maxlength' => 3, + '#attributes' => array('class' => array('flickr-form-align')), ); $form['info_settings']['flickr_metadata_suppress_on_small'] = array( '#type' => 'textfield', @@ -119,6 +120,7 @@ function flickr_admin_settings() { '#field_suffix' => t('px'), '#size' => 3, '#maxlength' => 3, + '#attributes' => array('class' => array('flickr-form-align')), ); $rubular = l(t('http://rubular.com/r/RhKjj9Thy1'), 'http://rubular.com/r/RhKjj9Thy1', array( 'attributes' => array( @@ -131,7 +133,7 @@ function flickr_admin_settings() { '#type' => 'textfield', '#title' => t("Replace photo titles matching this Regular Expression with 'View on Flickr'"), '#default_value' => variable_get('flickr_regex', '^[a-zA-Z]+[^\s][0-9]+$'), - '#description' => t("Avoids camera generated titles like e.g. 'IMG_4259'. Try your own RegEx first with !rubular. Leave empty to NOT replace any titles.", array('!rubular' => $rubular)), + '#description' => t("Avoids camera generated titles like 'IMG_4259'. Try your own RegEx first with !rubular. Leave empty to NOT replace any titles.", array('!rubular' => $rubular)), '#field_prefix' => t('/'), '#field_suffix' => t('/'), '#size' => 60, @@ -213,8 +215,8 @@ function flickr_admin_settings() { '#title' => t('Counter thousands separator'), '#default_value' => variable_get('flickr_thousands_sep', ','), '#description' => t('Common values are NULL, a dot ("."), a comma (",") or a space (" ").'), - '#field_prefix' => t('E.g. 4 out of 23'), - '#field_suffix' => t('473'), + '#field_prefix' => t('For example 4 out of 23'), + '#field_suffix' => t('473'), '#size' => 1, '#maxlength' => 1, ); @@ -368,6 +370,77 @@ function flickr_admin_settings() { '#default_value' => variable_get('flickr_css', 1), '#description' => t("Uncheck to take care of the styling yourself in custom CSS.
If you use Flickr Filter, you might find the !autofloat_module useful.", array('!autofloat_module' => $autofloat_module)), ); + $form['css_settings']['css_variables'] = array( + '#type' => 'fieldset', + '#title' => t('CSS variables'), + '#description' => t('The used measuring unit (e.g. %, em, px) might depend on the range a given value is in. This is indicated behind the input field itself.'), + '#collapsible' => TRUE, + '#collapsed' => FALSE, + ); + $style_settings_module = l(t('Style (CSS) Settings module'), 'https://drupal.org/project/style_settings', array( + 'attributes' => array( + 'title' => t('Style (CSS) Settings | Drupal.org'), + 'target' => '_blank', + ), + )); + if (module_exists('style_settings')) { + $form['css_settings']['css_variables']['#collapsed'] = TRUE; + $form['css_settings']['css_variables']['flickr_capsize'] = array( + '#type' => 'textfield', + '#title' => t('Photo caption font size'), + '#default_value' => variable_get('flickr_capsize', 80), + '#description' => t('Relative to the font size for the normal text. A minimum font size setting of your browser might limit it. Test it on different browsers.'), + '#field_suffix' => t('% or em (<10)'), + '#size' => 3, + '#maxlength' => 3, + '#attributes' => array('class' => array('flickr-form-align')), + ); + $form['css_settings']['css_variables']['flickr_sswidth'] = array( + '#type' => 'textfield', + '#title' => t('Slideshow width'), + '#default_value' => variable_get('flickr_sswidth', 100), + '#field_suffix' => t('% or px (>100)'), + '#description' => t('Relative to width of the containing block element (%) or fixed (px). Never wider than the containing block (max-width: 100 %).'), + '#size' => 3, + '#maxlength' => 3, + '#attributes' => array('class' => array('flickr-form-align')), + ); + $form['css_settings']['css_variables']['flickr_sswratio'] = array( + '#type' => 'textfield', + '#title' => t('Slideshow'), + '#default_value' => variable_get('flickr_sswratio', 4), + '#field_suffix' => '  :  ', + '#size' => 3, + '#maxlength' => 3, + '#attributes' => array('class' => array('flickr-form-align')), + ); + $form['css_settings']['css_variables']['flickr_sshratio'] = array( + '#type' => 'textfield', + '#title' => ' ' . t('width:height ratio'), + '#default_value' => variable_get('flickr_sshratio', 3), + '#size' => 3, + '#maxlength' => 3, + ); + } + elseif (!module_exists('flickrstyle')) { + $form['css_settings']['css_variables']['flickr_note'] = array( + '#markup' => t("Enable the !style_settings_module (dev version!) to get even more styling options. They consist of:", array('!style_settings_module' => $style_settings_module)), + ); + } + else { + $form['css_settings']['css_variables']['flickr_note'] = array( + '#markup' => t("Enable the !style_settings_module (dev version!) to get even more styling options. They consist of:", array('!style_settings_module' => $style_settings_module)), + ); + } $flickr_style = l(t('Flickr Style'), 'admin/modules', array( 'attributes' => array( 'title' => t('Extra configuration options.'), @@ -404,7 +477,7 @@ function flickr_admin_settings() { '#title' => t('Update interval'), '#options' => $ageoptions, '#default_value' => variable_get('flickr_cache_duration', 3600), - '#description' => t('The refresh interval indicating how often you want to check cached Flickr API calls are up to date.'), + '#description' => t("The refresh interval indicating how often you want to check cached Flickr API calls are up to date. This only kicks in when a repeating request with the same query is made, e.g. when re-saving a Flickr block without changing the parameters within the above specified interval. A Flickr API request is usually avoided by a page or block cache, therefore it is pretty safe to set it to '1 hour'."), ); $cache_warming = l(t('cache warming'), 'https://drupal.org/node/1576686', array( 'attributes' => array( @@ -544,6 +617,9 @@ function flickr_admin_settings() { '#description' => t("Note that form submit will be slower. Your content will be rebuilt at the first visit. Your choice will be 'remembered' for your next visit to this configuration page."), '#weight' => 97, ); + if (variable_get('flickr_css', 1) && module_exists('style_settings')) { + $form['flickr_cc']['#title'] = t("Flush the cache on form submit to see your changes instantly. CSS is flushed in any case."); + } // Call submit_function() on form submission. $form['#submit'][] = 'flickr_admin_settings_submit'; @@ -555,19 +631,16 @@ function flickr_admin_settings() { * Validate user input. */ function flickr_admin_settings_validate($form, &$form_state) { + // Validate the credentials. $key = trim($form_state['values']['flickr_api_key']); - $sec = trim($form_state['values']['flickr_api_secret']); - $uid = trim($form_state['values']['flickr_default_userid']); - $limit1 = trim($form_state['values']['flickr_photos_per_page']); - $limit2 = trim($form_state['values']['flickr_title_suppress_on_small']); - $limit3 = trim($form_state['values']['flickr_metadata_suppress_on_small']); - $limit7 = trim($form_state['values']['flickr_per_page']); if ($key && (preg_match('/^[A-Fa-f\d]{32}$/', $key) != 1)) { form_set_error('flickr_api_key', t('This does not appear to be a Flickr API key.')); } + $sec = trim($form_state['values']['flickr_api_secret']); if ($sec && (preg_match('/^[A-Fa-f\d]{16}$/', $sec) != 1)) { form_set_error('flickr_api_secret', t('This does not appear to be a Flickr API secret.')); } + $uid = trim($form_state['values']['flickr_default_userid']); if ($uid) { $user = flickr_user_find_by_identifier($uid); if (!$user) { @@ -575,20 +648,44 @@ function flickr_admin_settings_validate($form, &$form_state) { } } // Validate the number of photos. - if (!is_numeric($limit1) || $limit1 < 1) { - form_set_error('flickr_photos_per_page', t('Set a number from 1 to 999.')); + $limit = trim($form_state['values']['flickr_photos_per_page']); + if (!ctype_digit($limit) || $limit < 1) { + form_set_error('flickr_photos_per_page', t('Set an integer from 1 to 999.')); } // Validate the minimum width to suppress title caption. - if (!is_numeric($limit2) || $limit2 < 0) { + $limit = trim($form_state['values']['flickr_title_suppress_on_small']); + if (!is_numeric($limit) || $limit < 0) { form_set_error('flickr_title_suppress_on_small', t('Set a width from 0 to 999 px.')); } // Validate the minimum width to suppress metadata caption. - if (!is_numeric($limit3) || $limit3 < 0) { + $limit = trim($form_state['values']['flickr_metadata_suppress_on_small']); + if (!is_numeric($limit) || $limit < 0) { form_set_error('flickr_metadata_suppress_on_small', t('Set a width from 0 to 999 px.')); } - // Validate the number to return on a random or views sorted API requests. - if (!is_numeric($limit7) || $limit7 < 20 || $limit7 > 500) { - form_set_error('flickr_per_page', t('Set a number from 20 to 500.')); + // Validate the number to return on 'random' or 'views' sorted API requests. + $limit = trim($form_state['values']['flickr_per_page']); + if (!ctype_digit($limit) || $limit < 20 || $limit > 500) { + form_set_error('flickr_per_page', t('Set an integer from 20 to 500.')); + } + if (variable_get('flickr_css', 1) && module_exists('style_settings')) { + $limit = trim($form_state['values']['flickr_capsize']); + // Validate the caption font size. + if (!is_numeric($limit) || $limit < 0) { + form_set_error('flickr_capsize', t('Set a number from 0 to 999.')); + } + $limit = trim($form_state['values']['flickr_sswidth']); + // Validate the slideshow CSS variables. + if (!is_numeric($limit) || $limit < 1) { + form_set_error('flickr_sswidth', t('Set a number from 1 to 999.')); + } + $limit = trim($form_state['values']['flickr_sswratio']); + if (!is_numeric($limit) || $limit < 1) { + form_set_error('flickr_sswratio', t('Set a number from 1 to 999.')); + } + $limit = trim($form_state['values']['flickr_sshratio']); + if (!is_numeric($limit) || $limit < 1) { + form_set_error('flickr_sshratio', t('Set a number from 1 to 999.')); + } } } @@ -596,10 +693,30 @@ function flickr_admin_settings_validate($form, &$form_state) { * Submit form data. */ function flickr_admin_settings_submit($form, &$form_state) { + if (variable_get('flickr_css', 1) && module_exists('style_settings')) { + if ($form_state['values']['flickr_capsize'] < 10) { + variable_set('flickr_caption_fontsize', $form_state['values']['flickr_capsize'] . 'em'); + } + else { + variable_set('flickr_caption_fontsize', $form_state['values']['flickr_capsize'] . '%'); + } + if ($form_state['values']['flickr_sswidth'] > 100) { + variable_set('flickr_slideshow_width', $form_state['values']['flickr_sswidth'] . 'px'); + } + else { + variable_set('flickr_slideshow_width', $form_state['values']['flickr_sswidth'] . '%'); + } + $ssratio = $form_state['values']['flickr_sswidth'] * $form_state['values']['flickr_sshratio'] / $form_state['values']['flickr_sswratio']; + $ssratio = $ssratio > 100 ? $ssratio . 'px' : $ssratio . '%'; + variable_set('flickr_slideshow_ratio', $ssratio); + } if ($form_state['values']['flickr_cc']) { drupal_flush_all_caches(); drupal_set_message(t('All caches are flushed.'), 'status', FALSE); } + elseif (variable_get('flickr_css', 1) && module_exists('style_settings')) { + _drupal_flush_css_js(); + } // Clean up the data. $form_state['values']['flickr_api_key'] = trim($form_state['values']['flickr_api_key']); $form_state['values']['flickr_api_secret'] = trim($form_state['values']['flickr_api_secret']); diff --git a/flickr.css b/flickr.css index 809bec6..0bd5ac6 100644 --- a/flickr.css +++ b/flickr.css @@ -1,3 +1,9 @@ +/** + * The CSS values that are wrapped in /*variable comments are intended for use + * by https://www.drupal.org/project/style_settings. Enable that module to + * have those CSS variables exposed in the settings UI. + */ + .flickr-photo-img { vertical-align: text-bottom; } @@ -32,20 +38,22 @@ span.flickr-credit { display: block; overflow: hidden; padding: 0 0 4px 4px; - font-size: 80%; + font-size: /*variable:flickr_caption_fontsize*/80%/*variable*/; line-height: 100%; } .flickr-slideshow { position: relative; overflow: hidden; - width: 100%; + width: /*variable:flickr_slideshow_width*/100%/*variable*/; height: 0; - /*Change percentage below to change ratio. Currently 16:9 (as most screens).*/ - padding-bottom: 56.25%; + /*The percentage is the height/width ratio. Defaults to 3:4.*/ + padding-bottom: /*variable:flickr_slideshow_ratio*/75%/*variable*/; } .flickr-slideshow object { + max-width: 100%; + max-height: 100%; position: absolute; top: 0; left: 0; @@ -104,3 +112,11 @@ span.grayed-out { span.grayed-out-help { color: #666; } + +.flickr-form-align { + text-align: right; +} + +.form-item.form-type-textfield.form-item-flickr-sswratio { + float: left; +} diff --git a/flickr.info b/flickr.info index 1eff94c..54dd5af 100644 --- a/flickr.info +++ b/flickr.info @@ -3,3 +3,5 @@ description = Flickr and Drupal integration. core = 7.x package = Flickr configure = admin/config/media/flickr + +soft_dependencies[] = style_settings diff --git a/flickr.install b/flickr.install index 3261994..f28895a 100644 --- a/flickr.install +++ b/flickr.install @@ -51,6 +51,13 @@ function flickr_uninstall() { variable_del('flickr_date_format_image_caption'); variable_del('flickr_date_format_image_caption_hover'); variable_del('flickr_date_format_album_title'); + variable_del('flickr_capsize'); + variable_del('flickr_sswidth'); + variable_del('flickr_sswratio'); + variable_del('flickr_sshratio'); + variable_del('flickr_caption_fontsize'); + variable_del('flickr_slideshow_width'); + variable_del('flickr_slideshow_ratio'); } /** diff --git a/flickr.module b/flickr.module index 47909a0..b20a0bf 100644 --- a/flickr.module +++ b/flickr.module @@ -715,7 +715,7 @@ function theme_flickr_photo($variables) { $notitle = '' . t('Flickr') . ' '; $metadatacaption = $width < $min_metadata ? $license : $metadatacaption; } - $class_notitle = $width < $min_title ? ' flickr-no-title' : ''; + $class_notitle = $width < $min_title && $width < $min_metadata ? ' flickr-no-title' : ''; $credit = $width < $min_title ? $notitle : '' . $title . '
'; // Determine what info goes with the enlarged version of the image. $overlay = variable_get('flickr_info_overlay', array( @@ -729,8 +729,10 @@ function theme_flickr_photo($variables) { $description = (gettype($overlay['description']) == 'integer' || $overlaytitle == $description . ' - ') ? '' : $description . ' - '; $licenselong = (gettype($overlay['license']) == 'integer') ? '' : $licenselong; $overlayhtml = $overlaytitle . $metadata . $description . $licenselong; - // Optionally use the GPL licensed magnifier image supplied with the module. - $magnifier = (variable_get('flickrstyle_emphasize', 2) == 4) ? '' : ''; + // Optionally use the GPL licensed magnifier image supplied with the module or user specified. + $uri = variable_get('flickrstyle_magnifier_image', ''); + $magnifierurl = empty($uri) ? '/' . drupal_get_path('module', 'flickr') . '/style/img/magnifier.png' : $uri; + $magnifier = (variable_get('flickrstyle_emphasize', 2) == 4) ? '' : ''; // Final step when NO overlay browser is used that generates the image that // links to the Flickr page to comply with the TOS of Flickr. if (variable_get('flickr_class') == NULL && variable_get('flickr_rel') == NULL && $width < $min_title && $width < $min_metadata) { @@ -915,16 +917,22 @@ function theme_flickr_flickrcomslideshow($variables) { if (isset($attribs[0]['width'])) { if (strpos($attribs[0]['width'], '%') !== FALSE) { $width = $attribs[0]['width']; - $height = isset($attribs[0]['height']) ? $attribs[0]['height'] : $width; + $div = '
'; + $width = '100%'; + $height = '100%'; } else { $width = $attribs[0]['width']; - $height = isset($attribs[0]['height']) ? $attribs[0]['height'] : round($width * 9 / 16); + $height = isset($attribs[0]['height']) ? $attribs[0]['height'] : round($width * variable_get('flickr_sshratio', 3) / variable_get('flickr_sswratio', 4)) . 'px'; + $div = '
'; } + $divend = '
'; } else { $width = '100%'; $height = '100%'; + $div = ''; + $divend = ''; } unset($attribs[0]['width']); unset($attribs[0]['height']); @@ -938,21 +946,21 @@ function theme_flickr_flickrcomslideshow($variables) { case 'photoset': $info = flickr_photosets_getinfo($id); $user_id = $info['owner']; - return '
+ return $div . '
-
'; +
' . $divend; case 'user': - return '
+ return $div . '
-
'; +
' . $divend; case 'group': - return '
'; + return $div . '
' . $divend; } drupal_set_message(t('No valid set, user or group ID is provided for the slideshow.'), 'error'); } @@ -974,16 +982,22 @@ function theme_flickr_flickrcomslideshow_simple($variables) { if (isset($attribs[0]['width'])) { if (strpos($attribs[0]['width'], '%') !== FALSE) { $width = $attribs[0]['width']; - $height = isset($attribs[0]['height']) ? $attribs[0]['height'] : $width; + $div = '
'; + $width = '100%'; + $height = '100%'; } else { $width = $attribs[0]['width']; - $height = isset($attribs[0]['height']) ? $attribs[0]['height'] : round($width * 9 / 16); + $height = isset($attribs[0]['height']) ? $attribs[0]['height'] : round($width * variable_get('flickr_sshratio', 3) / variable_get('flickr_sswratio', 4)) . 'px'; + $div = '
'; } + $divend = '
'; } else { $width = '100%'; $height = '100%'; + $div = ''; + $divend = ''; } unset($attribs[0]['width']); unset($attribs[0]['height']); @@ -1008,7 +1022,7 @@ function theme_flickr_flickrcomslideshow_simple($variables) { $src = 'https://www.flickr.com/slideShow/index.gne?group_id=' . $id . '&user_id=&set_id=&text='; break; } - return '
'; + return $div . '
' . $divend; } /** diff --git a/sets/flickr_sets.admin.inc b/sets/flickr_sets.admin.inc index f482bea..2dc1bfe 100644 --- a/sets/flickr_sets.admin.inc +++ b/sets/flickr_sets.admin.inc @@ -58,14 +58,14 @@ function flickr_sets_form_flickr_admin_settings_alter(&$form, &$form_state) { * Validate user input. */ function flickr_sets_admin_settings_validate($form, &$form_state) { - $limit8 = trim($form_state['values']['flickr_sets_per_page']); - $limit9 = trim($form_state['values']['flickr_sets_photos_per_set']); // Validate sets per page. - if (!is_numeric($limit8) || $limit8 < 1) { - form_set_error('flickr_sets_per_page', t('Set a number from 1 to 99.')); + $limit = trim($form_state['values']['flickr_sets_per_page']); + if (!ctype_digit($limit) || $limit < 1) { + form_set_error('flickr_sets_per_page', t('Set an integer from 1 to 99.')); } // Validate photos per set. - if (!is_numeric($limit9) || $limit9 < 1) { - form_set_error('flickr_sets_photos_per_set', t('Set a number from 1 to 99.')); + $limit = trim($form_state['values']['flickr_sets_photos_per_set']); + if (!ctype_digit($limit) || $limit < 1) { + form_set_error('flickr_sets_photos_per_set', t('Set an integer from 1 to 99.')); } } diff --git a/style/css/flickrstyle_big.css b/style/css/flickrstyle_big.css index 84d57f6..9181284 100644 --- a/style/css/flickrstyle_big.css +++ b/style/css/flickrstyle_big.css @@ -9,7 +9,7 @@ img.flickr-photoset-img:hover { -o-transform: scale(1.8); transform: scale(1.8); border: solid 2px transparent; - background: white; + background: /*variable:flickrstyle_bgcolor*/White/*variable*/; } .flickr-photo-img, diff --git a/style/css/flickrstyle_border.css b/style/css/flickrstyle_border.css index 49d93ed..f1a48b3 100644 --- a/style/css/flickrstyle_border.css +++ b/style/css/flickrstyle_border.css @@ -1,10 +1,12 @@ .flickr-photo-img, img.flickr-photoset-img { - border: solid 2px white; - background: white !important; + border-style: solid; + border-width: /*variable:flickrstyle_spacing*/2px/*variable*/; + border-color: /*variable:flickrstyle_bgcolor*/White/*variable*/; + background: /*variable:flickrstyle_bgcolor*/White/*variable*/ !important; } -/*Make the caption as wide as the image */ +/* Make the caption as wide as the image.*/ span.flickr-credit, .flickr-citation { padding: 0 2px 4px 4px; diff --git a/style/css/flickrstyle_bordernoshadow.css b/style/css/flickrstyle_bordernoshadow.css index f3036bb..a300f09 100644 --- a/style/css/flickrstyle_bordernoshadow.css +++ b/style/css/flickrstyle_bordernoshadow.css @@ -1,12 +1,12 @@ .flickr-photo-img, img.flickr-photoset-img { - padding: 2px; - border: solid 2px lightgray !important; - background: white !important; + padding: /*variable:flickrstyle_spacing*/2/*variable*/px; + border: solid /*variable:flickrstyle_border_thickness*/2/*variable*/px /*variable:flickrstyle_border_color*/LightGrey/*variable*/ !important; + background: /*variable:flickrstyle_bgcolor*/White/*variable*/ !important; } /*Make the caption as wide as the image */ span.flickr-credit, .flickr-citation { - padding: 0 4px; + padding: 0 (2*2)px; } diff --git a/style/css/flickrstyle_caption_border.css b/style/css/flickrstyle_caption_border.css index 658b227..dfbfbfe 100644 --- a/style/css/flickrstyle_caption_border.css +++ b/style/css/flickrstyle_caption_border.css @@ -1,6 +1,5 @@ span.flickr-credit { - /*Use the dedicated field at admin/config/media/flickr for a horizontal inside spacing value (padding/border).*/ padding: 3px 7px; - border: solid 2px lightgray; - background: white; + border: solid /*variable:flickrstyle_border_thickness*/2/*variable*/px /*variable:flickrstyle_border_color*/LightGrey/*variable*/; + background: /*variable:flickrstyle_bgcolor*/White/*variable*/; } diff --git a/style/css/flickrstyle_caption_shadow.css b/style/css/flickrstyle_caption_shadow.css index 73fc09d..3097cbd 100644 --- a/style/css/flickrstyle_caption_shadow.css +++ b/style/css/flickrstyle_caption_shadow.css @@ -1,10 +1,10 @@ span.flickr-credit { /*Use the dedicated field at admin/config/media/flickr for a horizontal inside spacing value (padding/border).*/ padding: 3px 7px; - background: white; - -webkit-box-shadow: 2px 2px 7px 3px #a5a5a5; - -moz-box-shadow: 2px 2px 7px 3px #a5a5a5; - box-shadow: 2px 2px 7px 3px #a5a5a5; + background: /*variable:flickrstyle_bgcolor*/White/*variable*/; + -webkit-box-shadow: 2px 2px 7px 3px /*variable:flickrstyle_shadow_color*/#a5a5a5/*variable*/; + -moz-box-shadow: 2px 2px 7px 3px /*variable:flickrstyle_shadow_color*/#a5a5a5/*variable*/; + box-shadow: 2px 2px 7px 3px /*variable:flickrstyle_shadow_color*/#a5a5a5/*variable*/; } .flickr-wrap { diff --git a/style/css/flickrstyle_rounded.css b/style/css/flickrstyle_rounded.css index 0c95bb0..643e948 100644 --- a/style/css/flickrstyle_rounded.css +++ b/style/css/flickrstyle_rounded.css @@ -2,7 +2,7 @@ img.flickr-photoset-img, .flickr-wrap, span.flickr-credit { - -webkit-border-radius: 1em; - -moz-border-radius: 1em; - border-radius: 1em; + -webkit-border-radius: /*variable:flickrstyle_radius*/1em/*variable*/; + -moz-border-radius: /*variable:flickrstyle_radius*/1em/*variable*/; + border-radius: /*variable:flickrstyle_radius*/1em/*variable*/; } diff --git a/style/css/flickrstyle_shadow.css b/style/css/flickrstyle_shadow.css index 5439422..8ff4264 100644 --- a/style/css/flickrstyle_shadow.css +++ b/style/css/flickrstyle_shadow.css @@ -1,9 +1,9 @@ .flickr-photo-img, img.flickr-photoset-img { margin: 0 3px 0 0; /*Shadows need some additional space*/ - -webkit-box-shadow: 2px 2px 7px 3px #a5a5a5; - -moz-box-shadow: 2px 2px 7px 3px #a5a5a5; - box-shadow: 2px 2px 7px 3px #a5a5a5; + -webkit-box-shadow: 2px 2px 7px 3px /*variable:flickrstyle_shadow_color*/#a5a5a5/*variable*/; + -moz-box-shadow: 2px 2px 7px 3px /*variable:flickrstyle_shadow_color*/#a5a5a5/*variable*/; + box-shadow: 2px 2px 7px 3px /*variable:flickrstyle_shadow_color*/#a5a5a5/*variable*/; } /*Additional space between the image and caption box*/ diff --git a/style/css/flickrstyle_wrapcaption_border.css b/style/css/flickrstyle_wrapcaption_border.css index 6a412de..6968516 100644 --- a/style/css/flickrstyle_wrapcaption_border.css +++ b/style/css/flickrstyle_wrapcaption_border.css @@ -1,7 +1,7 @@ .flickr-wrap { margin: 0; - border: solid 2px lightgray; - background: white; + border: solid 2px /*variable:flickrstyle_border_color*/LightGrey/*variable*/; + background: /*variable:flickrstyle_bgcolor*/White/*variable*/; } .flickr-photo-img { diff --git a/style/css/flickrstyle_wrapcaption_shadow.css b/style/css/flickrstyle_wrapcaption_shadow.css index b9dda2f..7b8c242 100644 --- a/style/css/flickrstyle_wrapcaption_shadow.css +++ b/style/css/flickrstyle_wrapcaption_shadow.css @@ -1,9 +1,9 @@ span.flickr-wrap { margin: 0 8px 5px 0 !important; - background: white; - -webkit-box-shadow: 2px 2px 7px 3px #a5a5a5; - -moz-box-shadow: 2px 2px 7px 3px #a5a5a5; - box-shadow: 2px 2px 7px 3px #a5a5a5; + background: /*variable:flickrstyle_bgcolor*/White/*variable*/; + -webkit-box-shadow: 2px 2px 7px 3px /*variable:flickrstyle_shadow_color*/#a5a5a5/*variable*/; + -moz-box-shadow: 2px 2px 7px 3px /*variable:flickrstyle_shadow_color*/#a5a5a5/*variable*/; + box-shadow: 2px 2px 7px 3px /*variable:flickrstyle_shadow_color*/#a5a5a5/*variable*/; } .flickr-photo-img { diff --git a/style/flickrstyle.admin.inc b/style/flickrstyle.admin.inc index 750bf60..e334aff 100644 --- a/style/flickrstyle.admin.inc +++ b/style/flickrstyle.admin.inc @@ -9,6 +9,7 @@ */ function flickrstyle_form_flickr_admin_settings_alter(&$form, &$form_state) { $form['#validate'][] = 'flickrstyle_admin_settings_validate'; + $form['#submit'][] = 'flickrstyle_admin_settings_submit'; // Do not display CSS styling options if the module's CSS is disabled. if (variable_get('flickr_css', 1)) { $options = array( @@ -19,6 +20,7 @@ function flickrstyle_form_flickr_admin_settings_alter(&$form, &$form_state) { $form['css_settings']['flickrstyle_styles'] = array( '#type' => 'checkboxes', '#title' => t('Image styles'), + '#description' => t('Shadow only = Image with shadow. No space between.
Border only = Some space between image and a solid border.
Shadow + Border = Some space between image and shadow. No real border.'), '#default_value' => variable_get('flickrstyle_styles', array( 'rounded' => 'rounded', 'shadow' => 'shadow', @@ -32,6 +34,88 @@ function flickrstyle_form_flickr_admin_settings_alter(&$form, &$form_state) { 'shadow' => 'shadow', 'border' => 'border', )); + if (module_exists('style_settings')) { + $form['css_settings']['css_variables']['flickrstyle_rounded'] = array( + '#type' => 'textfield', + '#title' => t('Rounded corner radius'), + '#default_value' => variable_get('flickrstyle_rounded', 1), + '#field_suffix' => t('em (<5) or px (<50) or %'), + '#description' => t('A value of 50 or higher results in round/ellipse images.'), + '#size' => 3, + '#maxlength' => 3, + '#attributes' => array('class' => array('flickr-form-align')), + '#weight' => 9, + ); + // We need rounded corners before we can use a radius on it. + if (gettype($styles['rounded']) == 'integer') { + $form['css_settings']['css_variables']['flickrstyle_rounded']['#disabled'] = TRUE; + $form['css_settings']['css_variables']['flickrstyle_rounded']['#title'] = '' . t('Rounded corner radius') . ''; + $form['css_settings']['css_variables']['flickrstyle_rounded']['#description'] = '' . t('A value of 50 or higher results in round/ellipse images.') . ' | ' . t("Disabled until the 'Rounded corners' image style is selected below and saved."); + } + $form['css_settings']['css_variables']['flickrstyle_bgcolor'] = array( + '#type' => 'style_settings_colorpicker', + '#title' => t('Background color'), + '#description' => t('Applies on the bordered caption area and the space between image and border.'), + '#default_value' => variable_get('flickrstyle_bgcolor', 'White'), + '#weight' => 10, + ); + $form['css_settings']['css_variables']['flickrstyle_shadow_color'] = array( + '#type' => 'style_settings_colorpicker', + '#title' => t('Shadow color'), + '#default_value' => variable_get('flickrstyle_shadow_color', '#a5a5a5'), + '#weight' => 11, + ); + // We need a shadow before we can use a color for it. + if (gettype($styles['shadow']) == 'integer') { + $form['css_settings']['css_variables']['flickrstyle_shadow_color']['#disabled'] = TRUE; + $form['css_settings']['css_variables']['flickrstyle_shadow_color']['#title'] = '' . t('Shadow color') . ''; + $form['css_settings']['css_variables']['flickrstyle_shadow_color']['#description'] = t("Disabled until the 'Shadow' image style is selected below and saved."); + } + $form['css_settings']['css_variables']['flickrstyle_border_color'] = array( + '#type' => 'style_settings_colorpicker', + '#title' => t('Border color'), + '#default_value' => variable_get('flickrstyle_border_color', 'LightGrey'), + '#weight' => 12, + ); + $form['css_settings']['css_variables']['flickrstyle_border_thickness'] = array( + '#type' => 'textfield', + '#title' => t('Border thickness'), + '#default_value' => variable_get('flickrstyle_border_thickness', 2), + '#field_suffix' => t('px'), + '#size' => 1, + '#maxlength' => 1, + '#attributes' => array('class' => array('flickr-form-align')), + '#weight' => 13, + ); + $form['css_settings']['css_variables']['flickrstyle_spacing'] = array( + '#type' => 'textfield', + '#title' => t('Space between image and border'), + '#default_value' => variable_get('flickrstyle_spacing', 2), + '#field_suffix' => t('px'), + '#size' => 1, + '#maxlength' => 1, + '#attributes' => array('class' => array('flickr-form-align')), + '#weight' => 14, + ); + $form['css_settings']['css_variables']['flickrstyle_magnifier_opacity'] = array( + '#type' => 'style_settings_slider', + '#title' => t('Magnifier icon opacity'), + '#description' => t('0 = transparent. 1 = opaque.'), + '#default_value' => variable_get('flickrstyle_magnifier_opacity', 0.85), + '#weight' => 15, + ); + // We need a border before we can use a color or thickness for it. + // Same with a shadow when we don't have a real border. + if (gettype($styles['shadow']) == 'string' || gettype($styles['border']) == 'integer') { + $form['css_settings']['css_variables']['flickrstyle_border_color']['#disabled'] = TRUE; + $form['css_settings']['css_variables']['flickrstyle_border_color']['#title'] = '' . t('Border color') . ''; + $form['css_settings']['css_variables']['flickrstyle_border_color']['#description'] = t("Disabled until the 'Border' image style is selected below and saved. 'Shadow' must be unselected as it suppresses a real border."); + $form['css_settings']['css_variables']['flickrstyle_border_thickness']['#disabled'] = TRUE; + $form['css_settings']['css_variables']['flickrstyle_border_thickness']['#title'] = '' . t('Border thickness') . ''; + $form['css_settings']['css_variables']['flickrstyle_border_thickness']['#description'] = t("Disabled until the 'Border' image style is selected below and saved. 'Shadow' must be unselected as it suppresses a real border."); + } + } + // We need a shadow and/or border before we can use a style on the caption // and a reset to 'No' of it if so. if (gettype($styles['shadow']) == 'integer' && gettype($styles['border']) == 'integer') { @@ -99,6 +183,34 @@ function flickrstyle_form_flickr_admin_settings_alter(&$form, &$form_state) { ); $form['css_settings']['flickrstyle_emphasize'][2]['#disabled'] = TRUE; } + $magnifierurl = l(t('http://cdn-img.easyicon.net/png/5053/505399.png'), 'http://cdn-img.easyicon.net/png/5053/505399.png', array( + 'attributes' => array( + 'title' => t('505399.png (128×128)'), + 'target' => '_blank', + ), + )); + global $base_url; + $localmagnifierurl = l(t('local default icon'), $base_url . '/' . drupal_get_path('module', 'flickr') . '/style/img/magnifier.png', array( + 'attributes' => array( + 'title' => t('magnifier.png (116×115)'), + 'target' => '_blank', + ), + )); + $css = l(t('flickrstyle_magnifier.css'), $base_url . '/' . drupal_get_path('module', 'flickr') . '/style/css/flickrstyle_magnifier.css', array( + 'attributes' => array( + 'title' => t('modules/flickr/style/css/flickrstyle_magnifier.css'), + 'target' => '_blank', + ), + )); + $form['css_settings']['flickrstyle_magnifier_image'] = array( + '#type' => 'textfield', + '#title' => t('Magnifier icon URL'), + '#description' => t("Absolute URL, e.g. !magnifierurl. Leave empty to use the !localmagnifierurl. It is resized to 50x50 by !css.", array('!magnifierurl' => $magnifierurl, '!localmagnifierurl' => $localmagnifierurl, '!css' => $css)), + '#default_value' => variable_get('flickrstyle_magnifier_image', ''), + '#size' => 80, + '#maxlength' => 160, + '#weight' => 13, + ); } else { $form['css_settings']['flickrstyle_suppressed'] = array( @@ -111,5 +223,61 @@ function flickrstyle_form_flickr_admin_settings_alter(&$form, &$form_state) { * Validate user input. */ function flickrstyle_admin_settings_validate($form, &$form_state) { - // Put validation rules here. + if (variable_get('flickr_css', 1) && module_exists('style_settings')) { + $limit = trim($form_state['values']['flickrstyle_rounded']); + // Validate the radius size. + if (!is_numeric($limit) || $limit < 0) { + form_set_error('flickrstyle_rounded', t('Set a number from 0 to 999.')); + } + // Validate the border thickness. + if (!is_numeric($form_state['values']['flickrstyle_border_thickness'])) { + form_set_error('flickrstyle_border_thickness', t('Set a number.')); + } + // Validate the spacing. + if (!is_numeric($form_state['values']['flickrstyle_spacing'])) { + form_set_error('flickrstyle_spacing', t('Set a number.')); + } + } + // Validate the magnifier icon URL. + $form_state['values']['flickrstyle_magnifier_image'] = trim($form_state['values']['flickrstyle_magnifier_image']); + if (!empty($form_state['values']['flickrstyle_magnifier_image']) && !valid_url($form_state['values']['flickrstyle_magnifier_image'], TRUE)) { + form_set_error('flickrstyle_magnifier_image', t('This URL is not valid.')); + } + else { + $url = !empty($form_state['values']['flickrstyle_magnifier_image']) ? check_url($form_state['values']['flickrstyle_magnifier_image']) : ''; + if (!empty($url)) { + $headers = @get_headers($url, 1); + if (isset($headers['Content-Type'])) { + if (strpos($headers['Content-Type'], 'image/') === FALSE) { + form_set_error('flickrstyle_magnifier_image', t('This URL is not an image, does not exist or something else is wrong with it.')); + } + else { + variable_set('flickrstyle_magnifier_image', $url); + } + } + else { + form_set_error('flickrstyle_magnifier_image', t('This URL is not valid.')); + } + } + else { + variable_set('flickrstyle_magnifier_image', $url); + } + } +} + +/** + * Submit form data. + */ +function flickrstyle_admin_settings_submit($form, &$form_state) { + if (variable_get('flickr_css', 1) && module_exists('style_settings')) { + if ($form_state['values']['flickrstyle_rounded'] < 5) { + variable_set('flickrstyle_radius', $form_state['values']['flickrstyle_rounded'] . 'em'); + } + elseif ($form_state['values']['flickrstyle_rounded'] < 50) { + variable_set('flickrstyle_radius', $form_state['values']['flickrstyle_rounded'] . 'px'); + } + else { + variable_set('flickrstyle_radius', $form_state['values']['flickrstyle_rounded'] . '%'); + } + } } diff --git a/style/flickrstyle.install b/style/flickrstyle.install index 4a3b2ae..efe104c 100644 --- a/style/flickrstyle.install +++ b/style/flickrstyle.install @@ -12,4 +12,6 @@ function flickrstyle_uninstall() { variable_del('flickrstyle_caption'); variable_del('flickrstyle_emphasize'); variable_del('flickrstyle_nostyle'); + variable_del('flickrstyle_rounded'); + variable_del('flickrstyle_radius'); } diff --git a/tags/flickr_tags.admin.inc b/tags/flickr_tags.admin.inc index 6963d63..fce0a1f 100644 --- a/tags/flickr_tags.admin.inc +++ b/tags/flickr_tags.admin.inc @@ -16,7 +16,7 @@ function flickr_tags_form_flickr_admin_settings_alter(&$form, &$form_state) { '#collapsed' => TRUE, '#weight' => 22, ); - $form['tags_settings']['flickr_tags_in_cloud'] = array( + $form['tags_settings']['flickr_tags_in_cloud'] = array( '#type' => 'textfield', '#title' => t('Maximum number of tags in a tag cloud'), '#required' => TRUE, @@ -25,15 +25,44 @@ function flickr_tags_form_flickr_admin_settings_alter(&$form, &$form_state) { '#size' => 3, '#maxlength' => 3, ); + $form['tags_settings']['flickr_tags_minfont'] = array( + '#type' => 'textfield', + '#title' => t('Minimum font size'), + '#required' => TRUE, + '#default_value' => variable_get('flickr_tags_minfont', 0.7), + '#size' => 3, + '#maxlength' => 3, + '#field_suffix' => t('em'), + '#attributes' => array('class' => array('flickr-form-align')), + ); + $form['tags_settings']['flickr_tags_maxfont'] = array( + '#type' => 'textfield', + '#title' => t('Maximum font size'), + '#required' => TRUE, + '#default_value' => variable_get('flickr_tags_maxfont', 3.5), + '#size' => 3, + '#maxlength' => 3, + '#field_suffix' => t('em'), + '#attributes' => array('class' => array('flickr-form-align')), + ); } /** * Validate user input. */ function flickr_tags_admin_settings_validate($form, &$form_state) { - $limit = trim($form_state['values']['flickr_tags_in_cloud']); // Validate tags in cloud. - if (!is_numeric($limit) || $limit < 1) { - form_set_error('flickr_tags_in_cloud', t('Set a number from 1 to 999.')); + $limit = trim($form_state['values']['flickr_tags_in_cloud']); + if (!ctype_digit($limit) || $limit < 1) { + form_set_error('flickr_tags_in_cloud', t('Set an integer from 1 to 999.')); + } + // Validate the tags font size. + $limit = trim($form_state['values']['flickr_tags_minfont']); + if (!is_numeric($limit) || $limit < 0) { + form_set_error('flickr_tags_minfont', t('Set a number from 0 to 999.')); + } + $limit = trim($form_state['values']['flickr_tags_maxfont']); + if (!is_numeric($limit) || $limit < 0) { + form_set_error('flickr_tags_maxfont', t('Set a number from 0 to 999.')); } } diff --git a/tags/flickr_tags.module b/tags/flickr_tags.module index c2cdd52..a10650e 100644 --- a/tags/flickr_tags.module +++ b/tags/flickr_tags.module @@ -229,8 +229,8 @@ function theme_flickr_tags_cloud($variables) { $min_occur = min($tags); // Font size specified in em. - $max_font = 3.5; - $min_font = 0.7; + $max_font = variable_get('flickr_tags_maxfont', 3.5); + $min_font = variable_get('flickr_tags_minfont', 0.7); $output = "