Changes after PR-3 DDBasic

Author: martinyde

inc/functions.inc

@@ -113,7 +113,7 @@ function ddbasic_get_css_files($theme_name) {
  *   Usually the active theme.
  */
 function ddbasic_get_info_trail($theme_name) {
-  $info_trail = drupal_static(__FUNCTION__, array());
+  $info_trail = &drupal_static(__FUNCTION__, array());
   if (empty($info_trail)) {
     $lt = list_themes();
 

scripts/ddbasic.common.js

@@ -1,6 +1,6 @@
 (function($) {
 
-  /*
+  /**
    * Toggle opening hours
    */
   function toggle_opening_hours() {

template.php

@@ -2,34 +2,16 @@
 /**
  * @file
  * Preprocess and Process Functions.
- *
- * 1. Rename each function and instance of "adaptivetheme_subtheme" to match
- *    your subthemes name, e.g. if your theme name is "footheme" then the
- *    function name will be "footheme_preprocess_hook". Tip - you can
- *    search/replace on "adaptivetheme_subtheme".
- * 2. Uncomment the required function to use.
- * 3. Read carefully, especially within adaptivetheme_subtheme_preprocess_html()
- *    , there are extra goodies you might want to leverage such as a very simple
- *    way of adding stylesheets for Internet Explorer and a browser detection
- *    script to add body classes.
- *
- * @see http://drupal.org/node/254940#variables-processor
  */
 
-global $theme_key, $path_to_ddbasic_core;
-$theme_key = $GLOBALS['theme_key'];
-$path_to_ddbasic_core = drupal_get_path('theme', 'ddbasic');
-
 // Includes frequently used theme functions that gets theme info, css files etc.
-include_once $path_to_ddbasic_core . '/inc/functions.inc';
-
+include_once $GLOBALS['theme_path'] . '/inc/functions.inc';
 
 /**
  * Implements hook_preprocess_html().
  */
 function ddbasic_preprocess_html(&$vars) {
-  global $theme_key, $language;
-  $theme_name = $theme_key;
+  $language = $GLOBALS['language'];
 
   // Setup iOS logo if it's set.
   $vars['ios_logo'] = theme_get_setting('iosicon_upload');
@@ -40,10 +22,6 @@ function ddbasic_preprocess_html(&$vars) {
   // Clean up the lang attributes.
   $vars['html_attributes'] = 'lang="' . $language->language . '" dir="' . $language->dir . '"';
 
-  // Build an array of poly-filling scripts.
-  $vars['polyfills_array'] = '';
-  $vars['polyfills_array'] = ddbasic_load_polyfills($theme_name, $vars);
-
   // Load ddbasic plugins.
   ddbasic_load_plugins();
 
@@ -70,13 +48,16 @@ function ddbasic_preprocess_html(&$vars) {
   ));
 }
 
-
 /**
  * Implements hook_process_html().
  *
  * Process variables for html.tpl.php
  */
 function ddbasic_process_html(&$vars) {
+  $theme_name = $GLOBALS['theme_key'];
+  // Build an array of poly-filling scripts.
+  $vars['polyfills_array'] = '';
+  $vars['polyfills_array'] = ddbasic_load_polyfills($theme_name, $vars);
   // This code is copied from Adaptive Theme, at_core/inc/process.inc.
   // It wraps the required polyfills scripts into a conditional comment.
   if (!empty($vars['polyfills_array'])) {
@@ -667,7 +648,7 @@ function ddbasic_remove_default_link_classes($classes) {
  * Ex. add a javascript depending on the settings in the theme.
  */
 function ddbasic_load_plugins() {
-  global $path_to_ddbasic_core;
+  $path_to_ddbasic_core = $GLOBALS['theme_path'];
 
   // If sticky menus is enabled in the theme load it.
   if (theme_get_setting('main_menu_sticky')) {
@@ -749,7 +730,7 @@ function ddbasic_theme_conditional_scripts($ie_scripts) {
  * @param string $theme_name  :   Name of the theme.
  */
 function ddbasic_load_polyfills($theme_name) {
-  global $path_to_ddbasic_core;
+  $path_to_ddbasic_core = $GLOBALS['theme_path'];
 
   // Get the info file data.
   $info = ddbasic_get_info($theme_name);
@@ -806,7 +787,7 @@ function ddbasic_load_polyfills($theme_name) {
  *   Array of ?.
  */
 function ddbasic_polly_wants_a_cracker($polly) {
-  global $path_to_ddbasic_core;
+  $path_to_ddbasic_core = $GLOBALS['theme_path'];
 
   $baked_crackers = drupal_static(__FUNCTION__, array());
   if (empty($baked_crackers)) {

templates/field--field-ding-body.tpl.php

@@ -1,7 +1,7 @@
 <?php
-
 /**
  * @file field--ddbasic-field-ding-event-category.tpl.php
+ * Added label classes to category field elements.
  *
  * Available variables:
  * - $items: An array of field values. Use render() to output them.
@@ -41,11 +41,11 @@
 <?php if (!$label_hidden): ?>
   <div class="field-label"<?php print $title_attributes; ?>><?php print $label ?>:&nbsp;</div>
 <?php endif; ?>
-<?php 
-  foreach ($items as $delta => $item) {
-    if ($item["#type"]=='link') {
-      print l($item['#title'], $item['#href'], array('attributes' => array('class' => array('label', 'label-info'))));
-    } else {
-      print '<span class="label label-info">' . $item['#title'] . '</span>';
-    }
-  }
+<?php foreach ($items as $delta => $item) : ?>
+  <?php if ($item["#type"] == 'link') : ?>
+    <?php print l($item['#title'], $item['#href'], array('attributes' => array('class' => array('label', 'label-info'))));?>
+  <?php else : ?>
+    <?php print '<span class="label label-info">' . $item['#title'] . '</span>';?>
+  <?php endif; ?>
+<?php endforeach; ?>
+

templates/fields/field--ddbasic-field-ding-event-category.tpl.php

@@ -2,9 +2,7 @@
 
 /**
  * @file field--ddbasic-field-ding-event-price.tpl.php
- *
- * This file is not used and is here as a starting point for customization only.
- * @see theme_field()
+ * Stripped all wrappers for this field.
  *
  * Available variables:
  * - $items: An array of field values. Use render() to output them.

templates/fields/field--ddbasic-field-ding-event-price.tpl.php

@@ -1,6 +1,41 @@
 <?php
 /**
- * @file field.tpl.php
+ * @file field--ddbasic-tags--full.tpl.php
+ * Removed default field wrapper.
+ *
+ * Available variables:
+ * - $items: An array of field values. Use render() to output them.
+ * - $label: The item label.
+ * - $label_hidden: Whether the label display is set to 'hidden'.
+ * - $classes: String of classes that can be used to style contextually through
+ *   CSS. It can be manipulated through the variable $classes_array from
+ *   preprocess functions. The default values can be one or more of the
+ *   following:
+ *   - field: The current template type, i.e., "theming hook".
+ *   - field-name-[field_name]: The current field name. For example, if the
+ *     field name is "field_description" it would result in
+ *     "field-name-field-description".
+ *   - field-type-[field_type]: The current field type. For example, if the
+ *     field type is "text" it would result in "field-type-text".
+ *   - field-label-[label_display]: The current label position. For example, if
+ *     the label position is "above" it would result in "field-label-above".
+ *
+ * Other variables:
+ * - $element['#object']: The entity to which the field is attached.
+ * - $element['#view_mode']: View mode, e.g. 'full', 'teaser'...
+ * - $element['#field_name']: The field name.
+ * - $element['#field_type']: The field type.
+ * - $element['#field_language']: The field language.
+ * - $element['#field_translatable']: Whether the field is translatable or not.
+ * - $element['#label_display']: Position of label display, inline, above, or
+ *   hidden.
+ * - $field_name_css: The css-compatible field name.
+ * - $field_type_css: The css-compatible field type.
+ * - $classes_array: Array of html class attribute values. It is flattened
+ *   into a string within the variable $classes.
+ *
+ * @see template_preprocess_field()
+ * @see theme_field()
  */
 ?>
 <?php if (!$label_hidden): ?>

templates/fields/field--ddbasic-tags--full.tpl.php

@@ -1,6 +1,41 @@
 <?php
 /**
- * @file field.tpl.php
+ * @file field--ddbasic-tags--search-result.tpl.php
+ * Changed default field wrapper class.
+ *
+ * Available variables:
+ * - $items: An array of field values. Use render() to output them.
+ * - $label: The item label.
+ * - $label_hidden: Whether the label display is set to 'hidden'.
+ * - $classes: String of classes that can be used to style contextually through
+ *   CSS. It can be manipulated through the variable $classes_array from
+ *   preprocess functions. The default values can be one or more of the
+ *   following:
+ *   - field: The current template type, i.e., "theming hook".
+ *   - field-name-[field_name]: The current field name. For example, if the
+ *     field name is "field_description" it would result in
+ *     "field-name-field-description".
+ *   - field-type-[field_type]: The current field type. For example, if the
+ *     field type is "text" it would result in "field-type-text".
+ *   - field-label-[label_display]: The current label position. For example, if
+ *     the label position is "above" it would result in "field-label-above".
+ *
+ * Other variables:
+ * - $element['#object']: The entity to which the field is attached.
+ * - $element['#view_mode']: View mode, e.g. 'full', 'teaser'...
+ * - $element['#field_name']: The field name.
+ * - $element['#field_type']: The field type.
+ * - $element['#field_language']: The field language.
+ * - $element['#field_translatable']: Whether the field is translatable or not.
+ * - $element['#label_display']: Position of label display, inline, above, or
+ *   hidden.
+ * - $field_name_css: The css-compatible field name.
+ * - $field_type_css: The css-compatible field type.
+ * - $classes_array: Array of html class attribute values. It is flattened
+ *   into a string within the variable $classes.
+ *
+ * @see template_preprocess_field()
+ * @see theme_field()
  */
 ?>
 <div class="subjects <?php print $classes; ?>">

templates/fields/field--ddbasic-tags--search-result.tpl.php

@@ -1,9 +1,39 @@
 <?php
 
 /**
- * @file field.tpl.php
+ * @file field--field-alma-interest-period.tpl.php
+ * Ensured that the field value is translated. It should be but it's not.
  *
- * Ensure that the field value it translated. It should be but it's not.
+ * Available variables:
+ * - $items: An array of field values. Use render() to output them.
+ * - $label: The item label.
+ * - $label_hidden: Whether the label display is set to 'hidden'.
+ * - $classes: String of classes that can be used to style contextually through
+ *   CSS. It can be manipulated through the variable $classes_array from
+ *   preprocess functions. The default values can be one or more of the
+ *   following:
+ *   - field: The current template type, i.e., "theming hook".
+ *   - field-name-[field_name]: The current field name. For example, if the
+ *     field name is "field_description" it would result in
+ *     "field-name-field-description".
+ *   - field-type-[field_type]: The current field type. For example, if the
+ *     field type is "text" it would result in "field-type-text".
+ *   - field-label-[label_display]: The current label position. For example, if
+ *     the label position is "above" it would result in "field-label-above".
+ *
+ * Other variables:
+ * - $element['#object']: The entity to which the field is attached.
+ * - $element['#view_mode']: View mode, e.g. 'full', 'teaser'...
+ * - $element['#field_name']: The field name.
+ * - $element['#field_type']: The field type.
+ * - $element['#field_language']: The field language.
+ * - $element['#field_translatable']: Whether the field is translatable or not.
+ * - $element['#label_display']: Position of label display, inline, above, or
+ *   hidden.
+ * - $field_name_css: The css-compatible field name.
+ * - $field_type_css: The css-compatible field type.
+ * - $classes_array: Array of html class attribute values. It is flattened
+ *   into a string within the variable $classes.
  *
  * @see template_preprocess_field()
  * @see theme_field()

templates/fields/field--field-alma-interest-period.tpl.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * @file field-ding-body.tpl.php
+ * Removed all field wrappers.
+ *
+ * Available variables:
+ * - $items: An array of field values. Use render() to output them.
+ * - $label: The item label.
+ * - $label_hidden: Whether the label display is set to 'hidden'.
+ * - $classes: String of classes that can be used to style contextually through
+ *   CSS. It can be manipulated through the variable $classes_array from
+ *   preprocess functions. The default values can be one or more of the
+ *   following:
+ *   - field: The current template type, i.e., "theming hook".
+ *   - field-name-[field_name]: The current field name. For example, if the
+ *     field name is "field_description" it would result in
+ *     "field-name-field-description".
+ *   - field-type-[field_type]: The current field type. For example, if the
+ *     field type is "text" it would result in "field-type-text".
+ *   - field-label-[label_display]: The current label position. For example, if
+ *     the label position is "above" it would result in "field-label-above".
+ *
+ * Other variables:
+ * - $element['#object']: The entity to which the field is attached.
+ * - $element['#view_mode']: View mode, e.g. 'full', 'teaser'...
+ * - $element['#field_name']: The field name.
+ * - $element['#field_type']: The field type.
+ * - $element['#field_language']: The field language.
+ * - $element['#field_translatable']: Whether the field is translatable or not.
+ * - $element['#label_display']: Position of label display, inline, above, or
+ *   hidden.
+ * - $field_name_css: The css-compatible field name.
+ * - $field_type_css: The css-compatible field type.
+ * - $classes_array: Array of html class attribute values. It is flattened
+ *   into a string within the variable $classes.
+ *
+ * @see template_preprocess_field()
+ * @see theme_field()
+ */
+?>
+<?php print render($items[0]); ?>
+ 

templates/fields/field--field-ding-body.tpl.php

@@ -1,8 +1,8 @@
 <?php
 
 /**
- * @file field--ddbasic-field-ding-event-category.tpl.php
- * Template for ddbasic field implementation to display the value of a field.
+ * @file field--og-group-ref--ding-event.tpl.php
+ * Removed default field wrapper. Add label classes.
  *
  * Available variables:
  * - $items: An array of field values. Use render() to output them.