Develop (#49)

joelpittet · occupant · commit 4dd9adb68765 · 2018-01-05T09:35:37.000-08:00
* Fix whitespace in theme-settings.php * Fix whitespace in template.php * Fix for class generation in #33
diff --git a/megatron.info b/megatron.info
@@ -38,6 +38,7 @@ settings[clf_streetaddr] = '123 Main St.'
 settings[clf_locality] = 'Vancouver'
 settings[clf_region] = 'BC'
 settings[clf_country] = 'Canada'
+settings[clf_use_path_body_classes] = 0
 
 ;Excluded CSS Files
 exclude[css][] = 'misc/vertical-tabs.css'
diff --git a/template.php b/template.php
@@ -70,7 +70,7 @@ function megatron_preprocess_search_block_form(&$variables) {
 function megatron_preprocess_html(&$variables) {
   // Classes for body element. Allows advanced theming based on context
   // (home page, node of certain type, etc.)
-  if (!$variables['is_front']) {
+  if (!$variables['is_front'] && !theme_get_setting('clf_use_path_body_classes')) {
     // Add unique class for each page.
     $path = drupal_get_path_alias($_GET['q']);
     // Add unique class for each website section.
@@ -83,15 +83,15 @@ function megatron_preprocess_html(&$variables) {
         $section = 'node-' . arg(2);
       }
     }
-    // add a body class that reflects content placement
+    // Add a body class that reflects content placement.
     $variables['classes_array'][] = drupal_html_class('section-' . megatron_id_safe($section));
     $variables['classes_array'][] = drupal_html_class('path-' . megatron_id_safe($path));
   }
-  // add a body class to tell us what colours we're using
+  // Add a body class to tell us what colours we're using.
   $variables['classes_array'][] = drupal_html_class('themecolour' . theme_get_setting('clf_clf_theme_new'));
 
-  //Uses RDFa attributes if the RDF module is enabled
-  //Lifted from Adaptivetheme for D7, full credit to Jeff Burnz
+  // Uses RDFa attributes if the RDF module is enabled
+  // Lifted from Adaptivetheme for D7, full credit to Jeff Burnz
   // Add rdf info
   $variables['doctype'] = '<!DOCTYPE html>' . "\n";
   $variables['rdf'] = new stdClass;
@@ -135,13 +135,13 @@ function megatron_preprocess_html(&$variables) {
   if ($clfLayout == '__fluid') {
     $variables['classes_array'][] = drupal_html_class('full-width-left');
   }
-	// Add body class if theme_get_setting('clf_nogradient') is set to true
+  // Add body class if theme_get_setting('clf_nogradient') is set to true
   if (theme_get_setting('clf_nogradient') == TRUE) {
     $variables['classes_array'][] = drupal_html_class('no-gradient');
   }
 
-	/* ADD A NOFOLLOW META TAG TO PREVENT SITE INDEXING IF IT IS NOT A PRODUCTION WEBSITE */
-	// Setup meta tag
+  /* ADD A NOFOLLOW META TAG TO PREVENT SITE INDEXING IF IT IS NOT A PRODUCTION WEBSITE */
+  // Setup meta tag
   if (theme_get_setting('clf_environment')) {
     $nofollow = array(
       '#type' => 'html_tag',
@@ -155,29 +155,29 @@ function megatron_preprocess_html(&$variables) {
     drupal_add_html_head($nofollow, '$nofollow');
   }
 
-	// ADD CSS
-	$packageprefix = '7.0.4/css/ubc-clf';
-	$minversion = '';
-	$packagesuffix = '.min';
-	$minlayout = '-full';
-	if (theme_get_setting('clf_clf_minimal') == TRUE) {
-		$packageprefix = '7.0.4-minimal/css/minimal-clf';
-		$minversion = '-7.0.4';
-		$minlayout = '';
-		$packagesuffix = '';
-		if ((theme_get_setting('clf_layout') == '__full') || (theme_get_setting('clf_layout') == '__fluid')) {
-		  $minlayout = '-full';
-		}
-	}
-	drupal_add_css('https://cdn.ubc.ca/clf/' . $packageprefix . $minlayout . $minversion . theme_get_setting('clf_clf_theme_new') . $packagesuffix . '.css', array('type' => 'external', 'group'=>CSS_THEME, 'every_page' => TRUE, 'weight' => -2));
-	drupal_add_css(drupal_get_path('theme', 'megatron') . '/css/clf_drupal.css', array('group' => CSS_THEME, 'every_page' => TRUE, 'weight' => -1));
-	// ADD JAVASCRIPT
-	// Load modernizr if requested
+  // ADD CSS
+  $packageprefix = '7.0.4/css/ubc-clf';
+  $minversion = '';
+  $packagesuffix = '.min';
+  $minlayout = '-full';
+  if (theme_get_setting('clf_clf_minimal') == TRUE) {
+    $packageprefix = '7.0.4-minimal/css/minimal-clf';
+    $minversion = '-7.0.4';
+    $minlayout = '';
+    $packagesuffix = '';
+    if ((theme_get_setting('clf_layout') == '__full') || (theme_get_setting('clf_layout') == '__fluid')) {
+      $minlayout = '-full';
+    }
+  }
+  drupal_add_css('https://cdn.ubc.ca/clf/' . $packageprefix . $minlayout . $minversion . theme_get_setting('clf_clf_theme_new') . $packagesuffix . '.css', array('type' => 'external', 'group'=>CSS_THEME, 'every_page' => TRUE, 'weight' => -2));
+  drupal_add_css(drupal_get_path('theme', 'megatron') . '/css/clf_drupal.css', array('group' => CSS_THEME, 'every_page' => TRUE, 'weight' => -1));
+  // ADD JAVASCRIPT
+  // Load modernizr if requested
   if (theme_get_setting('clf_modernizr')) {
     drupal_add_js(drupal_get_path('theme', 'megatron') .'/js/lib/modernizr/modernizr.custom.2.6.2.js', array('group' => JS_THEME, 'every_page' => TRUE, 'weight' => 1000));
   }
-	drupal_add_js(drupal_get_path('theme', 'megatron') . '/js/lib/bootstrap/bootstrap-alert-min.js', array('scope' => 'footer', 'group' => JS_THEME, 'every_page' => TRUE, 'weight' => -99));
-	drupal_add_js(drupal_get_path('theme', 'megatron') . '/js/lib/megatron/megatron-min.js', array('scope' => 'footer', 'group' => JS_THEME, 'every_page' => TRUE, 'weight' => -98));
+  drupal_add_js(drupal_get_path('theme', 'megatron') . '/js/lib/bootstrap/bootstrap-alert-min.js', array('scope' => 'footer', 'group' => JS_THEME, 'every_page' => TRUE, 'weight' => -99));
+  drupal_add_js(drupal_get_path('theme', 'megatron') . '/js/lib/megatron/megatron-min.js', array('scope' => 'footer', 'group' => JS_THEME, 'every_page' => TRUE, 'weight' => -98));
 }
 
 /** BREADCRUMB ALTERATIONS
diff --git a/theme-settings.php b/theme-settings.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * @file
+ */
+
 /** CLF THEME INFO
 ---------------------------------------------------------- */
 function megatron_form_system_theme_settings_alter(&$form, &$form_state) {
@@ -57,14 +61,14 @@ function megatron_form_system_theme_settings_alter(&$form, &$form_state) {
     '#description' => t('Included for legacy purposes. All current and future themes should be using at least 7.0.4.'),
     '#default_value' => theme_get_setting('clf_clf_version'),
     '#options' => array(
-			/* DEPRECATED - should now be using 7.0.5 */
+      /* DEPRECATED - should now be using 7.0.5 */
       //'7.0.2' => t('Release 7.0.2'),
       //'7.0.3' => t('Release 7.0.3'),
       '7.0.4' => t('Release 7.0.4'),
     ),
   );
 
-	/* DEPRECATED - now should use $form['clf_theme']['clf_clf_minimal'] below
+  /* DEPRECATED - now should use $form['clf_theme']['clf_clf_minimal'] below
   $form['clf_theme']['clf_clf_package'] = array(
     '#type' => 'select',
     '#title' => t('CLF Package'),
@@ -77,7 +81,7 @@ function megatron_form_system_theme_settings_alter(&$form, &$form_state) {
   );
 */
 
-	$form['clf_theme']['clf_clf_minimal'] = array(
+  $form['clf_theme']['clf_clf_minimal'] = array(
     '#type' => 'checkbox',
     '#title' => t('Minimal CLF Distribution'),
     '#description' => t('This is a distribution of the CLF that <strong>only</strong> includes required CLF styles.<br /><br />This is provided for advanced themers only, who don\'t wish to use the full Bootstrap 2.x framework that the CLF is build upon. Extensive theming is required.'),
@@ -110,13 +114,20 @@ function megatron_form_system_theme_settings_alter(&$form, &$form_state) {
     '#default_value' => theme_get_setting('clf_secondarynavoption'),
   );
 
-	$form['clf_theme']['clf_nogradient'] = array(
+  $form['clf_theme']['clf_nogradient'] = array(
     '#type' => 'checkbox',
     '#title' => t('Remove the gradient and text shadow in the Unit Name region?'),
     '#description' => t('Create a flat version of the CLF by removing the gradients in the Unit Name region.'),
     '#default_value' => theme_get_setting('clf_nogradient'),
   );
 
+  $form['clf_theme']['clf_use_path_body_classes'] = array(
+    '#type' => 'checkbox',
+    '#title' => t("Remove the <em>section-*</em> and <em>path-*</em> CSS classes from the body."),
+    '#description' => t('Recommended: These CSS classes produce overhead and possible conflicts with Bootstrap 2.x span CSS classes. Only keep if your theme is using them to style specific pages.'),
+    '#default_value' => theme_get_setting('clf_use_path_body_classes'),
+  );
+
 /*
 REMOVED - Now handled in template.php by checking for the jQuery Update module - if not found, it loads jQuery 1.8 from the Google CDN
   $form['clf_theme']['clf_jqueryoption'] = array(
@@ -417,14 +428,14 @@ function megatron_form_system_theme_settings_alter(&$form, &$form_state) {
     '#maxlength' => 128,
   );
 
-	$form['clf_environment'] = array(
-    '#type' => 'checkbox', 
+  $form['clf_environment'] = array(
+    '#type' => 'checkbox',
     '#title' => t('Do <em>not</em> allow the site to be indexed'),
     '#description' => t('If this is <strong>not</strong> a production website, this checkbox will add a "nofollow" meta tag to all pages.'),
     '#default_value' => theme_get_setting('clf_environment'),
   );
   $form['clf_modernizr'] = array(
-    '#type' => 'checkbox', 
+    '#type' => 'checkbox',
     '#title' => t('Load the modernizr library'),
     '#description' => t('Enable the <a href="https://modernizr.com" target="_blank">modernizr library</a> to allow feature detection.<br /><br />The included build detects support for fontface, backgroundsize, borderimage, borderradius, boxshadow, flexbox, flexboxlegacy, hsla, multiplebgs, opacity, rgba, textshadow, cssanimations, csscolumns, generatedcontent, cssgradients, cssreflections, csstransforms, csstransforms3d, csstransitions, applicationcache, localstorage, sessionstorage, websqldatabase, webworkers, geolocation, svg, touch, shiv, mq.<br /><br />To include additional features or exclude some of the ones listed, please create a custom build and include it using an alternative method (either in your theme <em>.info</em> file, your theme\'s <em>html.tpl.php</em> template or via <em>theme_preprocess_html</em>).'),
     '#default_value' => theme_get_setting('clf_modernizr'),
