Projet

Général

Profil

Révision 599a39cd

Ajouté par Assos Assos il y a environ 3 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/date/date_views/theme/theme.inc
20 20
      case 'both':
21 21
        $vars['header'] .= $vars['pager'];
22 22
        break;
23

  
24
      default:
25
        // Already on the bottom.
26 23
    }
27 24
  }
28 25
}
......
60 57
  $min_date = $date_info->min_date;
61 58
  $max_date = $date_info->max_date;
62 59

  
63
  // Set up the pager link format. Setting the block identifier
64
  // will force pager style links.
60
  // Set up the pager link format. Setting the block identifier will force
61
  // pager style links.
65 62
  if ((isset($date_info->date_pager_format) && $date_info->date_pager_format != 'clean') || !empty($date_info->mini)) {
66 63
    if (empty($date_info->block_identifier)) {
67 64
      $date_info->block_identifier = $date_info->pager_id;
......
79 76
          $prev_week = date_week(date_format($prev_date, 'Y-m-d'));
80 77
          $prev_arg = date_format($prev_date, 'o-\W') . date_pad($prev_week);
81 78
          break;
79

  
82 80
        default:
83 81
          $prev_arg = date_format($prev_date, $format[$granularity]);
84 82
      }
......
92 90
          $next_week = date_week(date_format($next_date, 'Y-m-d'));
93 91
          $next_arg = date_format($next_date, 'o-\W') . date_pad($next_week);
94 92
          break;
93

  
95 94
        default:
96 95
          $next_arg = date_format($next_date, $format[$granularity]);
97 96
      }
......
110 109
    $vars['next_options'] = $vars['prev_options'] = array();
111 110
  }
112 111

  
113
  // Check whether navigation links would point to
114
  // a date outside the allowed range.
112
  // Check whether navigation links would point to a date outside the allowed
113
  // range.
115 114
  if (!empty($next_date) && !empty($vars['next_url']) && date_format($next_date, 'Y') > $date_info->limit[1]) {
116 115
    $vars['next_url'] = '';
117 116
  }
......
145 144
      $next_title = t('Navigate to next day');
146 145
      break;
147 146
  }
147

  
148 148
  $vars['prev_options']['attributes'] += array('title' => $prev_title);
149 149
  $vars['next_options']['attributes'] += array('title' => $next_title);
150 150

  
......
183 183
  $format = !empty($params['format']) ? $params['format'] : NULL;
184 184
  $format_with_year = variable_get('date_views_' . $granularity . '_format_with_year', 'l, F j, Y');
185 185
  $format_without_year = variable_get('date_views_' . $granularity . '_format_without_year', 'l, F j');
186

  
186 187
  switch ($granularity) {
187 188
    case 'year':
188 189
      $title = $date_info->year;
......
213 214
      $date_arg = $date_info->year . '-W' . date_pad($date_info->week);
214 215
      break;
215 216
  }
217

  
216 218
  if (!empty($date_info->mini) || $link) {
217 219
    // Month navigation titles are used as links in the mini view.
218 220
    $attributes = array('title' => t('View full page month'));
......
236 238
  $vars['minadjustment'] = drupal_render($form['minadjustment']);
237 239
  $vars['maxadjustment'] = drupal_render($form['maxadjustment']);
238 240
  $vars['description'] = drupal_render($form['description']) . drupal_render($form);
241
  drupal_add_css(drupal_get_path('module', 'date_api') . '/date.css');
239 242
}

Formats disponibles : Unified diff