Projet

Général

Profil

Révision 74f6bef0

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

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/commerce_price_flexyformatter/README.txt
1

  
2
--------------------------------------------------------------------------------
3
Commerce Price Flexyformatter
4
--------------------------------------------------------------------------------
5

  
6
Maintainer:  xlyz, xlyz@tiscali.it
7

  
8
Provides a flexible formatter for easy prices display finetuning.
9

  
10
Poject homepage: http://drupal.org/project/commerce_price_flexyformatter
11

  
12
Issues: http://drupal.org/project/issues/commerce_price_flexyformatter
13

  
14
Installation
15
------------
16

  
17
 * This module depends on Drupal Commerce http://drupal.org/project/commerce
18

  
19
 * Copy the whole delivery_commerce directory to your modules directory
20
   (e.g. DRUPAL_ROOT/sites/all/modules) and activate it in the modules page
21

  
22
 * Got to the "manage display" page of your entity and select "Formatted amount
23
   with selected components" as formatter and configure it
24

  
25
Documentation
26
-------------
27

  
28
This modules formats the price displayed according to the configuration options:
29

  
30
* which components should be added to the amount displayed
31
* label: if and which label shall be prepended to the amount
32
* custom class: if and which css class shall be added to the price element
33
  for custom styling
34
* tax calculation method: if taxes shall be added as calculated by commerce or
35
  calculated again on a different base (and on which components)
36
* weight: in which order (lower number goes first)
37

  
38
Up to two additional reference prices can be displayed.
drupal7/sites/all/modules/commerce_price_flexyformatter/commerce_price_flexyformatter.css
1
.flexy-reference {
1
.flexy-item {
2
  display: block;
3
  text-align: right;
4
  font-size: 110%;
5
}
6
.flexy-title {
7
  text-align: left;
8
}
9
.flexy-amount {
10
  display: inline-block;
11
  width: 10em;
12
  text-align: right;
13
}
14
.flexy-striked {
2 15
  text-decoration: line-through;
3
}
16
}
17

  
drupal7/sites/all/modules/commerce_price_flexyformatter/commerce_price_flexyformatter.info
5 5
core = 7.x
6 6

  
7 7

  
8
; Information added by drupal.org packaging script on 2013-09-30
8
; Information added by Drupal.org packaging script on 2014-03-23
9 9
version = "7.x-1.x-dev"
10 10
core = "7.x"
11 11
project = "commerce_price_flexyformatter"
12
datestamp = "1380560686"
12
datestamp = "1395580758"
13 13

  
drupal7/sites/all/modules/commerce_price_flexyformatter/commerce_price_flexyformatter.module
25 25
      'label' => t('Formatted amount with selected components'),
26 26
      'field types' => array('commerce_price'),
27 27
      'settings' => array(
28
        'selection' => array('base_price' => 'base_price'),
29
        'reference' => array(),
28
        'base' => array('selection' => array('base_price' => 'base_price'), 'weight' => 0, 'calc' => 'default'),
29
        'reference1' => array('class' => '.flexy-striked', 'weight' => -10, 'calc' => 'default'),
30
        'reference2' => array('weight' => 10, 'calc' => 'default'),
30 31
        // need this to load all price components, hoping will not be changed
31 32
        'calculation' => 'calculated_sell_price',
32 33
      ),
......
42 43

  
43 44
  $element = array();
44 45
  $defaults = array();
45
  $reference_defaults = array();
46

  
46
  $reference1_defaults = $reference2_defaults = array();
47
  $methods = array('default' => 'actual values',
48
                    'reference1' => 'calculated on reference1 selected components',
49
                    'reference2' => 'calculated on reference2 selected components');
47 50
  // Get all the price component types
48 51
  $options = commerce_price_component_titles();
49 52
  
50
  foreach ($settings['selection'] as $key => $value) {
53
  foreach ($settings['base']['selection'] as $key => $value) {
51 54
    if ($value != '0') { $defaults[] = $key; }
52 55
  }
53
  foreach ($settings['reference']['selection'] as $key => $value) {
54
    if ($value != '0') { $reference_defaults[] = $key; }
56
  foreach ($settings['reference1']['selection'] as $key => $value) {
57
    if ($value != '0') { $reference1_defaults[] = $key; }
58
  }
59
  foreach ($settings['reference2']['selection'] as $key => $value) {
60
    if ($value != '0') { $reference2_defaults[] = $key; }
55 61
  }
56 62

  
57
  $element['selection'] = array(
63
  $element['base']['selection'] = array(
58 64
    '#type' => 'checkboxes',
59 65
    '#options' => $options,
60 66
    '#default_value' => $defaults,
61 67
  );
62
  $element['reference'] = array (
68
  $element['base']['label'] = array(
69
    '#type' => 'textfield',
70
    '#title' => t('Label'),
71
    '#default_value' => $settings['base']['label'],
72
    '#size' => 20,
73
  );
74
  $element['base']['class'] = array(
75
    '#type' => 'textfield',
76
    '#title' => t('Custom class'),
77
    '#default_value' => $settings['base']['class'],
78
    '#size' => 20,
79
  );
80
  $element['base']['calc'] = array(
81
    '#type' => 'radios',
82
    '#options' => $methods,
83
    '#title' => t('Tax calculation method'),
84
    '#default_value' => $settings['base']['calc'],
85
  );
86
  $element['base']['weight'] = array(
87
    '#type' => 'textfield',
88
    '#title' => t('Weight'),
89
    '#default_value' => $settings['base']['weight'],
90
    '#size' => 6,
91
  );
92
  $element['reference1'] = array (
93
    '#type' => 'fieldset',
94
    '#title' => t('1st reference amount'),
95
    '#collapsible' => TRUE,
96
    '#collapsed' => ($settings['reference1']['enabled']? FALSE : TRUE),
97
  );
98
  $element['reference1']['enabled'] = array(
99
    '#title' => t('Enable'),
100
    '#type' => 'checkbox',
101
    '#default_value' => $settings['reference1']['enabled'],
102
  );
103
  $element['reference1']['selection'] = array(
104
    '#type' => 'checkboxes',
105
    '#options' => $options,
106
    '#default_value' => $reference1_defaults,
107
  );
108
  $element['reference1']['label'] = array(
109
    '#type' => 'textfield',
110
    '#title' => t('Label'),
111
    '#default_value' => $settings['reference1']['label'],
112
    '#size' => 20,
113
  );
114
  $element['reference1']['class'] = array(
115
    '#type' => 'textfield',
116
    '#title' => t('Custom class'),
117
    '#default_value' => $settings['reference1']['class'],
118
    '#size' => 20,
119
  );
120
  $element['reference1']['calc'] = array(
121
    '#type' => 'radios',
122
    '#options' => $methods,
123
    '#title' => t('Tax calculation method'),
124
    '#default_value' => $settings['reference1']['calc'],
125
  );
126
  $element['reference1']['weight'] = array(
127
    '#type' => 'textfield',
128
    '#title' => t('Weight'),
129
    '#default_value' => $settings['reference1']['weight'],
130
    '#size' => 6,
131
  );
132
  $element['reference2'] = array (
63 133
    '#type' => 'fieldset',
64
    '#title' => t('Reference amount'),
134
    '#title' => t('2nd reference amount'),
65 135
    '#collapsible' => TRUE,
66
    '#collapsed' => ($settings['reference']['enabled']? FALSE : TRUE),
136
    '#collapsed' => ($settings['reference2']['enabled']? FALSE : TRUE),
67 137
  );
68
  $element['reference']['enabled'] = array(
138
  $element['reference2']['enabled'] = array(
69 139
    '#title' => t('Enable'),
70 140
    '#type' => 'checkbox',
71
    '#default_value' => $settings['reference']['enabled'],
141
    '#default_value' => $settings['reference2']['enabled'],
72 142
  );
73
  $element['reference']['selection'] = array(
143
  $element['reference2']['selection'] = array(
74 144
    '#type' => 'checkboxes',
75 145
    '#options' => $options,
76
    '#default_value' => $reference_defaults,
146
    '#default_value' => $reference2_defaults,
147
  );
148
  $element['reference2']['label'] = array(
149
    '#type' => 'textfield',
150
    '#title' => t('Label'),
151
    '#default_value' => $settings['reference2']['label'],
152
    '#size' => 20,
153
  );
154
  $element['reference2']['class'] = array(
155
    '#type' => 'textfield',
156
    '#title' => t('Custom class'),
157
    '#default_value' => $settings['reference2']['class'],
158
    '#size' => 20,
159
  );
160
  $element['reference2']['calc'] = array(
161
    '#type' => 'radios',
162
    '#options' => $methods,
163
    '#title' => t('Tax calculation method'),
164
    '#default_value' => $settings['reference2']['calc'],
165
  );
166
  $element['reference2']['weight'] = array(
167
    '#type' => 'textfield',
168
    '#title' => t('Weight'),
169
    '#default_value' => $settings['reference2']['weight'],
170
    '#size' => 6,
77 171
  );
78 172

  
79 173
  return $element;
......
88 182

  
89 183
  $summary = array();
90 184
  $types = commerce_price_component_titles();
185
  $methods = array('default' => 'actual values',
186
                    'reference1' => 'calculated on reference1 selected components',
187
                    'reference2' => 'calculated on reference2 selected components');
91 188
  $components['list'] = '';
92 189
  $components['count'] = 0;
93
  foreach($settings['selection'] as $key => $value) {
190
  foreach($settings['base']['selection'] as $key => $value) {
94 191
    if ($value != '0') {
95 192
      $components['count']++;
96 193
      if ($components['count'] > 1) {$components['list'] .= ', ';}
......
101 198
    $summary[] = t('No components selected');
102 199
  }
103 200
  else {
104
    $summary[] = format_plural($components['count'], 'Selected component is !list.', 'Selected components are !list.', array('!list' => $components['list']));
105
    if ($settings['reference']['enabled']) {
201
    $description = ($settings['base']['label']?$settings['base']['label'].' - selected ':'Selected ') .
202
                   format_plural($components['count'], 'component is !list', 'components are !list', array('!list' => $components['list'])) .
203
                   ' - ' . t('weight: ') . $settings['base']['weight'] . ' - ' . t('tax ') . $methods[$settings['base']['calc']] .'.';
204
    $summary[] = $description;
205
    if ($settings['reference1']['enabled']) {
206
      $reference['list'] = '';
207
      $reference['count'] = 0;
208
      foreach($settings['reference1']['selection'] as $key => $value) {
209
        if ($value != '0') {
210
          $reference['count']++;
211
          if ($reference['count'] > 1) {$reference['list'] .= ', ';}
212
          $reference['list'] .= $types[$key];
213
        }
214
      }
215
      $description = ($settings['reference1']['label']?$settings['reference1']['label'].' - selected ':'1st reference amount enabled with selected ') .
216
                     format_plural($reference['count'], 'component is !list', 'components are !list', array('!list' => $reference['list'])) .
217
                     ' - ' . t('weight: ') . $settings['reference1']['weight'] . ' - ' . t('tax ') . 
218
                     $methods[$settings['reference1']['calc']] .'.';
219
     $summary[] = $description;
220
    }
221
    else {
222
      $summary[] = t('1st reference amount not enabled.');
223
    }
224
    if ($settings['reference2']['enabled']) {
106 225
      $reference['list'] = '';
107 226
      $reference['count'] = 0;
108
      foreach($settings['reference']['selection'] as $key => $value) {
227
      foreach($settings['reference2']['selection'] as $key => $value) {
109 228
        if ($value != '0') {
110 229
          $reference['count']++;
111 230
          if ($reference['count'] > 1) {$reference['list'] .= ', ';}
112 231
          $reference['list'] .= $types[$key];
113 232
        }
114 233
      }
115
      $summary[] = t('Reference amount enabled with !list.', array('!list' => $reference['list']));
234
      $description = ($settings['reference2']['label']?$settings['reference2']['label'].' - selected ':'2nd reference amount enabled with selected ') .
235
                     format_plural($reference['count'], 'component is !list', 'components are !list', array('!list' => $reference['list'])) .
236
                     ' - ' . t('weight: ') . $settings['reference2']['weight'] . ' - ' . t('tax ') . 
237
                     $methods[$settings['reference2']['calc']] .'.';
238
     $summary[] = $description;
116 239
    }
117 240
    else {
118
      $summary[] = t('Reference amount not enabled.');
241
      $summary[] = t('2nd reference amount not enabled.');
119 242
    }
120 243
  }
121
  
244

  
122 245
  return implode('<br />', $summary);
123 246
}
124 247
/**
......
139 262
 */
140 263
function commerce_price_flexyformatter_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) {
141 264
  $element = array();
142

  
143 265
  // Loop through each price value in this field.
144 266
  foreach ($items as $delta => $item) {
145 267
    // Do not render a price if the amount is NULL (i.e. non-zero empty value).
......
148 270
      // price was not available as opposed to just leaving a blank.
149 271
      continue;
150 272
    }
151

  
152 273
    // Theme the display of the price based on the display type.
153 274
    switch ($display['type']) {
154 275

  
155 276
      case 'commerce_price_flexyformatter_selected_amount':
156 277
        // Build an array of component display titles and their prices.
157
        $components = array();
158
        $amount = $reference_amount = 0;
159
        $difference = $reference_difference = 0;        
278
        $tax_base = array('reference1' => 0, 'reference2' => 0);        
279
        $amount = $reference1_amount = $reference2_amount = 0;
280

  
281
        // calc tax base
160 282
        foreach ($item['data']['components'] as $key => $component) {
161
          if ($display['settings']['selection'][$component['name']] != '0') {
162
            $amount += $component['price']['amount'];
163
            if (isset($component['price']['data']['tax_rate'])) {
164
              $amount -= $component['price']['data']['tax_rate']['rate'] * $difference;
283
          if (!isset($component['price']['data']['tax_rate'])) {
284
           if (isset($display['settings']['reference1']['selection'][$component['name']]) 
285
             && $display['settings']['reference1']['selection'][$component['name']] != '0') {
286
              $tax_base['reference1'] += $component['price']['amount'];
287
           }
288
           if (isset($display['settings']['reference2']['selection'][$component['name']]) 
289
             && $display['settings']['reference2']['selection'][$component['name']] != '0') {
290
              $tax_base['reference2'] += $component['price']['amount'];
165 291
            }
166 292
          }
167
          else {
168
            $difference += $component['price']['amount'];
169
          }
170 293
        }
171
        // Check if reference amount is ebabled
172
        if ($display['settings']['reference']['enabled']) {
173
          $components = array();
174
          // reset($item['data']['components']);
175
          foreach ($item['data']['components'] as $key => $component) {
176
            if ($display['settings']['reference']['selection'][$component['name']] != '0') {
177
              $reference_amount += $component['price']['amount'];
178
              if (isset($component['price']['data']['tax_rate'])) {
179
                $reference_amount -= $component['price']['data']['tax_rate']['rate'] * $reference_difference;
180
              }
181
            }
182
            else {
183
              $reference_difference += $component['price']['amount'];
184
            }
185
          }
294
        $amount = commerce_price_flexyformatter_amount_calc($item['data']['components'],$display['settings']['base'],$tax_base);
295
        if (isset($display['settings']['reference1']['enabled']) && $display['settings']['reference1']['enabled']) {
296
          $reference1_amount = commerce_price_flexyformatter_amount_calc($item['data']['components'],$display['settings']['reference1'],$tax_base);
297
        }
298
        if (isset($display['settings']['reference2']['enabled']) && $display['settings']['reference2']['enabled']) {
299
          $reference2_amount = commerce_price_flexyformatter_amount_calc($item['data']['components'],$display['settings']['reference2'],$tax_base);
186 300
        }
301

  
187 302
        $element[$delta] = array(
188 303
          '#markup' => theme('commerce_price_flexyformatter_selected_amount', 
189
            array('amount' => $amount,
190
              'reference_enabled' => $display['settings']['reference']['enabled'],
191
              'reference_amount' => $reference_amount,
304
            array(
305
              'base' => array(
306
                'amount' => $amount,
307
                'label' => (isset($display['settings']['base']['label'])?$display['settings']['base']['label']:null),
308
                'class' => (isset($display['settings']['base']['class'])?$display['settings']['base']['class']:null),
309
                'weight' => (isset($display['settings']['base']['weight'])?$display['settings']['base']['weight']:null),
310
              ),
311
              'reference1' => array(
312
                'amount' => (isset($reference1_amount)?$reference1_amount:null),
313
                'label' => (isset($display['settings']['reference1']['label'])?$display['settings']['reference1']['label']:null),
314
                'class' => (isset($display['settings']['reference1']['class'])?$display['settings']['reference1']['class']:null),
315
                'weight' => (isset($display['settings']['reference1']['weight'])?$display['settings']['reference1']['weight']:null),
316
                'enabled' => (isset($display['settings']['reference1']['enabled'])?$display['settings']['reference1']['enabled']:0),
317
              ),
318
              'reference2' => array(
319
                'amount' => (isset($reference2_amount)?$reference2_amount:null),
320
                'label' => (isset($display['settings']['reference2']['label'])?$display['settings']['reference2']['label']:null),
321
                'class' => (isset($display['settings']['reference2']['class'])?$display['settings']['reference2']['class']:null),
322
                'weight' => (isset($display['settings']['reference2']['weight'])?$display['settings']['reference2']['weight']:null),
323
                'enabled' => (isset($display['settings']['reference2']['enabled'])?$display['settings']['reference2']['enabled']:0),
324
              ),
192 325
              'currency_code' => $item['currency_code'],
193
              )
194
            ),
326
            )
327
          ),
195 328
        );
196 329
      break;
197 330
    }
......
205 338
 * @param $variables
206 339
 */
207 340
function theme_commerce_price_flexyformatter_selected_amount($variables) {
208
  if ($variables['reference_enabled'] && ($variables['amount'] != $variables['reference_amount'])) {
209
  // Add the CSS styling.
341
  $output = '';
342
  uasort($variables, 'drupal_sort_weight');
210 343
  drupal_add_css(drupal_get_path('module', 'commerce_price_flexyformatter') . '/commerce_price_flexyformatter.css');
211
    $output = '<span class="flexy-reference">' . commerce_currency_format($variables['reference_amount'], $variables['currency_code']) . '</span> ';
212
    $output .= '<span class="flexy-amount has-reference">' . commerce_currency_format($variables['amount'], $variables['currency_code']) . '</span>';
213
  }
214
  else {
215
    $output = '<span class="flexy-amount has-no-reference">' . commerce_currency_format($variables['amount'], $variables['currency_code']) . '</span>';
344
  foreach ($variables as $key => $variable) {
345
   if (is_numeric($variable['weight']) && ($key == 'base' || $variable['enabled'])) {
346
    $output .= '<span class=flexy-item' . ($variable['class']?' ' . $variable['class']:'') . '><span class"flexy-title">' . $variable['label'] . '</span><span class="flexy-amount">' . commerce_currency_format($variable['amount'], $variables['currency_code']) . '</span></span> ';
347
   }
216 348
  }
349

  
217 350
  return $output; 
218 351
}
352
/**
353
 * Calculate amount to be displayed.
354
 *
355
 * @param array $components
356
 * @param array $settings
357
 * @param array $tax_base
358
 */
359

  
360
function commerce_price_flexyformatter_amount_calc($components,$settings,$tax_base) {
361
  $amount = 0;
362
  foreach ($components as $key => $component) {
363
    if (isset($settings['selection'][$component['name']]) && $settings['selection'][$component['name']] != '0') {
364
      if (!isset($component['price']['data']['tax_rate'])
365
        or (isset($settings['calc']) 
366
          and $settings['calc'] == 'default')) {
367
        $amount += $component['price']['amount'];
368
      } else {
369
        $amount += $component['price']['data']['tax_rate']['rate'] * $tax_base[$settings['calc']];
370
      }
371
    }
372
  }
373
  return $amount;
374
}
drupal7/sites/all/modules/entity/entity.api.php
155 155
 *   edit form for your entity type. See entity_form().
156 156
 *   In case the 'admin ui' is used, no callback needs to be specified.
157 157
 * - entity cache: (optional) Whether entities should be cached using the cache
158
 *   system. Requires the entitycache module to be installed and enabled. As
159
 *   cached entities are only retrieved by id key, the cache would not apply to
160
 *   exportable entities retrieved by name key. If enabled, 'field cache' is
161
 *   obsolete and should be disabled. Defaults to FALSE.
158
 *   system. Requires the entitycache module to be installed and enabled and the
159
 *   module key to be specified. As cached entities are only retrieved by id key,
160
 *   the cache would not apply to exportable entities retrieved by name key.
161
 *   If enabled and the entitycache module is active, 'field cache' is obsolete
162
 *   and is automatically disabled. Defaults to FALSE.
162 163
 *
163 164
 * @see hook_entity_info()
164 165
 * @see entity_metadata_hook_entity_info()
drupal7/sites/all/modules/entity/entity.info
25 25
files[] = views/handlers/entity_views_handler_relationship_by_bundle.inc
26 26
files[] = views/handlers/entity_views_handler_relationship.inc
27 27
files[] = views/plugins/entity_views_plugin_row_entity_view.inc
28
; Information added by Drupal.org packaging script on 2014-01-08
29
version = "7.x-1.3"
28
; Information added by Drupal.org packaging script on 2014-03-20
29
version = "7.x-1.4"
30 30
core = "7.x"
31 31
project = "entity"
32
datestamp = "1389210813"
32
datestamp = "1395335062"
33 33

  
drupal7/sites/all/modules/entity/entity.install
5 5
 * Install file for the entity API.
6 6
 */
7 7

  
8
/**
9
 * Implements hook_enable().
10
 */
11
function entity_enable() {
12
  // Create cache tables for entities that support Entity cache module.
13
  entity_entitycache_installed_modules();
14
}
15

  
8 16
/**
9 17
 * The entity API modules have been merged into a single module.
10 18
 */
......
26 34
function entity_update_7002() {
27 35
  // Do nothing, update.php clears cache for us in case there is an update.
28 36
}
37

  
38
/**
39
 * Create cache tables for entities that support Entity cache module.
40
 */
41
function entity_update_7003() {
42
  entity_entitycache_installed_modules();
43
}
44

  
45
/**
46
 * Create cache tables for entities of modules that support Entity cache module.
47
 *
48
 * @param $modules
49
 *   (optional) An array of module names that have been installed.
50
 *   If not specified, try to add cache tables for all modules.
51
 */
52
function entity_entitycache_installed_modules($modules = NULL) {
53
  if (!module_exists('entitycache')) {
54
    return;
55
  }
56

  
57
  // If no modules are specified or if entitycache is being installed,
58
  // try to add entitycache tables for supporting entities of all modules.
59
  if (!isset($modules) || in_array('entitycache', $modules)) {
60
    $modules = module_list();
61
  }
62

  
63
  // Get all installed modules that support entity cache.
64
  $entitycache_module_info = _entity_entitycache_get_module_info($modules);
65

  
66
  // For uninstallation of modules, we need to keep a list of tables we created
67
  // per module providing the entity type.
68
  $tables_created = variable_get('entity_cache_tables_created');
69

  
70
  foreach ($entitycache_module_info as $module => $module_entitycache_entities) {
71
    foreach ($module_entitycache_entities as $entity_type => $entity_info) {
72
      // Do not break modules that create the cache tables for themselves.
73
      if (!db_table_exists('cache_entity_' . $entity_type)) {
74
        $schema = drupal_get_schema_unprocessed('system', 'cache');
75
        $schema['description'] = 'Cache table used to store' . $entity_type . ' entity records.';
76
        db_create_table('cache_entity_' . $entity_type, $schema);
77
        $tables_created[$module][] = 'cache_entity_' . $entity_type;
78
      }
79
    }
80
  }
81
  variable_set('entity_cache_tables_created', $tables_created);
82
}
83

  
84
/**
85
 * Remove entity cache tables for entity types of uninstalled modules.
86
 *
87
 * @param $modules
88
 *   (optional) An array of uninstalled modules. If not specified, try to remove
89
 *   cache tables for all modules.
90
 */
91
function entity_entitycache_uninstalled_modules($modules = NULL) {
92
  // If no modules are specified or if entitycache is being uninstalled,
93
  // try to remove entitycache tables for supporting entities of all modules.
94
  if (!isset($modules) || in_array('entitycache', $modules)) {
95
    $modules = module_list();
96
  }
97
  $tables_created = variable_get('entity_cache_tables_created');
98
  foreach ($modules as $module) {
99
    if (!empty($tables_created[$module])) {
100
      foreach ($tables_created[$module] as $table) {
101
        db_drop_table($table);
102
      }
103
      unset($tables_created[$module]);
104
    }
105
  }
106
  variable_set('entity_cache_tables_created', $tables_created);
107
}
108

  
109
/**
110
 * Helper to fetch entity info about entity types that use caching.
111
 */
112
function _entity_entitycache_get_module_info($modules) {
113
  // Prepare a keyed array of all modules with their entity types and infos.
114
  // Structure: [module][entity][info]
115
  $entity_crud_info = entity_crud_get_info();
116
  $info = array();
117
  foreach ($entity_crud_info as $entity_name => $entity_info) {
118
    // Make sure that the entity info specifies a module and supports entitycache.
119
    if (!isset($entity_info['module']) || empty($entity_info['entity cache'])) {
120
      continue;
121
    }
122
    $module = $entity_info['module'];
123
    // Only treat installed modules.
124
    if (!in_array($module, $modules)) {
125
      continue;
126
    }
127
    // Add the entity info to the module key.
128
    if (!isset($info[$module])) {
129
      $info[$module] = array();
130
    }
131
    $info[$module][$entity_name] = $entity_info;
132
  }
133
  return $info;
134
}
drupal7/sites/all/modules/entity/entity.module
948 948
  }
949 949
}
950 950

  
951
/**
952
 * Implements hook_modules_installed().
953
 */
954
function entity_modules_installed($modules) {
955
  module_load_install('entity');
956
  entity_entitycache_installed_modules($modules);
957
}
958

  
959
/**
960
 * Implements hook_modules_uninstalled().
961
 */
962
function entity_modules_uninstalled($modules) {
963
  module_load_install('entity');
964
  entity_entitycache_uninstalled_modules($modules);
965
}
966

  
951 967
/**
952 968
 * Implements hook_modules_enabled().
953 969
 */
......
1060 1076
  if (current_path() != 'admin/modules/list/confirm') {
1061 1077
    entity_defaults_rebuild();
1062 1078
  }
1079

  
1080
  // Care about entitycache tables.
1081
  if (module_exists('entitycache')) {
1082
    $tables = array();
1083
    foreach (entity_crud_get_info() as $entity_type => $entity_info) {
1084
      if (isset($entity_info['module']) && !empty($entity_info['entity cache'])) {
1085
        $tables[] = 'cache_entity_' . $entity_type;
1086
      }
1087
    }
1088
    return $tables;
1089
  }
1063 1090
}
1064 1091

  
1065 1092
/**
......
1409 1436
    if (!isset($info['configuration'])) {
1410 1437
      $entity_info[$type]['configuration'] = !empty($info['exportable']);
1411 1438
    }
1439

  
1440
    if (isset($info['controller class']) && in_array('EntityAPIControllerInterface', class_implements($info['controller class']))) {
1441
      // Automatically disable field cache when entity cache is used.
1442
      if (!empty($info['entity cache']) && module_exists('entitycache')) {
1443
        $entity_info[$type]['field cache'] = FALSE;
1444
      }
1445
    }
1412 1446
  }
1413 1447
}
1414 1448

  
drupal7/sites/all/modules/entity/entity.test
1502 1502
    $this->assertEmpty($wrapper, 'parent');
1503 1503

  
1504 1504
    // Test comment entity access.
1505
    $admin_user = $this->drupalCreateUser(array('access comments', 'administer comments'));
1505
    $admin_user = $this->drupalCreateUser(array('access comments', 'administer comments', 'access user profiles'));
1506 1506
    // Also grant access to view user accounts to test the comment author
1507 1507
    // property.
1508 1508
    $unprivileged_user = $this->drupalCreateUser(array('access comments', 'access user profiles'));
drupal7/sites/all/modules/entity/entity_token.info
5 5
files[] = entity_token.module
6 6
dependencies[] = entity
7 7

  
8
; Information added by Drupal.org packaging script on 2014-01-08
9
version = "7.x-1.3"
8
; Information added by Drupal.org packaging script on 2014-03-20
9
version = "7.x-1.4"
10 10
core = "7.x"
11 11
project = "entity"
12
datestamp = "1389210813"
12
datestamp = "1395335062"
13 13

  
drupal7/sites/all/modules/entity/includes/entity.controller.inc
587 587
    $entity->content = $content;
588 588
    $langcode = isset($langcode) ? $langcode : $GLOBALS['language_content']->language;
589 589

  
590
    // Allow modules to change the view mode.
591
    $context = array(
592
      'entity_type' => $this->entityType,
593
      'entity' => $entity,
594
      'langcode' => $langcode,
595
    );
596
    drupal_alter('entity_view_mode', $view_mode, $context);
597
    // Make sure the used view-mode gets stored.
598
    $entity->content += array('#view_mode' => $view_mode);
599

  
590 600
    // By default add in properties for all defined extra fields.
591 601
    if ($extra_field_controller = entity_get_extra_fields_controller($this->entityType)) {
592 602
      $wrapper = entity_metadata_wrapper($this->entityType, $entity);
drupal7/sites/all/modules/entity/modules/callbacks.inc
485 485
      // No data available.
486 486
      $entity = NULL;
487 487
    }
488
    $instance = $wrapper->getBundle() ? field_info_instance($wrapper->type(), $name, $wrapper->getBundle()) : NULL;
489
    return (array) module_invoke($field['module'], 'options_list', $field, $instance, $wrapper->type(), $entity);
488

  
489
    // Support translating labels via i18n field.
490
    if (module_exists('i18n_field') && ($translate = i18n_field_type_info($field['type'], 'translate_options'))) {
491
      return $translate($field);
492
    }
493
    else {
494
      $instance = $wrapper->getBundle() ? field_info_instance($wrapper->type(), $name, $wrapper->getBundle()) : NULL;
495
      return (array) module_invoke($field['module'], 'options_list', $field, $instance, $wrapper->type(), $entity);
496
    }
490 497
  }
491 498
}
492 499

  
drupal7/sites/all/modules/entity/tests/entity_feature.info
6 6
dependencies[] = entity_test
7 7
hidden = TRUE
8 8

  
9
; Information added by Drupal.org packaging script on 2014-01-08
10
version = "7.x-1.3"
9
; Information added by Drupal.org packaging script on 2014-03-20
10
version = "7.x-1.4"
11 11
core = "7.x"
12 12
project = "entity"
13
datestamp = "1389210813"
13
datestamp = "1395335062"
14 14

  
drupal7/sites/all/modules/entity/tests/entity_test.info
7 7
dependencies[] = entity
8 8
hidden = TRUE
9 9

  
10
; Information added by Drupal.org packaging script on 2014-01-08
11
version = "7.x-1.3"
10
; Information added by Drupal.org packaging script on 2014-03-20
11
version = "7.x-1.4"
12 12
core = "7.x"
13 13
project = "entity"
14
datestamp = "1389210813"
14
datestamp = "1395335062"
15 15

  
drupal7/sites/all/modules/entity/tests/entity_test_i18n.info
5 5
package = Multilingual - Internationalization
6 6
core = 7.x
7 7
hidden = TRUE
8
; Information added by Drupal.org packaging script on 2014-01-08
9
version = "7.x-1.3"
8
; Information added by Drupal.org packaging script on 2014-03-20
9
version = "7.x-1.4"
10 10
core = "7.x"
11 11
project = "entity"
12
datestamp = "1389210813"
12
datestamp = "1395335062"
13 13

  
drupal7/sites/all/modules/entity/views/handlers/entity_views_field_handler_helper.inc
157 157
    }
158 158

  
159 159
    if (method_exists($handler->query, 'get_result_wrappers')) {
160
      list($handler->entity_type, $handler->wrappers) = $handler->query->get_result_wrappers($values, NULL, $handler->real_field);
160
      list($handler->entity_type, $handler->wrappers) = $handler->query->get_result_wrappers($values, $handler->relationship, $handler->real_field);
161 161
    }
162 162
    else {
163
      list($handler->entity_type, $entities) = $handler->query->get_result_entities($values, NULL, $handler->real_field);
163
      list($handler->entity_type, $entities) = $handler->query->get_result_entities($values, $handler->relationship, $handler->real_field);
164 164
      $handler->wrappers = array();
165 165
      foreach ($entities as $id => $entity) {
166 166
        $handler->wrappers[$id] = entity_metadata_wrapper($handler->entity_type, $entity);
drupal7/sites/all/themes/adaptivetheme/at_admin/adaptivetheme_admin.info
68 68
  settings[tablet_portrait_page_width]     = 100
69 69
  settings[tablet_portrait_sidebar_first]  = 50
70 70
  settings[tablet_portrait_sidebar_second] = 50
71
  settings[tablet_portrait_media_query]    = 'only screen and (min-width:481px) and (max-width:768px)'
71
  settings[tablet_portrait_media_query]    = 'only screen and (min-width:581px) and (max-width:768px)'
72 72

  
73 73

  
74
  ; Layout settings - Smartphone landscape
75
  settings[smartphone_landscape_layout]         = 'one_col_vert'
76
  settings[smartphone_landscape_page_unit]      = '%'
77
  settings[smartphone_landscape_sidebar_unit]   = '%'
78
  settings[smartphone_landscape_page_width]     = 100
79
  settings[smartphone_landscape_sidebar_first]  = 50
80
  settings[smartphone_landscape_sidebar_second] = 50
81
  settings[smartphone_landscape_media_query]    = 'only screen and (min-width:321px) and (max-width:480px)'
74
  ; Layout settings - Smalltouch landscape
75
  settings[smalltouch_landscape_layout]         = 'one_col_vert'
76
  settings[smalltouch_landscape_page_unit]      = '%'
77
  settings[smalltouch_landscape_sidebar_unit]   = '%'
78
  settings[smalltouch_landscape_page_width]     = 100
79
  settings[smalltouch_landscape_sidebar_first]  = 50
80
  settings[smalltouch_landscape_sidebar_second] = 50
81
  settings[smalltouch_landscape_media_query]    = 'only screen and (min-width:321px) and (max-width:580px)'
82 82

  
83 83

  
84
  ; Layout settings - Smartphone portrait
85
  settings[smartphone_portrait_layout]         = 'one_col_stack'
86
  settings[smartphone_portrait_page_unit]      = '%'
87
  settings[smartphone_portrait_sidebar_unit]   = '%'
88
  settings[smartphone_portrait_page_width]     = 100
89
  settings[smartphone_portrait_sidebar_first]  = 100
90
  settings[smartphone_portrait_sidebar_second] = 100
91
  settings[smartphone_portrait_media_query]    = 'only screen and (max-width:320px)'
84
  ; Layout settings - Smalltouch portrait
85
  settings[smalltouch_portrait_layout]         = 'one_col_stack'
86
  settings[smalltouch_portrait_page_unit]      = '%'
87
  settings[smalltouch_portrait_sidebar_unit]   = '%'
88
  settings[smalltouch_portrait_page_width]     = 100
89
  settings[smalltouch_portrait_sidebar_first]  = 100
90
  settings[smalltouch_portrait_sidebar_second] = 100
91
  settings[smalltouch_portrait_media_query]    = 'only screen and (max-width:320px)'
92 92

  
93 93

  
94 94
  ; Responsive Panels - Standard layout
95
  settings[bigscreen_two_50] = 'two-50'
96
  settings[bigscreen_two_33_66] = 'two-33-66'
97
  settings[bigscreen_two_66_33] = 'two-66-33'
98
  settings[bigscreen_two_brick] = 'two-brick'
99
  settings[bigscreen_three_3x33]     = 'three-3x33'
100
  settings[bigscreen_three_25_50_25] = 'three-25-50-25'
101
  settings[bigscreen_three_25_25_50] = 'three-25-25-50'
102
  settings[bigscreen_three_50_25_25] = 'three-50-25-25'
103
  settings[bigscreen_four_4x25] = 'four-4x25'
104
  settings[bigscreen_five_5x20] = 'five-5x20-2x3-grid'
105
  settings[bigscreen_six_6x16] = 'six-6x16-3x2-grid'
95
  settings[bigscreen_two_50]            = 'two-50'
96
  settings[bigscreen_two_33_66]         = 'two-33-66'
97
  settings[bigscreen_two_66_33]         = 'two-66-33'
98
  settings[bigscreen_two_brick]         = 'two-brick'
99
  settings[bigscreen_three_3x33]        = 'three-3x33'
100
  settings[bigscreen_three_25_50_25]    = 'three-25-50-25'
101
  settings[bigscreen_three_25_25_50]    = 'three-25-25-50'
102
  settings[bigscreen_three_50_25_25]    = 'three-50-25-25'
103
  settings[bigscreen_four_4x25]         = 'four-4x25'
104
  settings[bigscreen_five_5x20]         = 'five-5x20'
105
  settings[bigscreen_six_6x16]          = 'six-6x16'
106 106
  settings[bigscreen_three_inset_left]  = 'three-inset-left'
107 107
  settings[bigscreen_three_inset_right] = 'three-inset-right'
108 108

  
109 109

  
110 110
  ; Responsive Panels - Tablet landscape
111
  settings[tablet_landscape_two_50]    = 'two-50'
112
  settings[tablet_landscape_two_33_66] = 'two-33-66'
113
  settings[tablet_landscape_two_66_33] = 'two-66-33'
114
  settings[tablet_landscape_two_brick] = 'two-brick'
115
  settings[tablet_landscape_three_3x33]     = 'three-3x33'
116
  settings[tablet_landscape_three_25_50_25] = 'three-25-50-25'
117
  settings[tablet_landscape_three_25_25_50] = 'three-25-25-50'
118
  settings[tablet_landscape_three_50_25_25] = 'three-50-25-25'
119
  settings[tablet_landscape_four_4x25] = 'four-4x25'
120
  settings[tablet_landscape_five_5x20] = 'five-5x20-2x3-grid'
121
  settings[tablet_landscape_six_6x16]  = 'six-6x16-3x2-grid'
111
  settings[tablet_landscape_two_50]            = 'two-50'
112
  settings[tablet_landscape_two_33_66]         = 'two-33-66'
113
  settings[tablet_landscape_two_66_33]         = 'two-66-33'
114
  settings[tablet_landscape_two_brick]         = 'two-brick'
115
  settings[tablet_landscape_three_3x33]        = 'three-3x33'
116
  settings[tablet_landscape_three_25_50_25]    = 'three-25-50-25'
117
  settings[tablet_landscape_three_25_25_50]    = 'three-25-25-50'
118
  settings[tablet_landscape_three_50_25_25]    = 'three-50-25-25'
119
  settings[tablet_landscape_four_4x25]         = 'four-4x25'
120
  settings[tablet_landscape_five_5x20]         = 'five-5x20-2x3-grid'
121
  settings[tablet_landscape_six_6x16]          = 'six-6x16-3x2-grid'
122 122
  settings[tablet_landscape_three_inset_left]  = 'three-inset-left'
123 123
  settings[tablet_landscape_three_inset_right] = 'three-inset-right'
124 124

  
125 125

  
126 126
  ; Responsive Panels - Tablet portrait
127
  settings[tablet_portrait_two_50]    = 'two-50'
128
  settings[tablet_portrait_two_33_66] = 'two-33-66'
129
  settings[tablet_portrait_two_66_33] = 'two-66-33'
130
  settings[tablet_portrait_two_brick] = 'two-brick'
131
  settings[tablet_portrait_three_3x33]     = 'three-3x33-stack-top'
132
  settings[tablet_portrait_three_25_50_25] = 'three-25-50-25-stack-top'
133
  settings[tablet_portrait_three_25_25_50] = 'three-25-25-50-stack-top'
134
  settings[tablet_portrait_three_50_25_25] = 'three-50-25-25-stack-top'
135
  settings[tablet_portrait_four_4x25] = 'four-4x25-2x2-grid'
136
  settings[tablet_portrait_five_5x20] = 'five-5x20-1x2x2-grid'
137
  settings[tablet_portrait_six_6x16]  = 'six-6x16-2x3-grid'
127
  settings[tablet_portrait_two_50]            = 'two-50'
128
  settings[tablet_portrait_two_33_66]         = 'two-33-66'
129
  settings[tablet_portrait_two_66_33]         = 'two-66-33'
130
  settings[tablet_portrait_two_brick]         = 'two-brick'
131
  settings[tablet_portrait_three_3x33]        = 'three-3x33-stack-top'
132
  settings[tablet_portrait_three_25_50_25]    = 'three-25-50-25-stack-top'
133
  settings[tablet_portrait_three_25_25_50]    = 'three-25-25-50-stack-top'
134
  settings[tablet_portrait_three_50_25_25]    = 'three-50-25-25-stack-top'
135
  settings[tablet_portrait_four_4x25]         = 'four-4x25-2x2-grid'
136
  settings[tablet_portrait_five_5x20]         = 'five-5x20-1x2x2-grid'
137
  settings[tablet_portrait_six_6x16]          = 'six-6x16-2x3-grid'
138 138
  settings[tablet_portrait_three_inset_left]  = 'three-inset-left-wrap'
139 139
  settings[tablet_portrait_three_inset_right] = 'three-inset-right-wrap'
140 140

  
141 141

  
142
  ; Responsive Panels - Smartphone landscape
143
  settings[smartphone_landscape_two_50]    = 'two-50-stack'
144
  settings[smartphone_landscape_two_33_66] = 'two-33-66-stack'
145
  settings[smartphone_landscape_two_66_33] = 'two-66-33-stack'
146
  settings[smartphone_landscape_two_brick] = 'two-brick-stack'
147
  settings[smartphone_landscape_three_3x33]     = 'three-3x33-stack'
148
  settings[smartphone_landscape_three_25_50_25] = 'three-25-50-25-stack'
149
  settings[smartphone_landscape_three_25_25_50] = 'three-25-25-50-stack'
150
  settings[smartphone_landscape_three_50_25_25] = 'three-50-25-25-stack'
151
  settings[smartphone_landscape_four_4x25] = 'four-4x25-stack'
152
  settings[smartphone_landscape_five_5x20] = 'five-5x20-stack'
153
  settings[smartphone_landscape_six_6x16]  = 'six-6x16-stack'
154
  settings[smartphone_landscape_three_inset_left]  = 'three-inset-left-stack'
155
  settings[smartphone_landscape_three_inset_right] = 'three-inset-right-stack'
142
  ; Responsive Panels - Smalltouch landscape
143
  settings[smalltouch_landscape_two_50]            = 'two-50-stack'
144
  settings[smalltouch_landscape_two_33_66]         = 'two-33-66-stack'
145
  settings[smalltouch_landscape_two_66_33]         = 'two-66-33-stack'
146
  settings[smalltouch_landscape_two_brick]         = 'two-brick-stack'
147
  settings[smalltouch_landscape_three_3x33]        = 'three-3x33-stack'
148
  settings[smalltouch_landscape_three_25_50_25]    = 'three-25-50-25-stack'
149
  settings[smalltouch_landscape_three_25_25_50]    = 'three-25-25-50-stack'
150
  settings[smalltouch_landscape_three_50_25_25]    = 'three-50-25-25-stack'
151
  settings[smalltouch_landscape_four_4x25]         = 'four-4x25-stack'
152
  settings[smalltouch_landscape_five_5x20]         = 'five-5x20-stack'
153
  settings[smalltouch_landscape_six_6x16]          = 'six-6x16-stack'
154
  settings[smalltouch_landscape_three_inset_left]  = 'three-inset-left-stack'
155
  settings[smalltouch_landscape_three_inset_right] = 'three-inset-right-stack'
156 156

  
157 157

  
158 158
  ; CSS
159 159
  settings[disable_responsive_styles]     = 0
160 160
  settings[enable_custom_media_queries]   = 0
161
  settings[global_default_layout]         = 'smartphone-portrait'
161
  settings[global_default_layout]         = 'smalltouch-portrait'
162 162
  settings[global_default_layout_toggle]  = 0
163 163
  settings[global_files_path]             = 'public_files'
164 164

  
......
232 232
  settings[h6_font_size] = '1em'
233 233

  
234 234

  
235
  ; Site name (admin has no site name, here for completedness)
236
  settings[site_name_case]      = 'snc-n'
237
  settings[site_name_weight]    = 'snw-b'
238
  settings[site_name_alignment] = 'sna-l'
239
  settings[site_name_shadow]    = 'sns-n'
240

  
241

  
242
  ; Site slogan (admin has no site slogan, here for completedness)
243
  settings[site_slogan_case]      = 'ssc-n'
244
  settings[site_slogan_weight]    = 'ssw-b'
245
  settings[site_slogan_alignment] = 'ssa-l'
246
  settings[site_slogan_shadow]    = 'sss-n'
247

  
248

  
235 249
  ; Page title
236 250
  settings[page_title_case]      = 'ptc-n'
237 251
  settings[page_title_weight]    = 'ptw-b'
......
316 330

  
317 331
  ; Mobile metatags
318 332
  settings[mobile_friendly_metatags] = 1
319
  settings[adaptivetheme_meta_viewport] = 'width=device-width, initial-scale=1'
333
  settings[adaptivetheme_meta_viewport] = 'width=device-width, initial-scale=1.0, user-scalable=yes'
320 334
  settings[adaptivetheme_meta_mobileoptimized]  = 'width'
321 335
  settings[adaptivetheme_meta_handheldfriendly] = 'true'
322 336
  settings[adaptivetheme_meta_apple_mobile_web_app_capable] = 'yes'
323
  settings[chrome_edge] = 0
324
  settings[clear_type]  = 0
337
  settings[adaptivetheme_meta_ie_document_mode] = ''
338
  settings[adaptivetheme_meta_clear_type] = 0
325 339

  
326 340

  
327 341
  ; Touch icons
......
334 348
  ; Custom CSS
335 349
  settings[custom_css] = ''
336 350

  
337
; Information added by drupal.org packaging script on 2012-08-29
338
version = "7.x-3.1"
351
; Information added by Drupal.org packaging script on 2014-03-23
352
version = "7.x-3.2"
339 353
core = "7.x"
340 354
project = "adaptivetheme"
341
datestamp = "1346238662"
355
datestamp = "1395575059"
342 356

  
drupal7/sites/all/themes/adaptivetheme/at_admin/css/at_admin.css
287 287
  font-weight: 700;
288 288
  background-color: #bbb;
289 289
  color: #fff;
290
  -khtml-border-radius: 4px;
291
  -moz-border-radius: 4px;
292
  -webkit-border-radius: 4px;
293 290
  border-radius: 4px;
294 291
}
295 292
.item-list ul.pager li.pager-current {
......
463 460
  margin: 0 0 .75em;
464 461
  padding: 0;
465 462
  border: 1px solid #d7d7d7;
466
  -khtml-border-radius: 3px;
467
  -moz-border-radius: 3px;
468
  -webkit-border-radius: 3px;
469 463
  border-radius: 3px;
470 464
}
471 465
div.admin .left,
......
558 552
  text-transform: uppercase;
559 553
  text-decoration: none;
560 554
  white-space: normal;
561
  -moz-border-radius: 6px 6px 0 0;
562
  -webkit-border-top-left-radius: 6px;
563
  -webkit-border-top-right-radius: 6px;
564 555
  border-radius: 6px 6px 0 0;
565
  -moz-transition: background 0.2s ease-in;
566 556
  -webkit-transition: background 0.2s ease-in;
567
	-o-transition: background 0.2s ease-in;
568
	-ms-transition: background 0.2s ease-in;
557
  -moz-transition: background 0.2s ease-in;
558
  -o-transition: background 0.2s ease-in;
559
  -ms-transition: background 0.2s ease-in;
569 560
  transition: background 0.2s ease-in;
570 561
}
571 562
ul.primary li a:hover {
......
587 578
  ul.primary li a {
588 579
    float: none;
589 580
    margin-bottom: 6px;
590
    -moz-border-radius: 6px;
591
    -webkit-border-radius: 6px;
592 581
    border-radius: 6px;
593 582
  }
594 583
}
......
716 705
  width: 90%;
717 706
}
718 707
#system-theme-settings .button-wrapper {
719
clear:both;
708
  clear: both;
720 709
  display: block;
721 710
}
722 711
.section-admin table {
......
774 763
  width: 90px;
775 764
}
776 765
#system-modules table th[colspan*="3"] {
777
  width: 260x;
766
  width: 260px;
778 767
}
779 768
#system-modules table .odd .permissions,
780 769
#system-modules table .odd .help,
......
797 786
div.messages {
798 787
  background-position: 8px 5px;
799 788
  margin: 10px;
800
  -khtml-border-radius: 2px;
801
  -moz-border-radius: 2px;
802
  -webkit-border-radius: 2px;
803 789
  border-radius: 2px;
804 790
}
805 791
#block-system-help {
......
807 793
  border: 0;
808 794
  margin: 10px 10px 0;
809 795
  padding: 0;
810
  -khtml-border-radius: 2px;
811
  -moz-border-radius: 2px;
812
  -webkit-border-radius: 2px;
813 796
  border-radius: 2px;
814 797
}
815 798
.block-region {
......
823 806
  margin-bottom: 10px;
824 807
  margin-top: 5px;
825 808
  padding: 3px 6px 1px;
826
  -webkit-border-radius: 6px;
827
  -moz-border-radius: 6px;
828
  -khtml-border-radius: 6px;
829 809
  border-radius: 6px;
830 810

  
831 811
}
......
922 902
  padding: 0;
923 903
}
924 904
input {
925
  -khtml-border-radius: 2px;
926
  -moz-border-radius: 2px;
927
  -webkit-border-radius: 2px;
928 905
  border-radius: 2px;
929 906
}
930 907
.form-actions {
......
1008 985
  width: 98.5%;
1009 986
  font-size: 1.231em;
1010 987
}
988
a.button,
1011 989
input.form-submit,
1012 990
input.teaser-button {
1013 991
  background-color: transparent;
......
1022 1000
  margin: 3px 10px 3px 0;
1023 1001
  outline: 1px solid #9babb0;
1024 1002
  padding: 2px 6px;
1025
  -moz-background-size: 100% 200%;
1026 1003
  -webkit-background-size: 100% 200%;
1004
  -moz-background-size: 100% 200%;
1027 1005
  background-size: 100% 200%;
1028
  -moz-outline-radius: 4px;
1029
  -khtml-border-radius: 4px;
1030
  -moz-border-radius: 4px;
1031
  -webkit-border-radius: 4px;
1032 1006
  border-radius: 4px;
1033 1007
}
1034 1008
.ajax-new-content input.form-submit,
......
1042 1016
input#edit-save.form-submit {
1043 1017
  background-image: url(images/green-button.png);
1044 1018
}
1019
a.button-no,
1045 1020
input[value~=Cancel],
1046 1021
input#edit-delete.form-submit,
1047 1022
#system-modules-uninstall input#edit-submit,
1048 1023
#user-multiple-delete-confirm input#edit-submit {
1049 1024
  background-image: url(images/red-button.png);
1050 1025
}
1026
a.button:hover,
1051 1027
input[value~=Update]:hover,
1052 1028
input[value~=Save]:hover,
1053 1029
#system-theme-settings input#edit-submit:hover,
......
1060 1036
#user-multiple-delete-confirm input#edit-submit:hover {
1061 1037
  background-position: bottom;
1062 1038
  cursor: pointer;
1039
  text-decoration:none;
1063 1040
}
1064 1041
#edit-views-apply,
1065 1042
#edit-views-reset {
......
1116 1093
  padding: 10px 15px;
1117 1094
}
1118 1095
.filter-wrapper {
1119
  -khtml-border-radius-topright: 0;
1120
  -khtml-border-radius-topleft: 0;
1121
  -moz-border-radius-topright: 0;
1122
  -moz-border-radius-topleft: 0;
1123
  -webkit-border-top-left-radius: 0;
1124
  -webkit-border-top-right-radius: 0;
1125 1096
  border-top-left-radius: 0;
1126 1097
  border-top-right-radius: 0;
1127 1098
}
......
1132 1103
  background: transparent;
1133 1104
  margin-bottom: 0;
1134 1105
  padding-bottom: 0;
1135
  -khtml-border-radius: 0;
1136
  -moz-border-radius: 0;
1137
  -webkit-border-radius: 0;
1138 1106
  border-radius: 0;
1139 1107
}
1140 1108
fieldset#edit-body-und-0-format {
1141
  -khtml-border-radius: 0 0 3px 3px;
1142
  -moz-border-radius: 0 0 3px 3px;
1143
  -webkit-border-top-right-radius: 0;
1144
  -webkit-border-top-left-radius: 0;
1145 1109
  border-radius: 0 0 3px 3px;
1146 1110
}
1147 1111
.vertical-tabs fieldset {
1148
  -khtml-border-radius: 0;
1149
  -moz-border-radius: 0;
1150
  -webkit-border-radius: 0;
1151 1112
  border-radius: 0;
1152 1113
  background: #fff;
1153 1114
}
......
1164 1125
  display: block;
1165 1126
  padding: 7px 1%;
1166 1127
  width: 98%;
1167
  -khtml-border-radius: 2px;
1168
  -moz-border-radius: 2px;
1169
  -webkit-border-radius: 2px;
1170 1128
  border-radius: 2px;
1171 1129
}
1172 1130
fieldset legend,
......
1219 1177
  border-width: 0 1px 1px 1px;
1220 1178
  border-color: #d7d7d7;
1221 1179
  border-style: solid;
1222
  -moz-border-radius: 0 0 3px 3px;
1223 1180
  border-radius: 0 0 3px 3px;
1224 1181
}
1225 1182
.text-format-wrapper .description {
......
1324 1281
  margin: 0 10px 0 0;
1325 1282
  padding: 0 10px;
1326 1283
  text-shadow: 0 1px 1px #fff;
1327
  -moz-border-radius: 12px;
1328
  -webkit-border-radius: 12px;
1329 1284
  border-radius: 12px;
1330
  -moz-transition: background 0.2s ease-in;
1331 1285
  -webkit-transition: background 0.2s ease-in;
1332
	-o-transition: background 0.2s ease-in;
1333
	-ms-transition: background 0.2s ease-in;
1286
  -moz-transition: background 0.2s ease-in;
1287
  -o-transition: background 0.2s ease-in;
1288
  -ms-transition: background 0.2s ease-in;
1334 1289
  transition: background 0.2s ease-in;
1335 1290
}
1336 1291
ul.action-links li a:before {
......
1430 1385
  line-height: 1.7;
1431 1386
  padding: 1px 10px 2px 10px;
1432 1387
  text-decoration: none;
1433
  -khtml-border-radius: 0 0 10px 10px;
1434
  -moz-border-radius: 0 0 10px 10px;
1435
  -webkit-border-top-left-radius: 0;
1436
  -webkit-border-top-right-radius: 0;
1437
  -webkit-border-bottom-left-radius: 10px;
1438
  -webkit-border-bottom-right-radius: 10px;
1439 1388
  border-radius: 0 0 10px 10px;
1440 1389
}
1441 1390
#skip-link a:hover,
......
1615 1564
  line-height: 1.5;
1616 1565
  padding: 3px 5px 0;
1617 1566
  margin: 0;
1618
  -moz-border-radius: 2px;
1619
  -webkit-border-radius: 2px;
1620 1567
  border-radius: 2px;
1621 1568
}
1622 1569
.views-displays ul.secondary li.open a {
1623
  -moz-border-radius: 2px 2px 0 0 !important;
1624
  -webkit-border-radius: 2px 2px 0 0 !important;
1625 1570
  border-radius: 2px 2px 0 0 !important;
1626 1571
}
1627 1572
.views-admin .icon.add {
......
1664 1609
  font-size: 0.823em;
1665 1610
  padding-bottom: 2px;
1666 1611
  padding-top: 2px;
1667
  -moz-border-radius: 4px;
1668
  -webkit-border-radius: 4px;
1669 1612
  border-radius: 4px;
1670 1613
}
1671 1614
.views-display-top .ctools-button-processed,
......
1678 1621
  color: #666;
1679 1622
}
1680 1623
.views-ui-dialog #views-ajax-popup {
1681
  -moz-box-shadow: 0 4px 4px 4px rgba(0,0,0,0.4);
1682 1624
  -webkit-box-shadow: 0 4px 4px 4px rgba(0,0,0,0.4);
1683 1625
  box-shadow: 0 4px 4px 4px rgba(0,0,0,0.4);
1684 1626
}
......
1759 1701
  background-image: none;
1760 1702
}
1761 1703
#page-manager-edit .page-manager-tabs #page-manager-page-summary  ul.page-manager-operations {
1762
    border-right: 1px solid #ddd;
1763
    border-bottom: 0;
1704
  border-right: 1px solid #ddd;
1705
  border-bottom: 0;
1764 1706
}
1765 1707
#page-manager-edit .page-manager-tabs #page-manager-page-summary  ul.page-manager-operations li {
1766 1708
  border-color: #ddd;
......
1844 1786

  
1845 1787
/* Admin menu */
1846 1788
#admin-menu, #admin-menu ul {
1847
  font-size: small-x;
1789
  font-size: x-small;
1848 1790
  line-height: 1.3;
1849 1791
}
1850 1792

  
......
1974 1916
  padding: 0 16px;
1975 1917
  text-decoration: none;
1976 1918
  white-space: normal;
1977
  -moz-border-radius: 6px 6px 0 0;
1978
  -webkit-border-top-left-radius: 6px;
1979
  -webkit-border-top-right-radius: 6px;
1980 1919
  border-radius: 6px 6px 0 0;
1981 1920
}
1982 1921
.view-fontyourface-browse ul.tabs li a:hover,
......
2041 1980
input[type="radio"],
2042 1981
input[type="checkbox"] {
2043 1982
}
2044

  
2045

  
2046

  
2047

  
2048

  
2049

  
2050

  
2051

  
2052

  
2053

  
2054

  
2055

  
2056

  
drupal7/sites/all/themes/adaptivetheme/at_core/adaptivetheme.drush.inc
77 77
  // Alter the contents of the .info file based on the command options.
78 78
  $alterations = array(
79 79
    '= AT Subtheme' => '= ' . $name,
80
    'project = "adaptivetheme"' => '', // attempt to strip out the project name added by the drupal packing script
80 81
  );
81 82
  if ($description = drush_get_option('description')) {
82 83
    $alterations['Starter subtheme for Adaptivetheme. Copy this subtheme to get started building your own Drupal theme. For help see our <b><a href="http://adaptivethemes.com/documentation/adaptivethemes-documentation" title="Adaptivethemes.com - Rocking the hardest since 2006">documentation</a></b>. If you have a problem and need additional help please use the <b><a href="http://drupal.org/project/issues/adaptivetheme">issue queue</a></b>.'] = $description;
drupal7/sites/all/themes/adaptivetheme/at_core/adaptivetheme.info
10 10
  engine      = phptemplate
11 11
  screenshot  = screenshot.png
12 12

  
13

  
13 14
;----------// Stylesheets
14 15
  stylesheets[screen][] = css/at.layout.css
15 16

  
......
59 60
  ;unset_core[modules/overlay/overlay-child.css]    = 'overlay-child.css'
60 61
  ;unset_core[modules/overlay/overlay-parent.css]   = 'overlay-parent.css'
61 62

  
63

  
62 64
;----------// Regions
63 65
  regions[sidebar_first]     = Sidebar first
64 66
  regions[sidebar_second]    = Sidebar second
......
75 77
  regions[page_top]          = Page top
76 78
  regions[page_bottom]       = Page bottom
77 79

  
78
;----------// Layout plugins
79 80

  
81
;----------// Layout plugins
80 82
  ; AT Core page layout plugins
81 83
  plugins[page_layout][layouts] = layouts/core
82 84

  
83 85
  ; Panels Module layouts
84 86
  plugins[panels][layouts] = layouts/panels
85 87

  
86
;----------// Layout settings - Standard bigscreen
88

  
89
;----------// Layout Settings
90
  ; Layout settings - Standard layout
87 91
  settings[bigscreen_layout]         = 'three_col_grail'
88 92
  settings[bigscreen_page_unit]      = '%'
89 93
  settings[bigscreen_sidebar_unit]   = '%'
......
95 99
  settings[bigscreen_max_width]      = 1140
96 100
  settings[bigscreen_media_query]    = 'only screen and (min-width:1025px)'
97 101

  
98
;----------// Layout settings - Tablet landscape
102

  
103
  ; Layout settings - Tablet landscape
99 104
  settings[tablet_landscape_layout]         = 'three_col_grail'
100 105
  settings[tablet_landscape_page_unit]      = '%'
101 106
  settings[tablet_landscape_sidebar_unit]   = '%'
102
  settings[tablet_landscape_max_width_unit] = 'px'
103 107
  settings[tablet_landscape_page_width]     = 100
104 108
  settings[tablet_landscape_sidebar_first]  = 20
105 109
  settings[tablet_landscape_sidebar_second] = 20
106
  settings[tablet_landscape_set_max_width]  = 0
107
  settings[tablet_landscape_max_width]      = 960
108 110
  settings[tablet_landscape_media_query]    = 'only screen and (min-width:769px) and (max-width:1024px)'
109 111

  
110
;----------// Layout settings - Tablet portrait
111
  settings[tablet_portrait_layout]         = 'one-col-vert'
112

  
113
  ; Layout settings - Tablet portrait
114
  settings[tablet_portrait_layout]         = 'one_col_vert'
112 115
  settings[tablet_portrait_page_unit]      = '%'
113 116
  settings[tablet_portrait_sidebar_unit]   = '%'
114
  settings[tablet_portrait_max_width_unit] = 'px'
115 117
  settings[tablet_portrait_page_width]     = 100
116 118
  settings[tablet_portrait_sidebar_first]  = 50
117 119
  settings[tablet_portrait_sidebar_second] = 50
118
  settings[tablet_portrait_set_max_width]  = 0
119
  settings[tablet_portrait_max_width]      = 780
120
  settings[tablet_portrait_media_query]    = 'only screen and (min-width:481px) and (max-width:768px)'
121

  
122
;----------// Layout settings - Smartphone landscape
123
  settings[smartphone_landscape_layout]         = 'one_col_vert'
124
  settings[smartphone_landscape_page_unit]      = '%'
125
  settings[smartphone_landscape_sidebar_unit]   = '%'
126
  settings[smartphone_landscape_max_width_unit] = 'px'
127
  settings[smartphone_landscape_page_width]     = 100
128
  settings[smartphone_landscape_sidebar_first]  = 50
129
  settings[smartphone_landscape_sidebar_second] = 50
130
  settings[smartphone_landscape_set_max_width]  = 0
131
  settings[smartphone_landscape_max_width]      = 520
132
  settings[smartphone_landscape_media_query]    = 'only screen and (min-width:321px) and (max-width:480px)'
133

  
134
;----------// Layout settings - Smartphone portrait
135
  settings[smartphone_portrait_media_query] = 'only screen and (max-width:320px)'
136

  
137
;----------// Responsive Panels - Standard layout
138
  settings[bigscreen_two_50] = 'two-50'
139
  settings[bigscreen_two_33_66] = 'two-33-66'
140
  settings[bigscreen_two_66_33] = 'two-66-33'
141
  settings[bigscreen_two_brick] = 'two-brick'
142
  settings[bigscreen_three_3x33]     = 'three-3x33'
143
  settings[bigscreen_three_25_50_25] = 'three-25-50-25'
144
  settings[bigscreen_three_25_25_50] = 'three-25-25-50'
145
  settings[bigscreen_three_50_25_25] = 'three-50-25-25'
146
  settings[bigscreen_four_4x25] = 'four-4x25'
147
  settings[bigscreen_five_5x20] = 'five-5x20-2x3-grid'
148
  settings[bigscreen_six_6x16] = 'six-6x16-3x2-grid'
120
  settings[tablet_portrait_media_query]    = 'only screen and (min-width:581px) and (max-width:768px)'
121

  
122

  
123
  ; Layout settings - Smalltouch landscape
124
  settings[smalltouch_landscape_layout]         = 'one_col_vert'
125
  settings[smalltouch_landscape_page_unit]      = '%'
126
  settings[smalltouch_landscape_sidebar_unit]   = '%'
127
  settings[smalltouch_landscape_page_width]     = 100
128
  settings[smalltouch_landscape_sidebar_first]  = 50
129
  settings[smalltouch_landscape_sidebar_second] = 50
130
  settings[smalltouch_landscape_media_query]    = 'only screen and (min-width:321px) and (max-width:580px)'
131

  
132

  
133
  ; Layout settings - Smalltouch portrait
134
  settings[smalltouch_portrait_layout]         = 'one_col_stack'
135
  settings[smalltouch_portrait_page_unit]      = '%'
136
  settings[smalltouch_portrait_sidebar_unit]   = '%'
137
  settings[smalltouch_portrait_page_width]     = 100
... Ce différentiel a été tronqué car il excède la taille maximale pouvant être affichée.

Formats disponibles : Unified diff