Commit 1e0fa730 authored by Anton Gunosov's avatar Anton Gunosov
Browse files

Fix issue with nid. Some changes in galleria.config.js file

parent 19d0fb7c
Loading
Loading
Loading
Loading
+2 −20
Original line number Diff line number Diff line
@@ -626,38 +626,20 @@ function theme_flickrup_photo($variables) {
    ));
  }
  else {
    $output = theme('html_tag', array(
      'element' => array(
        '#tag' => 'div',
        '#attributes' => array(
          'class' => 'flickrup-photo-default',
        ),
        '#value' => $image,
      ),
    ));
    $output = $image;
  }

  // Checking on if it's a teaser, will add node link to a photo.
  if (!$teaser) {
    return $output;
  }
  elseif ($formatter !== 'g') {
  elseif ($formatter !== 'g' && isset($node->nid)) {
    $output = l($image, 'node/' . $node->nid, array(
      'attributes' => array('title' => $image_attributes['title']),
      'absolute' => TRUE,
      'html' => TRUE,
    ));

    $output = theme('html_tag', array(
      'element' => array(
        '#tag' => 'div',
        '#attributes' => array(
          'class' => 'flickrup-photo-teaser',
        ),
        '#value' => $output,
      ),
    ));

    return $output;
  }

+4 −6
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ function flickrup_requirements($phase) {
      $requirements['flickrup_galleria_plugin'] = array(
        'title' => $t('Galleria plugin'),
        'severity' => REQUIREMENT_WARNING,
        'description' => $t('For using Galleria formatter уou need to download the <a href="@download url">Galleria plugin</a> and extract the entire contents of the archive into the %path directory on your server.', array(
        'description' => $t('For using Galleria formatter Сѓou need to download the <a href="@download url">Galleria plugin</a> and extract the entire contents of the archive into the %path directory on your server.', array(
          '@download url' => $library['download url'],
          '%path' => 'sites/all/libraries',
        )),
@@ -79,17 +79,15 @@ function flickrup_requirements($phase) {
    }
    if (!variable_get('flickrup_auth_token', '')) {
      $requirements['flickrup_flickr_auth'] = array(
        'title' => $t('Flickr API Authorization keys'),
        'title' => $t('Flickr API Authorization token'),
        'severity' => REQUIREMENT_WARNING,
        'description' => $t('For using Galleria plugin, you need to download the <a href="@download url">Galleria plugin</a> and extract the entire contents of the archive into the %path directory on your server.', array(
          '@url' => url('admin/config/media/flickrup'),
        )),
        'description' => $t('No token. Please see <a href="@url">help</a> for additional instructions.', array('@url' => url('admin/help/flickrup', array('fragment' => 'auth')))),
        'value' => $t('Not set'),
      );
    }
    else {
      $requirements['flickrup_flickr_auth'] = array(
        'title' => $t('Flickr API Authorization keys'),
        'title' => $t('Flickr API Authorization token'),
        'severity' => REQUIREMENT_OK,
        'value' => $t('Has set up'),
      );
+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@
      // Initialize Galleria.
      for (var i = 0, length = settings.flickrup_field_name.length; i < length; i++) {
        Galleria.run('.field-name-' + settings.flickrup_field_name[i], {
          height: parseInt(settings.flickrup_galleria_height[i]),
          width: parseInt(settings.flickrup_galleria_width[i])
          height: settings.flickrup_galleria_height[i],
          width: settings.flickrup_galleria_width[i]
        });
      }
      Galleria.ready(function () {