Project

General

Profile

Revision bfb52287

Added by Assos Assos over 9 years ago

Weekly update of contrib modules

View differences:

drupal7/sites/all/themes/mayo/layouts/core/three_col_grail/three_col_grail.inc
64 64
  $styles = <<<EOF
65 65
.two-sidebars #content .section {margin-$left: $push_left; margin-$right: $push_right}
66 66
.one-sidebar #content .section {margin-$left: $push_left;}
67
.sidebar-second #content .section {margin-$left: 0; margin-$right: $pull_right;}
67 68
#sidebar-first .section {margin-left: 0; margin-right: 10px;}
68 69
#sidebar-second .section {margin-right: 0; margin-left: 10px;}
69 70
#sidebar-first {width: $sidebar_first; margin-$left: -100%}
drupal7/sites/all/themes/mayo/mayo.info
146 146
  settings[global_default_layout]         = 'smalltouch-portrait'
147 147
  settings[global_default_layout_toggle]  = 0
148 148
  settings[global_files_path]             = 'public_files'
149
; Information added by Drupal.org packaging script on 2014-12-14
150
version = "7.x-2.2"
149
; Information added by Drupal.org packaging script on 2015-02-04
150
version = "7.x-2.3"
151 151
core = "7.x"
152 152
project = "mayo"
153
datestamp = "1418527389"
153
datestamp = "1423070582"
154 154

  
drupal7/sites/all/themes/mayo/templates/page.tpl.php
107 107
  $header_watermark_style = '';
108 108
  $header_watermark = theme_get_setting('header_watermark');
109 109
  if($header_watermark) {
110
    $header_watermark_style = 'background-image: url(/' . drupal_get_path('theme', 'mayo') . '/images/pat-' . $header_watermark . '.png);';
110
    $header_watermark_style = 'background-image: url(' . url(drupal_get_path('theme', 'mayo') . '/images/pat-' . $header_watermark . '.png') . ');';
111 111
  }
112 112

  
113 113
  $logo_style = '';
drupal7/sites/all/themes/mayo/theme-settings.php
6 6
 * Custom theme settings
7 7
 */
8 8
function mayo_form_system_theme_settings_alter(&$form, &$form_state) {
9

  
9
    global $base_url;
10 10
  drupal_add_js(drupal_get_path('theme', 'mayo') . '/js/mayo.js');
11 11
    // Get our plugin system functions.
12 12
  require_once(drupal_get_path('theme', 'mayo') . '/inc/plugins.inc');
13 13

  
14 14
  // We need some getters.
15 15
  require_once(drupal_get_path('theme', 'mayo') . '/inc/get.inc');
16
  $path_to_mayo = drupal_get_path('theme', 'mayo');
17 16

  
18 17
  // General "alters" use a form id. Settings should not be set here. The only
19 18
  // thing useful about this is if you need to alter the form for the running
......
127 126
    '#size' => 12,
128 127
    '#maxlength' => 8,
129 128
    '#description' => t('Specify the base vertical (top/bottom) margin which is vertical spaces between page edge and browser screen in px.'),
130
    '#prefix' => '<img src="/' . drupal_get_path('theme', 'mayo') . '/images/base-layout.png" /><br />',
129
    '#prefix' => '<img src="' . url(drupal_get_path('theme', 'mayo') . '/images/base-layout.png') . '" /><br />',
131 130
  );
132 131
  $form['layout']['page_margin'] = array(
133 132
    '#type' => 'textfield',
......
145 144
      1 => t('1. Apply page margin to all (header, footer and main contents).'),
146 145
      2 => t('2. Apply page margin to main contents only.'),
147 146
    ),
148
    '#description' => '<img src="/' . drupal_get_path('theme', 'mayo') . '/images/page-layout.png" /><br />' . t('When the layout 2 is selected, or header background image is selected, header borders are not drawn to make it look better.'),
147
    '#description' => '<img src="' . url(drupal_get_path('theme', 'mayo') . '/images/page-layout.png') . '" /><br />' . t('When the layout 2 is selected, or header background image is selected, header borders are not drawn to make it look better.'),
149 148
  );
150 149

  
151 150
  /* --------------- Responsive sidebar layout settings -------------- */
......
764 763
      'rc-2' => t('Node only'),
765 764
      'rc-3' => t('Both sidebar block and node'),
766 765
    ),
767
    '#suffix' => '<img src="/' . drupal_get_path('theme', 'mayo') . '/images/round-corners.png" /><br />',
766
    '#suffix' => '<img src="' . url(drupal_get_path('theme', 'mayo') . '/images/round-corners.png') . '" /><br />',
768 767
  );
769 768

  
770 769
  $form['style']['menubar_style'] = array(
......
775 774
      1 => t('1. Normal (based on the colors specified by the color set)'),
776 775
      2 => t('2. Gloss black image background.'),
777 776
    ),
778
    '#suffix' => '<img src="/' . drupal_get_path('theme', 'mayo') . '/images/menubar-type.png" />',
777
    '#suffix' => '<img src="' . url(drupal_get_path('theme', 'mayo') . '/images/menubar-type.png') . '" />',
779 778
  );
780 779
  $form['style']['note'] = array(
781 780
    '#type' => 'item',
......
825 824
    '#size' => 12,
826 825
    '#maxlength' => 8,
827 826
    '#description' => t('Specify the header height in px.'),
828
    '#prefix' => '<img src="/' . drupal_get_path('theme', 'mayo') . '/images/header-layout.png" /><br />',
827
    '#prefix' => '<img src="' . url(drupal_get_path('theme', 'mayo') . '/images/header-layout.png') . '" /><br />',
829 828
  );
830 829
  $form['adv_header']['header_border_width'] = array(
831 830
    '#type' => 'textfield',
......
938 937
      5 => t('Star'),
939 938
      6 => t('Metal'),
940 939
    ),
941
    '#suffix' => '<img src="/' . drupal_get_path('theme', 'mayo') . '/images/watermark-sample.png" /><br />',
940
    '#suffix' => '<img src="' . url(drupal_get_path('theme', 'mayo') . '/images/watermark-sample.png') . '" /><br />',
942 941
  );
943 942

  
944 943
  /* --------------- Misellanenous settings -------------- */
drupal7/sites/all/themes/tao/drupal-rtl.css
23 23

  
24 24
.progress .percentage { float:left; }
25 25
.progess-disabled { float:right; }
26
.ahah-progress { float:right; }
27
.ahah-progress .throbber { float:right; }
26
.ajax-progress { float:right; }
27
.ajax-progress .throbber { float:right; }
28 28

  
29 29
.draggable a.tabledrag-handle {
30 30
  float: right;
drupal7/sites/all/themes/tao/drupal.css
77 77

  
78 78
.element-invisible {
79 79
  position:absolute !important;
80
  clip:rect(1px 1px 1px 1px); /* IE6, IE7 */
81 80
  clip:rect(1px, 1px, 1px, 1px);
82 81
  }
83 82

  
......
105 104

  
106 105
div.error,
107 106
tr.error {
108
  background:#fcc;
107
  background-color:#fcc;
109 108
  color:#200;
110 109
  }
111 110

  
112 111
div.warning,
113 112
tr.warning {
114
  background:#ffd;
113
  background-color:#ffd;
115 114
  color:#220;
116 115
  }
117 116

  
......
281 280

  
282 281
.progress .percentage { float:right; }
283 282
.progress-disabled { float:left; }
284
.ahah-progress { float:left; }
283
.ajax-progress { float:left; }
285 284

  
286
.ahah-progress .throbber {
285
.ajax-progress .throbber {
287 286
  width:20px;
288 287
  height:20px;
289 288
  background:transparent url(drupal/throbber.gif) 50% 50% no-repeat;
290 289
  float:left;
291 290
  }
292 291

  
293
.ahah-progress-bar { width:16em; }
292
.ajax-progress-bar { width:16em; }
294 293

  
295 294
/**
296 295
 * Formatting for welcome page
......
337 336
  height: 0;
338 337
  clear: both;
339 338
  visibility: hidden;
340
  }
341

  
342
* html .clearfix { height: 1%; } /* IE6 */
343

  
344
*:first-child + html .clearfix { min-height: 1%; } /* IE7 */
339
}
345 340

  
346 341
/**
347 342
 * update/update.css ==================================================
......
391 386
  }
392 387

  
393 388
.vertical-tabs .vertical-tabs-panes .vertical-tabs-pane legend { display:none; }
389
.vertical-tabs .vertical-tabs-panes .vertical-tabs-pane #search-api-alter-add-aggregation-field-settings legend { display:block; }
394 390
.vertical-tabs .vertical-tabs-list .summary { display:block; }
drupal7/sites/all/themes/tao/ie.css
1
.element-invisible {clip:rect(1px 1px 1px 1px); /* IE6, IE7 */}
2
* html .clearfix { height: 1%; } /* IE6 */
3
*:first-child + html .clearfix { min-height: 1%; } /* IE7 */
drupal7/sites/all/themes/tao/tao.info
1 1
core = 7.x
2 2
description = Tao is a base theme that is all about going with the flow. It takes care of key reset and utility tasks so that sub-themes can get on with their job.
3
engine = phptemplate
4 3
name = Tao
5 4

  
6 5
; Regions =====================================================================
......
20 19
stylesheets[all][] = reset.css
21 20
stylesheets[all][] = base.css
22 21
stylesheets[screen][] = drupal.css
22
stylesheets[ie][lte IE 7] = ie.css
23 23

  
24
; Information added by drupal.org packaging script on 2011-09-21
25
version = "7.x-3.0-beta4"
24
; Information added by Drupal.org packaging script on 2014-03-18
25
version = "7.x-3.1"
26 26
core = "7.x"
27 27
project = "tao"
28
datestamp = "1316616407"
28
datestamp = "1395127156"
29 29

  
drupal7/sites/all/themes/tao/template.php
43 43
    'modules/system/system.base.css' => FALSE,
44 44
    'modules/system/system.maintenance.css' => FALSE,
45 45
    'modules/system/system.menus.css' => FALSE,
46
    'modules/system/system.messages.css' => FALSE,
47 46
    'modules/system/system.theme.css' => FALSE,
48 47
    'modules/taxonomy/taxonomy.css' => FALSE,
49 48
    'modules/tracker/tracker.css' => FALSE,
......
98 97
 */
99 98
function tao_preprocess_html(&$vars) {
100 99
  $vars['classes_array'][] = 'tao';
100

  
101
  // Add IE from theme file.
102
  $tao_path = drupal_get_path('theme', 'tao');
103
  $info = drupal_parse_info_file($tao_path.'/tao.info');
104
  $ie = $info['stylesheets']['ie'];
105
  foreach ($ie as $key => $value) {
106
    drupal_add_css(
107
      $tao_path.'/'.$value,
108
      array(
109
        'browsers' => array(
110
          'IE' => $key,
111
          '!IE' => FALSE
112
        )
113
      )
114
    );
115
  }
116

  
101 117
}
102 118

  
103 119
/**
......
119 135
  $vars['hook'] = 'block';
120 136

  
121 137
  $vars['attributes_array']['id'] = $vars['block_html_id'];
138
  $vars['attributes_array']['class'] = $vars['classes_array'];
122 139

  
123
  $vars['title_attributes_array']['class'][] = 'block-title';
140
  $vars['title_attributes_array']['class'][] = $vars['hook'] . '-title';
124 141
  $vars['title_attributes_array']['class'][] = 'clearfix';
125 142

  
126
  $vars['content_attributes_array']['class'][] = 'block-content';
143
  $vars['content_attributes_array']['class'][] = $vars['hook'] . '-content';
127 144
  $vars['content_attributes_array']['class'][] = 'clearfix';
128 145
  if ($vars['block']->module == 'block') {
129 146
    $vars['content_attributes_array']['class'][] = 'prose';
......
148 165
function tao_preprocess_node(&$vars) {
149 166
  $vars['hook'] = 'node';
150 167

  
168
  $vars['classes_array'][] = 'clearfix';
169

  
151 170
  $vars['attributes_array']['id'] = "node-{$vars['node']->nid}";
152 171

  
153
  $vars['title_attributes_array']['class'][] = 'node-title';
172
  $vars['title_attributes_array']['class'][] = $vars['hook'] . '-title';
154 173
  $vars['title_attributes_array']['class'][] = 'clearfix';
155 174

  
156
  $vars['content_attributes_array']['class'][] = 'node-content';
175
  $vars['content_attributes_array']['class'][] = $vars['hook'] . '-content';
157 176
  $vars['content_attributes_array']['class'][] = 'clearfix';
158 177
  $vars['content_attributes_array']['class'][] = 'prose';
159 178

  
......
181 200
function tao_preprocess_comment(&$vars) {
182 201
  $vars['hook'] = 'comment';
183 202

  
184
  $vars['title_attributes_array']['class'][] = 'comment-title';
203
  $vars['classes_array'][] = 'clearfix';
204

  
205
  $vars['title_attributes_array']['class'][] = $vars['hook'] . '-title';
185 206
  $vars['title_attributes_array']['class'][] = 'clearfix';
186 207

  
187
  $vars['content_attributes_array']['class'][] = 'comment-content';
208
  $vars['content_attributes_array']['class'][] = $vars['hook'] . '-content';
188 209
  $vars['content_attributes_array']['class'][] = 'clearfix';
189 210

  
190 211
  $vars['submitted'] = t('Submitted by !username on !datetime', array(
......
210 231
    $vars['attributes']['class'][] = 'titled';
211 232
  }
212 233
  if (!empty($element['#id'])) {
213
    $vars['attributes']['id'] = $element['#id'];
234
    if (!empty($element["#attributes"]["id"])) {
235
      $vars['attributes']['id'] = $element["#attributes"]["id"];
236
    } else {
237
      $vars['attributes']['id'] = $element['#id'];
238
    }
214 239
  }
215 240

  
216 241
  $description = !empty($element['#description']) ? "<div class='description'>{$element['#description']}</div>" : '';
......
239 264
 * Override of theme('textarea').
240 265
 * Deprecate misc/textarea.js in favor of using the 'resize' CSS3 property.
241 266
 */
242
function tao_textarea($variables) {
243
  $element = $variables['element'];
267
function tao_textarea($vars) {
268
  $element = $vars['element'];
244 269
  $element['#attributes']['name'] = $element['#name'];
245 270
  $element['#attributes']['id'] = $element['#id'];
246 271
  $element['#attributes']['cols'] = $element['#cols'];
......
305 330
    'attributes' => array('class' => 'links pager pager-links')
306 331
  ));
307 332
  if ($pager_list) {
308
    return "<div class='pager clearfix'>$pager_list $pager_links</div>";
333
    return '<div class="pager clearfix">' . $pager_list . ' ' . $pager_links . '</div>';
309 334
  }
310 335
}
311 336

  
drupal7/sites/all/themes/tao/templates/node.tpl.php
1 1
<?php if (!empty($pre_object)) print render($pre_object) ?>
2 2

  
3
<div class='<?php print $classes ?> clearfix' <?php print ($attributes) ?>>
3
<div<?php print ($attributes) ?>>
4 4
  <?php if (!empty($title_prefix)) print render($title_prefix); ?>
5 5

  
6 6
  <?php if (!$page && !empty($title)): ?>
7 7
    <h2 <?php if (!empty($title_attributes)) print $title_attributes ?>>
8
      <?php if (!empty($new)): ?><span class='new'><?php print $new ?></span><?php endif; ?>
8
      <?php if (!empty($new)): ?><span class="new"><?php print $new ?></span><?php endif; ?>
9 9
      <a href="<?php print $node_url ?>"><?php print $title ?></a>
10 10
    </h2>
11 11
  <?php endif; ?>
......
13 13
  <?php if (!empty($title_suffix)) print render($title_suffix); ?>
14 14

  
15 15
  <?php if (!empty($submitted)): ?>
16
    <div class='<?php print $hook ?>-submitted clearfix'><?php print $submitted ?></div>
16
    <div class="<?php print $hook ?>-submitted clearfix"><?php print $submitted ?></div>
17 17
  <?php endif; ?>
18 18

  
19 19
  <?php if (!empty($content)): ?>
20
    <div class='<?php print $hook ?>-content clearfix <?php if (!empty($is_prose)) print 'prose' ?>'>
20
    <div<?php print $content_attributes ?>>
21 21
      <?php print render($content) ?>
22 22
    </div>
23 23
  <?php endif; ?>
24 24

  
25 25
  <?php if (!empty($links)): ?>
26
    <div class='<?php print $hook ?>-links clearfix'>
26
    <div class="<?php print $hook ?>-links clearfix">
27 27
      <?php print render($links) ?>
28 28
    </div>
29 29
  <?php endif; ?>
drupal7/sites/all/themes/tao/templates/object.tpl.php
1 1
<?php if (!empty($pre_object)) print render($pre_object) ?>
2 2

  
3
<div class='<?php print $classes ?> clearfix' <?php print ($attributes) ?>>
3
<div<?php print $attributes ?>>
4 4
  <?php if (!empty($title_prefix)) print render($title_prefix); ?>
5 5

  
6 6
  <?php if (!empty($title)): ?>
7 7
    <h2 <?php if (!empty($title_attributes)) print $title_attributes ?>>
8
      <?php if (!empty($new)): ?><span class='new'><?php print $new ?></span><?php endif; ?>
8
      <?php if (!empty($new)): ?><span class="new"><?php print $new ?></span><?php endif; ?>
9 9
      <?php print $title ?>
10 10
    </h2>
11 11
  <?php endif; ?>
......
13 13
  <?php if (!empty($title_suffix)) print render($title_suffix); ?>
14 14

  
15 15
  <?php if (!empty($submitted)): ?>
16
    <div class='<?php print $hook ?>-submitted clearfix'><?php print $submitted ?></div>
16
    <div class="<?php print $hook ?>-submitted clearfix"><?php print $submitted ?></div>
17 17
  <?php endif; ?>
18 18

  
19 19
  <?php if (!empty($content)): ?>
20
    <div <?php print $content_attributes; ?>><?php print render($content) ?></div>
20
    <div<?php print $content_attributes; ?>><?php print render($content) ?></div>
21 21
  <?php endif; ?>
22 22

  
23 23
  <?php if (!empty($links)): ?>
24
    <div class='<?php print $hook ?>-links clearfix'><?php print render($links) ?></div>
24
    <div class="<?php print $hook ?>-links clearfix"><?php print render($links) ?></div>
25 25
  <?php endif; ?>
26 26
</div>
27 27

  
drupal7/sites/all/themes/tao/templates/page.tpl.php
1 1
<?php if ($page['help'] || ($show_messages && $messages)): ?>
2
  <div id='console'><div class='limiter clearfix'>
2
  <div id="console"><div class="limiter clearfix">
3 3
    <?php print render($page['help']); ?>
4 4
    <?php if ($show_messages && $messages): print $messages; endif; ?>
5 5
  </div></div>
6 6
<?php endif; ?>
7 7

  
8 8
<?php if ($page['header']): ?>
9
  <div id='header'><div class='limiter clearfix'>
9
  <div id="header"><div class="limiter clearfix">
10 10
    <?php print render($page['header']); ?>
11 11
  </div></div>
12 12
<?php endif; ?>
13 13

  
14
<div id='branding'><div class='limiter clearfix'>
15
  <?php if ($site_name): ?><h1 class='site-name'><?php print $site_name ?></h1><?php endif; ?>
14
<div id="branding"><div class="limiter clearfix">
15
  <?php if ($site_name): ?><h1 class="site-name"><?php print $site_name ?></h1><?php endif; ?>
16 16
</div></div>
17 17

  
18
<div id='navigation'><div class='limiter clearfix'>
18
<div id="navigation"><div class="limiter clearfix">
19 19
  <?php if (isset($main_menu)) : ?>
20
    <?php print theme('links', array('links' => $main_menu, 'attributes' => array('class' => 'links main-menu'))) ?>
20
    <?php print theme('links__system_main_menu', array('links' => $main_menu, 'attributes' => array('class' => 'links main-menu'), 'heading' => array('text' => t('Main menu'), 'level' => 'h2', 'class' => array('element-invisible')))) ?>
21 21
  <?php endif; ?>
22 22
  <?php if (isset($secondary_menu)) : ?>
23
    <?php print theme('links', array('links' => $secondary_menu, 'attributes' => array('class' => 'links secondary-menu'))) ?>
23
    <?php print theme('links__system_secondary_menu', array('links' => $secondary_menu, 'attributes' => array('class' => 'links secondary-menu'), 'heading' => array('text' => t('Secondary menu'), 'level' => 'h2', 'class' => array('element-invisible')))) ?>
24 24
  <?php endif; ?>
25 25
</div></div>
26 26

  
27 27
<?php if ($page['highlighted']): ?>
28
  <div id='highlighted'><div class='limiter clearfix'>
28
  <div id="highlighted"><div class="limiter clearfix">
29 29
    <?php print render($page['highlighted']); ?>
30 30
  </div></div>
31 31
<?php endif; ?>
32 32

  
33
<div id='page'><div class='limiter clearfix'>
33
<div id="page"><div class="limiter clearfix">
34 34

  
35 35
  <?php if ($page['sidebar_first']): ?>
36
    <div id='left' class='clearfix'><?php print render($page['sidebar_first']) ?></div>
36
    <div id="sidebar-first" class="clearfix"><?php print render($page['sidebar_first']) ?></div>
37 37
  <?php endif; ?>
38 38

  
39
  <div id='main-content' class='clearfix'>
39
  <div id="main-content" class="clearfix">
40 40
    <?php if ($breadcrumb) print $breadcrumb; ?>
41 41
    <?php print render($title_prefix); ?>
42
    <?php if ($title): ?><h1 class='page-title'><?php print $title ?></h1><?php endif; ?>
42
    <?php if ($title): ?><h1 class="page-title"><?php print $title ?></h1><?php endif; ?>
43 43
    <?php print render($title_suffix); ?>
44
    <?php if ($primary_local_tasks): ?><ul class='links clearfix'><?php print render($primary_local_tasks) ?></ul><?php endif; ?>
45
    <?php if ($secondary_local_tasks): ?><ul class='links clearfix'><?php print render($secondary_local_tasks) ?></ul><?php endif; ?>
46
    <?php if ($action_links): ?><ul class='links clearfix'><?php print render($action_links); ?></ul><?php endif; ?>
47
    <div id='content' class='clearfix'><?php print render($page['content']) ?></div>
44
    <?php if ($primary_local_tasks): ?><ul class="links clearfix"><?php print render($primary_local_tasks) ?></ul><?php endif; ?>
45
    <?php if ($secondary_local_tasks): ?><ul class="links clearfix"><?php print render($secondary_local_tasks) ?></ul><?php endif; ?>
46
    <?php if ($action_links): ?><ul class="links clearfix"><?php print render($action_links); ?></ul><?php endif; ?>
47
    <div id="content" class="clearfix"><?php print render($page['content']) ?></div>
48 48
  </div>
49 49

  
50 50
  <?php if ($page['sidebar_second']): ?>
51
    <div id='right' class='clearfix'><?php print render($page['sidebar_second']) ?></div>
51
    <div id="sidebar-second" class="clearfix"><?php print render($page['sidebar_second']) ?></div>
52 52
  <?php endif; ?>
53 53

  
54 54
</div></div>
55 55

  
56
<div id="footer"><div class='limiter clearfix'>
56
<div id="footer"><div class="limiter clearfix">
57 57
  <?php print $feed_icons ?>
58 58
  <?php print render($page['footer']) ?>
59 59
</div></div>
drupal7/sites/all/themes/tao/templates/views-view-grid.tpl.php
3 3
$gridsize = count($rows[0]);
4 4
?>
5 5
<?php if (!empty($title)) : ?>
6
  <h3 class='grid-title'><?php print $title; ?></h3>
6
  <h3 class="grid-title"><?php print $title; ?></h3>
7 7
<?php endif; ?>
8 8
<table class="views-view-grid grid-<?php print $gridsize ?>">
9 9
  <tbody>
......
20 20
      <tr class="<?php print $row_class; ?>">
21 21
        <?php foreach ($columns as $column_number => $item): ?>
22 22
          <td class="<?php print 'col-'. ($column_number + 1); ?>">
23
            <div class='grid-item'><?php print $item; ?></div>
23
            <div class="grid-item"><?php print $item; ?></div>
24 24
          </td>
25 25
        <?php endforeach; ?>
26 26
      </tr>

Also available in: Unified diff