diff --git a/flickr.admin.inc b/flickr.admin.inc index a8da07f..561c7b7 100644 --- a/flickr.admin.inc +++ b/flickr.admin.inc @@ -261,22 +261,6 @@ 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)), ); - $style_doc = l(t('Style Guide'), 'https://drupal.org/node/2174131#caption', array( - 'attributes' => array( - 'title' => t('Flickr Style Guide documentation | Drupal.org'), - 'target' => '_blank', - ), - )); - $form['css_settings']['flickr_caption_padding'] = array( - '#type' => 'textfield', - '#title' => t('Make the caption smaller in width (correction for caption padding/border)'), - '#required' => TRUE, - '#default_value' => variable_get('flickr_caption_padding', 0), - '#description' => t('By default the caption is as wide as the image. If you add padding to a boxed caption with CSS, set a value here to make sure the caption will remain of the same width of the image. See the !style_doc.
Only padding: 1 x horizontal padding value.
Padding AND border: 2 x padding value + 1 x border-width.', array('!style_doc' => $style_doc)), - '#field_suffix' => t('px'), - '#size' => 2, - '#maxlength' => 2, - ); $flickr_style = l(t('Flickr Style'), 'admin/modules', array( 'attributes' => array( 'title' => t('Extra configuration options.'), @@ -414,7 +398,6 @@ function flickr_admin_settings_validate($form, &$form_state) { $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']); - $limit4 = trim($form_state['values']['flickr_caption_padding']); $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.')); diff --git a/flickr.css b/flickr.css index 934187b..e92e1d7 100644 --- a/flickr.css +++ b/flickr.css @@ -28,15 +28,12 @@ span.flickr-photoset-single { vertical-align: top; } -.flickr-photo-img, -img.flickr-photoset-img { - border: solid 2px transparent; -} - span.flickr-credit { display: block; - float: left; - clear: both; + overflow: hidden; + /* float: left; + clear: both;*/ + padding: 0 0 4px 4px; font-size: 80%; line-height: 100%; } @@ -78,11 +75,15 @@ span.flickr-tags { .flickr-wrap, .flickr-wrap img, .flickr-wrap .flickr-credit { + /* See http://stackoverflow.com/a/11390432/523688 */ + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; max-width: 100%; } a.flickr-img-wrap { - float: left; + /* float: left;*/ } div.flickr-photoset { @@ -101,3 +102,11 @@ span.flickr-empty { .tips span.ctools-toggle { float: none !important; } + +span.grayed-out { + color: darkgray; +} + +span.grayed-out-help { + color: #666; +} diff --git a/flickr.install b/flickr.install index e490385..c242037 100644 --- a/flickr.install +++ b/flickr.install @@ -40,7 +40,6 @@ function flickr_uninstall() { variable_del('flickr_title_suppress_on_small'); variable_del('flickr_metadata_suppress_on_small'); variable_del('flickr_info_overlay'); - variable_del('flickr_caption_padding'); variable_del('flickr_license'); variable_del('flickr_restrict'); variable_del('flickr_extend'); @@ -118,3 +117,10 @@ function flickr_update_7102() { variable_set('flickr_rel', 'lightbox[gallery]'); } } + +/** + * Delete unused variables. + */ +function flickr_update_7103() { + variable_del('flickr_caption_padding'); +} diff --git a/flickr.module b/flickr.module index fbdb144..7083a06 100644 --- a/flickr.module +++ b/flickr.module @@ -358,7 +358,7 @@ function theme_flickr_photo($variables) { $class_float = ''; } if (isset($attribs['style'])) { - $style_float = (stripos($attribs['style'], 'float') !== FALSE) ? ' style="' . $attribs['style'] . '"' : ''; + $style_float = (stripos($attribs['style'], 'float') !== FALSE) ? ' "' . $attribs['style'] . '";' : ''; } else { $style_float = ''; @@ -491,12 +491,6 @@ function theme_flickr_photo($variables) { $width = '150'; $skip = TRUE; } - if ($width < $height && !$skip) { - $attribs['style'] = isset($attribs['style']) ? $attribs['style'] . 'width: ' . $width . 'px;' . ' height: ' . $height . 'px;' : 'width: ' . $width . 'px;' . ' height: ' . $height . 'px'; - } - else { - $attribs['style'] = isset($attribs['style']) ? $attribs['style'] . 'width: ' . $width . 'px;' : 'width: ' . $width . 'px;'; - } if ($sise != 'q') { $size = flickr_one_size_bigger($size); } @@ -666,7 +660,7 @@ function theme_flickr_photo($variables) { // 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) { - return '' . l($img . $magnifier, $photo_url, array( + return '' . l($img . $magnifier, $photo_url, array( 'attributes' => array( 'title' => $title, 'target' => '_blank', @@ -696,7 +690,7 @@ function theme_flickr_photo($variables) { - ' . l($img . $magnifier, $photo_url . '/?width=480&height=280&inline=true#' . $photo['id'], array( + ' . l($img . $magnifier, $photo_url . '/?width=480&height=280&inline=true#' . $photo['id'], array( 'attributes' => array( 'title' => $overlayhtml, 'class' => 'colorbox-inline flickr-img-wrap', @@ -705,7 +699,7 @@ function theme_flickr_photo($variables) { ), 'absolute' => TRUE, 'html' => TRUE, - )) . $license_overlay . '' . l($credit, $photo_url, array( + )) . $license_overlay . '' . l($credit, $photo_url, array( 'attributes' => array( 'title' => t('View on Flickr. To enlarge click image.'), 'target' => '_blank', @@ -714,7 +708,7 @@ function theme_flickr_photo($variables) { )) . $metadatacaption . ''; } else { - return '' . l($img . $magnifier, $url, array( + return '' . l($img . $magnifier, $url, array( 'attributes' => array( 'title' => $overlayhtml, 'class' => array($class . ' flickr-img-wrap'), @@ -723,7 +717,7 @@ function theme_flickr_photo($variables) { ), 'absolute' => TRUE, 'html' => TRUE, - )) . $license_overlay . '' . l($credit, $photo_url, array( + )) . $license_overlay . '' . l($credit, $photo_url, array( 'attributes' => array( 'title' => t('View on Flickr. To enlarge click image.'), 'target' => '_blank', diff --git a/flickr_cc_icons_on_hover.css b/flickr_cc_icons_on_hover.css index e218d2d..02a798b 100644 --- a/flickr_cc_icons_on_hover.css +++ b/flickr_cc_icons_on_hover.css @@ -4,7 +4,7 @@ } span.flickr-image { - position: relative; +/* position: relative;*/ } .flickr-image:hover .flickr-image span.flickr-cc, diff --git a/style/css/flickrstyle_big.css b/style/css/flickrstyle_big.css index 540e8dd..5c99736 100644 --- a/style/css/flickrstyle_big.css +++ b/style/css/flickrstyle_big.css @@ -20,6 +20,7 @@ img.flickr-photoset-img { -ms-transition: all 0.2s ease; -o-transition: all 0.2s ease; transition: all 0.2s ease; + border: solid 2px transparent; background: none; -o-object-fit: cover; diff --git a/style/css/flickrstyle_border.css b/style/css/flickrstyle_border.css index 27dd263..86ed525 100644 --- a/style/css/flickrstyle_border.css +++ b/style/css/flickrstyle_border.css @@ -6,5 +6,5 @@ img.flickr-photoset-img { /*Make the caption as wide as the image */ span.flickr-credit, .flickr-citation { - padding: 0 2px; + padding: 0 2px 4px 4px; } diff --git a/style/css/flickrstyle_bordernoshadow.css b/style/css/flickrstyle_bordernoshadow.css index a808e16..f3036bb 100644 --- a/style/css/flickrstyle_bordernoshadow.css +++ b/style/css/flickrstyle_bordernoshadow.css @@ -2,6 +2,7 @@ img.flickr-photoset-img { padding: 2px; border: solid 2px lightgray !important; + background: white !important; } /*Make the caption as wide as the image */ diff --git a/style/css/flickrstyle_caption_border.css b/style/css/flickrstyle_caption_border.css index ee6b8ec..658b227 100644 --- a/style/css/flickrstyle_caption_border.css +++ b/style/css/flickrstyle_caption_border.css @@ -1,6 +1,6 @@ span.flickr-credit { /*Use the dedicated field at admin/config/media/flickr for a horizontal inside spacing value (padding/border).*/ - padding: 3px 10px; + padding: 3px 7px; border: solid 2px lightgray; background: white; } diff --git a/style/css/flickrstyle_caption_shadow.css b/style/css/flickrstyle_caption_shadow.css index 32e298f..bd95639 100644 --- a/style/css/flickrstyle_caption_shadow.css +++ b/style/css/flickrstyle_caption_shadow.css @@ -1,6 +1,7 @@ span.flickr-credit { +/* max-width: 95% !important;*/ /*Use the dedicated field at admin/config/media/flickr for a horizontal inside spacing value (padding/border).*/ - padding: 3px 10px; + padding: 3px 7px; background: white; -webkit-box-shadow: 2px 2px 7px 3px #a5a5a5; -moz-box-shadow: 2px 2px 7px 3px #a5a5a5; diff --git a/style/css/flickrstyle_wrapcaption_shadowwithborder.css b/style/css/flickrstyle_wrapcaption_shadowwithborder.css deleted file mode 100644 index 414736e..0000000 --- a/style/css/flickrstyle_wrapcaption_shadowwithborder.css +++ /dev/null @@ -1,3 +0,0 @@ -span.flickr-wrap { -/* border: solid 2px white;*/ -} diff --git a/style/flickrstyle.admin.inc b/style/flickrstyle.admin.inc index 6ad69c6..5ff2a2f 100644 --- a/style/flickrstyle.admin.inc +++ b/style/flickrstyle.admin.inc @@ -32,28 +32,6 @@ function flickrstyle_form_flickr_admin_settings_alter(&$form, &$form_state) { 'shadow' => 'shadow', 'border' => 'border', )); - switch (variable_get('flickrstyle_caption', 1)) { - case 0: - // Reset of the caption width if not altered by the user. - if (variable_get('flickr_caption_padding', 0) == 10 || variable_get('flickr_caption_padding', 0) == 16) { - variable_set('flickr_caption_padding', 0); - } - break; - - case 1: - // Adjustment of the caption width if not altered already. - if (variable_get('flickr_caption_padding', 0) == 0 || variable_get('flickr_caption_padding', 0) == 10) { - variable_set('flickr_caption_padding', 16); - } - break; - - case 2: - // Adjustment of the caption width if not altered already. - if (variable_get('flickr_caption_padding', 0) == 0 || variable_get('flickr_caption_padding', 0) == 16) { - variable_set('flickr_caption_padding', 10); - } - break; - } // 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') { @@ -74,6 +52,11 @@ function flickrstyle_form_flickr_admin_settings_alter(&$form, &$form_state) { // We need a shadow and/or border before we can use a style on the caption. if (gettype($styles['shadow']) == 'integer' && gettype($styles['border']) == 'integer') { $form['css_settings']['flickrstyle_caption']['#disabled'] = TRUE; + $form['css_settings']['flickrstyle_caption']['#options'] = array( + '' . t('No') . '', + '' . t('Yes, separate from the image') . '', + '' . t('Yes, wrapped around the image and caption') . '', + ); $form['css_settings']['flickrstyle_caption']['#description'] = t('Disabled until a shadow and/or border image style is selected. Select above and save the form to make a caption style available.'); } $form['css_settings']['flickrstyle_nostyle'] = array( @@ -82,6 +65,12 @@ function flickrstyle_form_flickr_admin_settings_alter(&$form, &$form_state) { '#default_value' => variable_get('flickrstyle_nostyle', 1), '#weight' => 11, ); + // Disable the 'Enlarge' style until a border is set or shadow unselected. + if (gettype($styles['shadow']) != 'integer' && gettype($styles['border']) == 'integer') { + if (variable_get('flickrstyle_emphasize', 2) == 2) { + variable_set('flickrstyle_emphasize', 3); + } + } $form['css_settings']['flickrstyle_emphasize'] = array( '#type' => 'radios', '#title' => t('Emphasize the image on hover?'), @@ -97,6 +86,17 @@ function flickrstyle_form_flickr_admin_settings_alter(&$form, &$form_state) { '#description' => t("(*): The 'Zoom' and 'Enlarge' styles use bigger images to maintain the resolution. This has a slight performance impact and the size 'big square' (q) is not square but 150px on the longest side to avoid distortion on older browsers."), '#weight' => 12, ); + // Disable the 'Enlarge' style until a border is set or shadow unselected. + if (gettype($styles['shadow']) != 'integer' && gettype($styles['border']) == 'integer') { + $form['css_settings']['flickrstyle_emphasize']['#options'] = array( + t('No'), + t('Enlarge slightly (includes the caption)'), + '' . t('Enlarge (image only) (*)') . ' ' . t("Disabled until you set a 'border' or unselect 'shadow' in the 'Image styles' above. It will be available after saving the form.") . ' ', + t('Zoom (*)'), + t('Magnifier icon'), + ); + $form['css_settings']['flickrstyle_emphasize'][2]['#disabled'] = TRUE; + } } else { $form['css_settings']['flickrstyle_suppressed'] = array( diff --git a/style/flickrstyle.install b/style/flickrstyle.install index 58ed9f1..1841a88 100644 --- a/style/flickrstyle.install +++ b/style/flickrstyle.install @@ -5,18 +5,10 @@ */ /** - * Implements hook_install(). - */ -function flickrstyle_install() { - variable_set('flickr_caption_padding', 16); -} - -/** * Implements hook_uninstall(). */ function flickrstyle_uninstall() { variable_del('flickrstyle_styles'); variable_del('flickrstyle_caption'); variable_del('flickrstyle_emphasize'); - variable_set('flickr_caption_padding', 0); } diff --git a/style/flickrstyle.module b/style/flickrstyle.module index dba42d1..d33a1d6 100644 --- a/style/flickrstyle.module +++ b/style/flickrstyle.module @@ -71,12 +71,6 @@ function flickrstyle_page_build(&$page) { 'every_page' => TRUE, )); } - if (gettype($styles['shadow']) != 'integer' && gettype($styles['border']) != 'integer') { - drupal_add_css(drupal_get_path('module', 'flickrstyle') . '/css/flickrstyle_wrapcaption_shadowwithborder.css', array( - 'group' => CSS_DEFAULT, - 'every_page' => TRUE, - )); - } break; } if (variable_get('flickrstyle_nostyle', 1)) {