Projet

Général

Profil

Révision f0456308

Ajouté par Assos Assos il y a plus de 9 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/views_data_export/plugins/views_data_export_plugin_display_export.inc
306 306
    // Build up our querystring for the final page callback.
307 307
    $querystring = array(
308 308
      'eid' => $this->batched_execution_state->eid,
309
      'return-url' => NULL,
309 310
    );
310
    // If we were attached to another view, grab that for the final URL.
311
    if (!empty($_GET['attach']) && isset($this->view->display[$_GET['attach']])) {
311

  
312
    // If we have a configured return path, use that.
313
    if ($this->get_option('return_path')) {
314
      $querystring['return-url'] = $this->get_option('return_path');
315
    }
316
    // Else if we were attached to another view, grab that for the final URL.
317
    else if (!empty($_GET['attach']) && isset($this->view->display[$_GET['attach']])) {
312 318
      // Get the path of the attached display:
313 319
      $querystring['return-url'] = $this->view->get_url(NULL, $this->view->display[$_GET['attach']]->handler->get_path());
314 320
    }
315
    else {
316
      $return_path = $this->get_option('return_path');
317
      $querystring['return-url'] = isset($return_path) ? $return_path : NULL;
318
    }
319 321

  
320 322
    //Set the batch off
321 323
    $batch = array(
drupal7/sites/all/modules/views_data_export/plugins/views_data_export_plugin_style_export.inc
149 149
   * feed image link.
150 150
   */
151 151
  function attach_to($display_id, $path, $title) {
152

  
153
    $type = $this->definition['export feed type'];
154
    $theme_pattern = array(
155
      'views_data_export_feed_icon__' . $this->view->name . '__' . $display_id . '__' . $type,
156
      'views_data_export_feed_icon__' . $this->view->name . '__' . $display_id,
157
      'views_data_export_feed_icon__' . $this->view->name . '__' . $type,
158
      'views_data_export_feed_icon__' . $display_id . '__' . $type,
159
      'views_data_export_feed_icon__' . $display_id,
160
      'views_data_export_feed_icon__' . $type,
161
      'views_data_export_feed_icon',
162
    );
163
    $query = $this->view->get_exposed_input();
164
    // Stash the display id we're coming form in the url so we can hijack it later.
165
    if ($this->options['parent_sort']) {
166
      $query['attach'] = $display_id;
167
    }
168
    if (!isset($this->view->feed_icon)) {
169
      $this->view->feed_icon = '';
152
    if ($this->display->handler->access()) {
153
      $type = $this->definition['export feed type'];
154
      $theme_pattern = array(
155
        'views_data_export_feed_icon__' . $this->view->name . '__' . $display_id . '__' . $type,
156
        'views_data_export_feed_icon__' . $this->view->name . '__' . $display_id,
157
        'views_data_export_feed_icon__' . $this->view->name . '__' . $type,
158
        'views_data_export_feed_icon__' . $display_id . '__' . $type,
159
        'views_data_export_feed_icon__' . $display_id,
160
        'views_data_export_feed_icon__' . $type,
161
        'views_data_export_feed_icon',
162
      );
163
      $query = $this->view->get_exposed_input();
164
      // Stash the display id we're coming form in the url so we can hijack it later.
165
      if ($this->options['parent_sort']) {
166
        $query['attach'] = $display_id;
167
      }
168
      if (!isset($this->view->feed_icon)) {
169
        $this->view->feed_icon = '';
170
      }
171
      $this->view->feed_icon .= theme($theme_pattern, array(
172
          'image_path' => $this->definition['export feed icon'],
173
          'url' => $this->view->get_url(NULL, $path),
174
          'query' => $query,
175
          'text' => $this->options['attach_text'],
176
        )
177
      );
170 178
    }
171
    $this->view->feed_icon .= theme($theme_pattern, array(
172
        'image_path' => $this->definition['export feed icon'],
173
        'url' => $this->view->get_url(NULL, $path),
174
        'query' => $query,
175
        'text' => $this->options['attach_text'],
176
      )
177
    );
178 179
  }
179 180

  
180 181
  function build_sort() {
......
329 330
      $count = 0;
330 331
      foreach ($view->display_handler->get_handlers('argument') as $arg => $handler) {
331 332
        $token = '%' . ++$count;
332
        $tokens[$token . '-title'] = check_plain($handler->title());
333
        $tokens[$token . '-title'] = $handler->get_title();
333 334
        $tokens[$token . '-value'] = isset($view->args[$count - 1]) ? check_plain($view->args[$count - 1]) : '';
334 335
      }
335 336

  
drupal7/sites/all/modules/views_data_export/views_data_export.drush.inc
159 159
  // We execute the view normally, and take advantage
160 160
  // of an alter function to interject later and batch it ourselves
161 161

  
162
  $options = array (
163
    'output_file' => realpath(drush_get_context('DRUSH_OLDCWD', getcwd())) . '/' . $output_file,
164
  );
162
  $options = array();
163
  // Let's see if the given $output_file is a absolute path.
164
  if (strpos($output_file, '/') === 0) {
165
    $options['output_file'] = $output_file;
166
  }
167
  else {
168
    $options['output_file'] = realpath(drush_get_context('DRUSH_OLDCWD', getcwd())) . '/' . $output_file;
169
  }
170

  
171

  
165 172
  if ($view->display_handler->is_batched()) {
166 173
    // This is a batched export, and needs to be handled as such.
167 174
    _drush_views_data_export_override_batch($view_name, $display_id, $options);
drupal7/sites/all/modules/views_data_export/views_data_export.info
4 4
package = Views
5 5
core = 7.x
6 6

  
7
files[] = views_data_export.module
8 7
dependencies[] = views
9 8

  
10 9
; Plugins
......
21 20
files[] = "tests/xls_export.test"
22 21
files[] = "tests/xml_export.test"
23 22

  
24
; Information added by Drupal.org packaging script on 2013-12-12
25
version = "7.x-3.0-beta7"
23
; Information added by Drupal.org packaging script on 2014-08-27
24
version = "7.x-3.0-beta8"
26 25
core = "7.x"
27 26
project = "views_data_export"
28
datestamp = "1386882544"
27
datestamp = "1409118835"
29 28

  
drupal7/sites/all/modules/views_data_export/views_data_export.install
75 75
        'description' => 'The time this cache was created or updated.',
76 76
      ),
77 77
      'data' => array(
78
        'type' => 'text',
78
        'type' => 'blob',
79 79
        'size' => 'big',
80 80
        'description' => 'Serialized data being stored.',
81 81
        'serialize' => TRUE,
......
142 142
    db_change_field('views_data_export', $field_name, $field_name, $spec);
143 143
  }
144 144
}
145

  
145
/**
146
 * Change the object cache table to support postgres installations
147
 */
148
function views_data_export_update_7301(){
149
  $spec = array(
150
        'type' => 'blob',
151
        'size' => 'big',
152
        'description' => 'Serialized data being stored.',
153
        'serialize' => TRUE,
154
      );
155
  db_change_field('views_data_export_object_cache', 'data', 'data', $spec);
156
}
146 157

  
147 158

  
148 159
/**
drupal7/sites/all/modules/views_data_export/views_data_export.module
264 264
 *   An export ID or an array of export IDs to clear from the object cache.
265 265
 */
266 266
function views_data_export_view_clear($export_id) {
267
  if (is_array($export_id)) {
268
    db_delete('views_data_export_object_cache')
269
    ->condition('eid', $export_id, 'IN')
270
    ->execute();
271
  }
272
  else {
273
    db_delete('views_data_export_object_cache')
267
  db_delete('views_data_export_object_cache')
274 268
    ->condition('eid', $export_id)
275 269
    ->execute();
270
}
271

  
272
/**
273
 * Implements hook_file_presave().
274
 */
275
function views_data_export_file_presave($file) {
276
  // Ensure temporary files really are temporary.
277
  // @see: https://drupal.org/node/2198399
278
  if (strpos($file->filename, 'views_data_export') === 0) {
279
    // There is no FILE_STATUS_TEMPORARY.
280
    $file->status = 0;
276 281
  }
277 282
}
drupal7/sites/all/themes/corporateclean/corporateclean.info
37 37
settings[slideshow_pause]= 0
38 38
settings[responsive_meta]= 1
39 39
settings[responsive_respond]= 0
40
; Information added by drupal.org packaging script on 2013-05-13
41
version = "7.x-2.2"
40
settings[credits_display]= 1
41
; Information added by Drupal.org packaging script on 2014-08-26
42
version = "7.x-2.3"
42 43
core = "7.x"
43 44
project = "corporateclean"
44
datestamp = "1368461412"
45
datestamp = "1409051936"
45 46

  
drupal7/sites/all/themes/corporateclean/page.tpl.php
278 278
       
279 279
    </div><!-- EOF: #footer-bottom-inside -->
280 280
    
281
    <?php if (theme_get_setting('credits_display','corporateclean')): ?>
281 282
    <!-- #credits -->   
282 283
    <div id="credits" class="container_12 clearfix">
283 284
        <div class="grid_12">
......
285 286
        </div>
286 287
    </div>
287 288
    <!-- EOF: #credits -->
289
    <?php endif; ?>
288 290

  
289 291
</div><!-- EOF: #footer -->
drupal7/sites/all/themes/corporateclean/template.php
113 113
	
114 114
	//Initialize slideshow using theme settings
115 115
	$effect=theme_get_setting('slideshow_effect','corporateclean');
116
	$effect_time=theme_get_setting('slideshow_effect_time','corporateclean')*1000;
116
	$effect_time= (int) theme_get_setting('slideshow_effect_time','corporateclean')*1000;
117 117
	$slideshow_randomize=theme_get_setting('slideshow_randomize','corporateclean');
118 118
	$slideshow_wrap=theme_get_setting('slideshow_wrap','corporateclean');
119 119
	$slideshow_pause=theme_get_setting('slideshow_pause','corporateclean');
drupal7/sites/all/themes/corporateclean/theme-settings.php
150 150
	'#default_value' => theme_get_setting('responsive_respond','corporateclean'),
151 151
    '#description'   => t('IE 6-8 require a JavaScript polyfill solution to add basic support of CSS3 media queries. Note that you should enable <strong>Aggregate and compress CSS files</strong> through <em>/admin/config/development/performance</em>.'),
152 152
  );
153
    
154
  $form['mtt_settings']['credits'] = array(
155
    '#type' => 'fieldset',
156
    '#title' => t('Credits'),
157
    '#collapsible' => TRUE,
158
	'#collapsed' => FALSE,
159
  );
160
  
161
  $form['mtt_settings']['credits']['credits_display'] = array(
162
    '#type' => 'checkbox',
163
    '#title' => t('Show credits'),
164
  	'#description'   => t('Use the checkbox to enable or disable credits.'),
165
	'#default_value' => theme_get_setting('credits_display','corporateclean'),
166
  );
153 167
  
154 168
}

Formats disponibles : Unified diff