From 3d11eb78de87572b49f2e6be277c3cf5a451e93a Mon Sep 17 00:00:00 2001
From: Tim Steiner <tsteiner2@unl.edu>
Date: Mon, 13 Jun 2011 22:53:13 +0000
Subject: [PATCH] [gh-145] Merging from testing into staging
git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/staging@731 20a16fea-79d4-4915-8869-1ea9d5ebf173
---
sites/all/themes/unl_wdn/template.php | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/sites/all/themes/unl_wdn/template.php b/sites/all/themes/unl_wdn/template.php
index 9911ed5df..ce52f1e36 100644
--- a/sites/all/themes/unl_wdn/template.php
+++ b/sites/all/themes/unl_wdn/template.php
@@ -11,6 +11,14 @@ function unl_wdn_css_alter(&$css) {
unset($css[$path.'/system.theme.css']);
}
+function unl_wdn_css_alter(&$css) {
+ // Turn off some styles from the system module.
+ // If some of this is later found desireable, add "stylesheets[all][] = css/unl_wdn.menus.css" to unl_wdn.info and copy these files to that locaiton with edits.
+ $path = drupal_get_path('module','system');
+ unset($css[$path.'/system.menus.css']);
+ unset($css[$path.'/system.theme.css']);
+}
+
function unl_wdn_preprocess_html(&$vars, $hook) {
/**
* Change the <title> tag to UNL format: UNL | Department | Section | Page
@@ -60,16 +68,21 @@ function unl_wdn_preprocess_page(&$vars, $hook) {
function unl_wdn_get_instance() {
static $instance;
if (!$instance) {
- set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/lib/php');
+ set_include_path(dirname(__FILE__) . '/lib/php');
require_once "UNL/Templates.php";
UNL_Templates::$options['version'] = UNL_Templates::VERSION3;
+
if (theme_get_setting('toggle_main_menu')) {
$instance = UNL_Templates::factory('Fixed');
}
else {
$instance = UNL_Templates::factory('Document');
}
+
+ if (theme_get_setting('wdn_beta')) {
+ UNL_Templates::$options['templatedependentspath'] = $_SERVER['DOCUMENT_ROOT'].'/wdntemplates-dev';
+ }
}
return $instance;
--
GitLab