From cfc10153932f32608c54809bed0c65fb65affe6c Mon Sep 17 00:00:00 2001
From: Tim Steiner <tsteiner2@unl.edu>
Date: Wed, 7 Dec 2011 17:43:29 +0000
Subject: [PATCH] [gh-52] Merging from testing into staging
git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/staging@1338 20a16fea-79d4-4915-8869-1ea9d5ebf173
---
README-UNL.txt | 8 +-
includes/bootstrap.inc | 4 +-
includes/unl_bootstrap.inc | 73 ++++++++-
sites/all/themes/unl_wdn/lib/.pear2registry | Bin 152576 -> 157696 bytes
.../{1.0.0-info.xml => 1.2.0-info.xml} | 152 ++++++++++++------
.../data/tpl_cache/Version3/Absolute.tpl | 4 +-
.../data/tpl_cache/Version3/Debug.tpl | 4 +-
.../data/tpl_cache/Version3/Document.tpl | 4 +-
.../data/tpl_cache/Version3/Fixed.tpl | 4 +-
.../data/tpl_cache/Version3/Fixed_html5.tpl | 119 ++++++++++++++
.../data/tpl_cache/Version3/Liquid.tpl | 4 +-
.../data/tpl_cache/Version3/Mobile.tpl | 119 ++++++++++++++
.../data/tpl_cache/Version3/Popup.tpl | 10 +-
.../data/tpl_cache/Version3/Secure.tpl | 9 +-
.../tpl_cache/Version3/Shared_column_left.tpl | 4 +-
.../Version3/Shared_column_right.tpl | 4 +-
.../data/tpl_cache/Version3/Unlaffiliate.tpl | 127 +++++++++++++++
.../UNL_Templates/docs/examples/convert.php | 37 +++++
.../UNL_Templates/docs/examples/example1.php | 2 +-
.../lib/downloads/UNL_Templates-1.2.0.tgz | Bin 0 -> 21250 bytes
.../themes/unl_wdn/lib/php/UNL/Templates.php | 112 +++++++------
.../lib/php/UNL/Templates/Version2.php | 2 +-
.../lib/php/UNL/Templates/Version3.php | 2 +-
.../UNL/Templates/Version3/Fixed_html5.php | 30 ++++
.../lib/php/UNL/Templates/Version3/Mobile.php | 38 +++++
.../lib/php/UNL/Templates/Version3/Secure.php | 1 -
.../UNL/Templates/Version3/Unlaffiliate.php | 31 ++++
sites/all/themes/unl_wdn/template.php | 16 +-
28 files changed, 776 insertions(+), 144 deletions(-)
rename sites/all/themes/unl_wdn/lib/.xmlregistry/packages/pear.unl.edu/UNL_Templates/{1.0.0-info.xml => 1.2.0-info.xml} (86%)
create mode 100644 sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Fixed_html5.tpl
create mode 100644 sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Mobile.tpl
create mode 100644 sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Unlaffiliate.tpl
create mode 100644 sites/all/themes/unl_wdn/lib/docs/UNL_Templates/docs/examples/convert.php
create mode 100644 sites/all/themes/unl_wdn/lib/downloads/UNL_Templates-1.2.0.tgz
create mode 100644 sites/all/themes/unl_wdn/lib/php/UNL/Templates/Version3/Fixed_html5.php
create mode 100644 sites/all/themes/unl_wdn/lib/php/UNL/Templates/Version3/Mobile.php
create mode 100644 sites/all/themes/unl_wdn/lib/php/UNL/Templates/Version3/Unlaffiliate.php
diff --git a/README-UNL.txt b/README-UNL.txt
index d6298442..26af2b9a 100644
--- a/README-UNL.txt
+++ b/README-UNL.txt
@@ -31,8 +31,14 @@ modules/image/image.field.inc
sites/all/modules/form_builder/modules/webform/form_builder_webform.module
* In form_builder_webform_components_page() load jquery.ui.datepicker.min.js so the Date element will work on a new form that does not have ui.datepicker loaded
* http://drupal.org/node/1307838
+
+-------------------------------------
-------------------------------------
+includes/bootstrap.inc
+ * Fix so that drupal_serve_page_from_cache() won't override a cached Vary header.
+ * http://drupal.org/node/1321086
+
+-------------------------------------
sites/sites.php
* Added support for $default_domains array. See includes/bootstrap.inc conf_path().
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 4c69ee94..b2d1a8ab 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -1360,7 +1360,9 @@ function drupal_serve_page_from_cache(stdClass $cache) {
// revalidation. If a Vary header has been set in hook_boot(), it is assumed
// that the module knows how to cache the page.
if (!isset($hook_boot_headers['vary']) && !variable_get('omit_vary_cookie')) {
- header('Vary: Cookie');
+ // UNL Change!
+ drupal_add_http_header('Vary', 'Cookie', TRUE);
+ // End UNL Change!
}
if ($page_compression) {
diff --git a/includes/unl_bootstrap.inc b/includes/unl_bootstrap.inc
index 6a901314..9a3f394d 100644
--- a/includes/unl_bootstrap.inc
+++ b/includes/unl_bootstrap.inc
@@ -1,10 +1,19 @@
<?php
/**
- * Enable the set up of multiple sites without making symbolics links.
- * Instead, a few entries in .htaccess will be all that is needed.
+ * Do so special setup for UNL specific features.
*/
function unl_bootstrap() {
+ unl_bootstrap_multisite_without_symlinks();
+ unl_bootstrap_proxy_pass_support();
+ unl_bootstrap_mobile_internal_redirect();
+}
+
+/**
+ * Enable the set up of multiple sites without making symbolics links.
+ * Instead, a few entries in .htaccess and sites.php will be all that is needed.
+ */
+function unl_bootstrap_multisite_without_symlinks() {
$original_script_name = $_SERVER['SCRIPT_NAME'];
$php_file = basename($original_script_name);
@@ -39,14 +48,70 @@ function unl_bootstrap() {
$previous_script_name = $_SERVER['SCRIPT_NAME'];
}
- // Fix some paths when used through a ProxyPass
+ conf_path(TRUE, TRUE);
+}
+
+/**
+ * Fix some paths when used through a ProxyPass
+ */
+function unl_bootstrap_proxy_pass_support() {
if (isset($_SERVER['HTTP_X_FORWARDED_HOST']) && isset($_SERVER['HTTP_X_FORWARDED_PATH'])) {
$GLOBALS['base_url'] = 'http://' . $_SERVER['HTTP_X_FORWARDED_HOST'] . $_SERVER['HTTP_X_FORWARDED_PATH'];
$GLOBALS['cookie_domain'] = $_SERVER['HTTP_X_FORWARDED_HOST'];
$_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_FORWARDED_PATH'] . '/' . request_path();
}
+}
+
+/**
+ * If this site should be served with a mobile theme, do an internal redirect
+ * so that the page cache can store this mobile themed page separate from
+ * the normally themed page.
+ */
+function unl_bootstrap_mobile_internal_redirect() {
+ if (unl_bootstrap_is_mobile_user() && !isset($_GET['format'])) {
+ $_GET['format'] = 'mobile';
+ $_SERVER['QUERY_STRING'] = http_build_query($_GET);
+ $_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_URL'] . '?' . $_SERVER['QUERY_STRING'];
+ }
+}
+
+/**
+ * Check if the user is using a "supported" mobile user agent
+ *
+ * @return bool
+ */
+function unl_bootstrap_is_mobile_user() {
+ if (isset($_SERVER['X-UNL-Mobile'])) {
+ // If Varnish set the X-UNL-Mobile header, use it instead of checking again.
+ return $_SERVER['X-UNL-Mobile'] == 'Yes';
+ }
- conf_path(TRUE, TRUE);
+ if (!isset($_SERVER['HTTP_ACCEPT'], $_SERVER['HTTP_USER_AGENT'])) {
+ // We have no vars to check
+ return false;
+ }
+
+ if (isset($_COOKIE['wdn_mobile'])
+ && $_COOKIE['wdn_mobile'] == 'no') {
+ // The user has a cookie set, requesting no mobile views
+ return false;
+ }
+
+ if ( // Check the http_accept and user agent and see
+ preg_match('/text\/vnd\.wap\.wml|application\/vnd\.wap\.xhtml\+xml/i', $_SERVER['HTTP_ACCEPT'])
+ ||
+ (preg_match('/'.
+ 'sony|symbian|nokia|samsung|mobile|windows ce|epoc|opera mini|' .
+ 'nitro|j2me|midp-|cldc-|netfront|mot|up\.browser|up\.link|audiovox|' .
+ 'blackberry|ericsson,|panasonic|philips|sanyo|sharp|sie-|' .
+ 'portalmmm|blazer|avantgo|danger|palm|series60|palmsource|pocketpc|' .
+ 'smartphone|rover|ipaq|au-mic|alcatel|ericy|vodafone\/|wap1\.|wap2\.|iPhone|Android' .
+ '/i', $_SERVER['HTTP_USER_AGENT'])
+ ) && !preg_match('/ipad/i', $_SERVER['HTTP_USER_AGENT'])) {
+ return true;
+ }
+
+ return false;
}
/**
diff --git a/sites/all/themes/unl_wdn/lib/.pear2registry b/sites/all/themes/unl_wdn/lib/.pear2registry
index 49240ca2cbd1415fdceb0ee0760eed67d086eadf..98075e3383c983d8ba3d484da5ddcaf343216ba5 100644
GIT binary patch
delta 6753
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
X@!}Kpkm=V%{8fT-Kr^shhm`*YYJ`4}
delta 6778
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
JH@A}w@INd}^7{Y)
diff --git a/sites/all/themes/unl_wdn/lib/.xmlregistry/packages/pear.unl.edu/UNL_Templates/1.0.0-info.xml b/sites/all/themes/unl_wdn/lib/.xmlregistry/packages/pear.unl.edu/UNL_Templates/1.2.0-info.xml
similarity index 86%
rename from sites/all/themes/unl_wdn/lib/.xmlregistry/packages/pear.unl.edu/UNL_Templates/1.0.0-info.xml
rename to sites/all/themes/unl_wdn/lib/.xmlregistry/packages/pear.unl.edu/UNL_Templates/1.2.0-info.xml
index 4e6e0974..f5495720 100644
--- a/sites/all/themes/unl_wdn/lib/.xmlregistry/packages/pear.unl.edu/UNL_Templates/1.0.0-info.xml
+++ b/sites/all/themes/unl_wdn/lib/.xmlregistry/packages/pear.unl.edu/UNL_Templates/1.2.0-info.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
+<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.1" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
<name>UNL_Templates</name>
<channel>pear.unl.edu</channel>
<summary>The UNL HTML Templates as a PEAR Package.</summary>
@@ -16,10 +16,10 @@
<email>nhummel2@math.unl.edu</email>
<active>yes</active>
</lead>
- <date>2010-09-08</date>
- <time>10:31:36</time>
+ <date>2011-08-31</date>
+ <time>11:02:54</time>
<version>
- <release>1.0.0</release>
+ <release>1.2.0</release>
<api>1.0.0</api>
</version>
<stability>
@@ -28,47 +28,26 @@
</stability>
<license uri="http://www1.unl.edu/wdn/wiki/Software_License">BSD License</license>
<notes>
-Feature Release!
-Added support for specifying the template version, 2 or 3.
-* UNL_Templates::$options['version'] = 3; to use the new templates.
-* Added the secure template.
-* Add debug template.
-* Updated Version 3 templates to reflect footer changes.
-* Multiple template caching backends are
-
-Additional work to prevent broken pages.
-* If local files are not present for the <!--#include statements, it will grab them remotely.
-* If wdn/templates_3.0 does not exist locally it will use a template with absolute references to prevent broken pages.
+Update .tpl cache so template files are in sync with latest wdntemplates.
+Allow underscores within Version3 template include files.
-New methods:
-* addHeadLink($href, $relation, $relType = 'rel', array $attributes = array())
-* addScript($url, $type = 'text/javascript')
-* addScriptDeclaration($content, $type = 'text/javascript')
-* addStyleDeclaration($content, $type = 'text/css')
-* addStyleSheet($url, $media = 'all')
-* __toString() Now you can just use echo $page;
-
-Auto loading of files - now supporting:
-* optionalfooter=>optionalFooter.html
-* collegenavigationlist=>unitNavigation.html
-* contactinfo=>footerContactInfo.html
+New templates!
-New Remote Template Scanner UNL_Templates_Scanner
-* Scans a rendered UNL Template page for the editable content areas.
+ * Fixed_html5
+ * Unlaffiliate
-Other fixes:
-* Use static vars instead of PEAR::getStaticProperty() - fixes E_STRICT warnings
-* Remove debug code causing cache to never be used.
-* Fix debugging.
-* Merge UNL_DWT::$options with options from ini file instead of overwriting.
-* Set default timezone to use before we use date functions.
-* Add newlines after header additions.
-* Fix addScriptDeclaration method to comment out CDATA to prevent syntax errors.
+Template updates:
-Add example of a custom class with auto-breadcrumb generation and body content loading.
+ * Meta lang fixes
+ * Remove IDM region from the secure template
+ * Mobile template now supports navigation and move to HTML5
</notes>
<contents>
<dir name="/">
+ <file baseinstalldir="/" md5sum="40eeca840e02c9e5b2b2b7846bd73397" name="UNL/Templates/Version3/Unlaffiliate.php" role="php">
+ <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
+ <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
+ </file>
<file baseinstalldir="/" md5sum="f9b3c237b7a6b8500ef0d18f4e1c9595" name="UNL/Templates/Version3/Shared_column_right.php" role="php">
<tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
@@ -77,7 +56,7 @@ Add example of a custom class with auto-breadcrumb generation and body content l
<tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file>
- <file baseinstalldir="/" md5sum="e6bcc877d8fe24beb229aec454710e5e" name="UNL/Templates/Version3/Secure.php" role="php">
+ <file baseinstalldir="/" md5sum="7586ee8d6db673dbef56fe491a0ac517" name="UNL/Templates/Version3/Secure.php" role="php">
<tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file>
@@ -85,10 +64,18 @@ Add example of a custom class with auto-breadcrumb generation and body content l
<tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file>
+ <file baseinstalldir="/" md5sum="88ed3fab2afd3f989c53db231ea99715" name="UNL/Templates/Version3/Mobile.php" role="php">
+ <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
+ <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
+ </file>
<file baseinstalldir="/" md5sum="5ae65bf4c045a5b9b65b726b52d6cd26" name="UNL/Templates/Version3/Liquid.php" role="php">
<tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file>
+ <file baseinstalldir="/" md5sum="183165807ee292fa17a03314c5455a6b" name="UNL/Templates/Version3/Fixed_html5.php" role="php">
+ <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
+ <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
+ </file>
<file baseinstalldir="/" md5sum="041aae52a187c4986e495a8643b43ae4" name="UNL/Templates/Version3/Fixed.php" role="php">
<tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
@@ -105,7 +92,7 @@ Add example of a custom class with auto-breadcrumb generation and body content l
<tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file>
- <file baseinstalldir="/" md5sum="95edca2102f2160a7b53162ca94a8b99" name="UNL/Templates/Version3.php" role="php">
+ <file baseinstalldir="/" md5sum="ac6b2ddcaa8204679eb0c8fd86cd7ed1" name="UNL/Templates/Version3.php" role="php">
<tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file>
@@ -141,7 +128,7 @@ Add example of a custom class with auto-breadcrumb generation and body content l
<tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file>
- <file baseinstalldir="/" md5sum="999b47900c623ce2d60192fe3e597ff1" name="UNL/Templates/Version2.php" role="php">
+ <file baseinstalldir="/" md5sum="4c1b93f62221e5229be657196f07f048" name="UNL/Templates/Version2.php" role="php">
<tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file>
@@ -169,7 +156,7 @@ Add example of a custom class with auto-breadcrumb generation and body content l
<tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file>
- <file baseinstalldir="/" md5sum="00fe09cf1f6298ba66b2d850f99f5ff3" name="UNL/Templates.php" role="php">
+ <file baseinstalldir="/" md5sum="2c228caecb506e35cf3259cabbcec9c1" name="UNL/Templates.php" role="php">
<tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file>
@@ -181,7 +168,7 @@ Add example of a custom class with auto-breadcrumb generation and body content l
<tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file>
- <file baseinstalldir="/" md5sum="3a3851e70662c3e0bb3ffbc7e5765325" name="docs/examples/example1.php" role="doc">
+ <file baseinstalldir="/" md5sum="445545ee84172f82ed09219931fa288e" name="docs/examples/example1.php" role="doc">
<tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file>
@@ -197,39 +184,55 @@ Add example of a custom class with auto-breadcrumb generation and body content l
<tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file>
- <file baseinstalldir="/" md5sum="742720269e3488e0fa34f0ad53b2cb00" name="data/tpl_cache/Version3/Shared_column_right.tpl" role="data">
+ <file baseinstalldir="/" md5sum="a7114a3868d0ba54d4ff76b370ea3201" name="docs/examples/convert.php" role="doc">
+ <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
+ <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
+ </file>
+ <file baseinstalldir="/" md5sum="6644923a681f49bfd425f5768d01e4a3" name="data/tpl_cache/Version3/Unlaffiliate.tpl" role="data">
<tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file>
- <file baseinstalldir="/" md5sum="d33744a26d2f229c5b9172557733f35f" name="data/tpl_cache/Version3/Shared_column_left.tpl" role="data">
+ <file baseinstalldir="/" md5sum="84cc265b12115d9c2733a6d03f5a4d85" name="data/tpl_cache/Version3/Shared_column_right.tpl" role="data">
<tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file>
- <file baseinstalldir="/" md5sum="3d0a70139d0d736d7b5a1c9db203407f" name="data/tpl_cache/Version3/Secure.tpl" role="data">
+ <file baseinstalldir="/" md5sum="6003b105b79241b8e001d0f375265747" name="data/tpl_cache/Version3/Shared_column_left.tpl" role="data">
<tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file>
- <file baseinstalldir="/" md5sum="806405f82ed8f12e584e44b6f8d42dc8" name="data/tpl_cache/Version3/Popup.tpl" role="data">
+ <file baseinstalldir="/" md5sum="6a5f82b61c2c2191494af9fe1384bdca" name="data/tpl_cache/Version3/Secure.tpl" role="data">
<tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file>
- <file baseinstalldir="/" md5sum="962756c965f0f2881e88c83a72fe0545" name="data/tpl_cache/Version3/Liquid.tpl" role="data">
+ <file baseinstalldir="/" md5sum="1f3b340e18024423748839343369443d" name="data/tpl_cache/Version3/Popup.tpl" role="data">
<tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file>
- <file baseinstalldir="/" md5sum="d264bf1f5ae2655836aa69a8bcfbd4e6" name="data/tpl_cache/Version3/Fixed.tpl" role="data">
+ <file baseinstalldir="/" md5sum="aa53260716fc4f1d2fc31d149416b7e0" name="data/tpl_cache/Version3/Mobile.tpl" role="data">
<tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file>
- <file baseinstalldir="/" md5sum="636db467eaccd481f1697e85b4f1d814" name="data/tpl_cache/Version3/Document.tpl" role="data">
+ <file baseinstalldir="/" md5sum="4b576a99e001b22d3c77b01f72789546" name="data/tpl_cache/Version3/Liquid.tpl" role="data">
<tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file>
- <file baseinstalldir="/" md5sum="deae0c7ac5529cdc5713e11febd022f0" name="data/tpl_cache/Version3/Debug.tpl" role="data">
+ <file baseinstalldir="/" md5sum="9cedaa7c695c654e0f16fa534e35ec32" name="data/tpl_cache/Version3/Fixed_html5.tpl" role="data">
<tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file>
- <file baseinstalldir="/" md5sum="8d735ef7de849049870801a47d7098e2" name="data/tpl_cache/Version3/Absolute.tpl" role="data">
+ <file baseinstalldir="/" md5sum="783216b7dc343283a21ba3f8a8e5396b" name="data/tpl_cache/Version3/Fixed.tpl" role="data">
+ <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
+ <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
+ </file>
+ <file baseinstalldir="/" md5sum="8a7ecbc31b2a4d85bad056f7c0d06039" name="data/tpl_cache/Version3/Document.tpl" role="data">
+ <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
+ <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
+ </file>
+ <file baseinstalldir="/" md5sum="fe52677e48d48d798d70e9cad4b5c0ed" name="data/tpl_cache/Version3/Debug.tpl" role="data">
+ <tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
+ <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
+ </file>
+ <file baseinstalldir="/" md5sum="b3cf17273448a34ac869d4369663e819" name="data/tpl_cache/Version3/Absolute.tpl" role="data">
<tasks:replace from="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file>
@@ -805,6 +808,51 @@ Other fixes:
Add example of a custom class with auto-breadcrumb generation and body content loading.
</notes>
</release>
+ <release>
+ <version>
+ <release>1.1.0</release>
+ <api>1.0.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <date>2010-09-09</date>
+ <license uri="http://www1.unl.edu/wdn/wiki/Software_License">BSD License</license>
+ <notes>
+Feature Release!
+* Added the mobile template.
+* Fix support for version 2 templates.
+* Only set templatedependentspath if it has not been set.
+ </notes>
+ </release>
+ <release>
+ <version>
+ <release>1.2.0</release>
+ <api>1.0.0</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <date>2011-08-17</date>
+ <license uri="http://www1.unl.edu/wdn/wiki/Software_License">BSD License</license>
+ <notes>
+Update .tpl cache so template files are in sync with latest wdntemplates.
+Allow underscores within Version3 template include files.
+
+New templates!
+
+ * Fixed_html5
+ * Unlaffiliate
+
+Template updates:
+
+ * Meta lang fixes
+ * Remove IDM region from the secure template
+ * Mobile template now supports navigation and move to HTML5
+ </notes>
+ </release>
</changelog>
</phprelease>
</package>
diff --git a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Absolute.tpl b/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Absolute.tpl
index 3b2d5388..cd8ac123 100644
--- a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Absolute.tpl
+++ b/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Absolute.tpl
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"><!-- InstanceBegin template="/Templates/absolute.dwt" codeOutsideHTMLIsLocked="false" -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><!-- InstanceBegin template="/Templates/absolute.dwt" codeOutsideHTMLIsLocked="false" -->
<head>
<!--
Membership and regular participation in the UNL Web Developer Network
@@ -13,7 +13,7 @@
create a derivative work.
This message may not be removed from any pages based on the UNL site template.
- $Id: absolute.dwt 536 2009-07-23 15:47:30Z bbieber2 $
+ $Id: absolute.dwt 1390 2010-11-18 15:24:33Z bbieber2 $
-->
<link rel="stylesheet" type="text/css" media="screen" href="http://www.unl.edu/wdn/templates_3.0/css/all.css" />
<link rel="stylesheet" type="text/css" media="print" href="http://www.unl.edu/wdn/templates_3.0/css/print.css" />
diff --git a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Debug.tpl b/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Debug.tpl
index 29b65bd1..d7d4bf58 100644
--- a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Debug.tpl
+++ b/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Debug.tpl
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"><!-- InstanceBegin template="/Templates/debug.dwt" codeOutsideHTMLIsLocked="false" -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><!-- InstanceBegin template="/Templates/debug.dwt" codeOutsideHTMLIsLocked="false" -->
<head>
<!--
Membership and regular participation in the UNL Web Developer Network
@@ -13,7 +13,7 @@
create a derivative work.
This message may not be removed from any pages based on the UNL site template.
- $Id: debug.dwt 728 2009-09-08 16:53:28Z bbieber2 $
+ $Id: debug.dwt 1390 2010-11-18 15:24:33Z bbieber2 $
-->
<link rel="stylesheet" type="text/css" media="screen" href="/wdn/templates_3.0/css/debug.css" />
<link rel="stylesheet" type="text/css" media="print" href="/wdn/templates_3.0/css/print.css" />
diff --git a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Document.tpl b/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Document.tpl
index 7c0daa28..ddddea7f 100644
--- a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Document.tpl
+++ b/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Document.tpl
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"><!-- InstanceBegin template="/Templates/document.dwt" codeOutsideHTMLIsLocked="false" -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><!-- InstanceBegin template="/Templates/document.dwt" codeOutsideHTMLIsLocked="false" -->
<head>
<!--
Membership and regular participation in the UNL Web Developer Network
@@ -13,7 +13,7 @@
create a derivative work.
This message may not be removed from any pages based on the UNL site template.
- $Id: document.dwt 536 2009-07-23 15:47:30Z bbieber2 $
+ $Id: document.dwt 1390 2010-11-18 15:24:33Z bbieber2 $
-->
<link rel="stylesheet" type="text/css" media="screen" href="/wdn/templates_3.0/css/all.css" />
<link rel="stylesheet" type="text/css" media="print" href="/wdn/templates_3.0/css/print.css" />
diff --git a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Fixed.tpl b/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Fixed.tpl
index bc1710dd..6b2aff63 100644
--- a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Fixed.tpl
+++ b/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Fixed.tpl
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"><!-- InstanceBegin template="/Templates/fixed.dwt" codeOutsideHTMLIsLocked="false" -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><!-- InstanceBegin template="/Templates/fixed.dwt" codeOutsideHTMLIsLocked="false" -->
<head>
<!--
Membership and regular participation in the UNL Web Developer Network
@@ -13,7 +13,7 @@
create a derivative work.
This message may not be removed from any pages based on the UNL site template.
- $Id: fixed.dwt 536 2009-07-23 15:47:30Z bbieber2 $
+ $Id: fixed.dwt 1390 2010-11-18 15:24:33Z bbieber2 $
-->
<link rel="stylesheet" type="text/css" media="screen" href="/wdn/templates_3.0/css/all.css" />
<link rel="stylesheet" type="text/css" media="print" href="/wdn/templates_3.0/css/print.css" />
diff --git a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Fixed_html5.tpl b/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Fixed_html5.tpl
new file mode 100644
index 00000000..fd316a6e
--- /dev/null
+++ b/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Fixed_html5.tpl
@@ -0,0 +1,119 @@
+<!DOCTYPE html>
+<html lang="en"><!-- InstanceBegin template="/Templates/fixed_html5.dwt" codeOutsideHTMLIsLocked="false" -->
+<head>
+<!--#include virtual="/wdn/templates_3.0/includes/metanfavico_html5.html" -->
+<!--
+ Membership and regular participation in the UNL Web Developer Network
+ is required to use the UNL templates. Visit the WDN site at
+ http://wdn.unl.edu/. Click the WDN Registry link to log in and
+ register your unl.edu site.
+ All UNL template code is the property of the UNL Web Developer Network.
+ The code seen in a source code view is not, and may not be used as, a
+ template. You may not use this code, a reverse-engineered version of
+ this code, or its associated visual presentation in whole or in part to
+ create a derivative work.
+ This message may not be removed from any pages based on the UNL site template.
+
+ $Id: fixed_html5.dwt 1918 2011-07-07 15:59:13Z bbieber2 $
+-->
+<link rel="stylesheet" type="text/css" media="screen" href="/wdn/templates_3.0/css/all.css" />
+<link rel="stylesheet" type="text/css" media="print" href="/wdn/templates_3.0/css/print.css" />
+<script type="text/javascript" src="/wdn/templates_3.0/scripts/all.js"></script>
+<!--#include virtual="/wdn/templates_3.0/includes/browserspecifics_html5.html" -->
+<!-- InstanceBeginEditable name="doctitle" -->
+<title>UNL | Department | New Page</title>
+<!-- InstanceEndEditable -->
+<!-- InstanceBeginEditable name="head" -->
+<!-- Place optional header elements here -->
+<!-- InstanceEndEditable -->
+</head>
+<body class="html5 fixed">
+<p class="skipnav"> <a class="skipnav" href="#maincontent">Skip Navigation</a> </p>
+<div id="wdn_wrapper">
+ <div id="header"> <a href="http://www.unl.edu/" title="UNL website"><img src="/wdn/templates_3.0/images/logo.png" alt="UNL graphic identifier" id="logo" /></a>
+ <h1>University of Nebraska–Lincoln</h1>
+ <!--#include virtual="/wdn/templates_3.0/includes/wdnTools.html" -->
+ </div>
+ <div id="wdn_navigation_bar">
+ <div id="breadcrumbs">
+ <!-- WDN: see glossary item 'breadcrumbs' -->
+
+<!-- InstanceBeginEditable name="breadcrumbs" -->
+ <ul>
+ <li><a href="http://www.unl.edu/" title="University of Nebraska–Lincoln">UNL</a></li>
+ <li>Department</li>
+ </ul>
+
+<!-- InstanceEndEditable -->
+</div>
+ <div id="wdn_navigation_wrapper">
+ <div id="navigation">
+<!-- InstanceBeginEditable name="navlinks" -->
+ <!--#include virtual="../sharedcode/navigation.html" -->
+
+<!-- InstanceEndEditable -->
+</div>
+ </div>
+ </div>
+ <div id="wdn_content_wrapper">
+ <div id="titlegraphic">
+<!-- InstanceBeginEditable name="titlegraphic" -->
+ <h1>Department</h1>
+
+<!-- InstanceEndEditable -->
+</div>
+ <div id="pagetitle">
+<!-- InstanceBeginEditable name="pagetitle" -->
+
+<!-- InstanceEndEditable -->
+</div>
+ <div id="maincontent">
+ <!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
+
+<!-- InstanceBeginEditable name="maincontentarea" -->
+ <p>Place your content here.<br />
+ Remember to validate your pages before publishing! Sample layouts are available through the <a href="http://wdn.unl.edu//">Web Developer Network</a>. <br />
+ <a href="http://validator.unl.edu/check/referer">Check this page</a> </p>
+
+<!-- InstanceEndEditable -->
+ <div class="clear"></div>
+ <!--#include virtual="/wdn/templates_3.0/includes/noscript.html" -->
+ <!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
+ </div>
+ <div id="footer">
+ <div id="footer_floater"></div>
+ <div class="footer_col">
+ <!--#include virtual="/wdn/templates_3.0/includes/feedback.html" -->
+ </div>
+ <div class="footer_col">
+<!-- InstanceBeginEditable name="leftcollinks" -->
+ <!--#include virtual="../sharedcode/relatedLinks.html" -->
+
+<!-- InstanceEndEditable -->
+</div>
+ <div class="footer_col">
+<!-- InstanceBeginEditable name="contactinfo" -->
+ <!--#include virtual="../sharedcode/footerContactInfo.html" -->
+
+<!-- InstanceEndEditable -->
+</div>
+ <div class="footer_col">
+ <!--#include virtual="/wdn/templates_3.0/includes/socialmediashare.html" -->
+ </div>
+
+<!-- InstanceBeginEditable name="optionalfooter" -->
+
+<!-- InstanceEndEditable -->
+ <div id="wdn_copyright">
+<!-- InstanceBeginEditable name="footercontent" -->
+ <!--#include virtual="../sharedcode/footer.html" -->
+
+<!-- InstanceEndEditable -->
+ <!--#include virtual="/wdn/templates_3.0/includes/wdn.html" -->
+ | <a href="http://validator.unl.edu/check/referer">W3C</a> | <a href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3">CSS</a> <a href="http://www.unl.edu/" title="UNL Home" id="wdn_unl_wordmark"><img src="/wdn/templates_3.0/css/footer/images/wordmark.png" alt="UNL's wordmark" /></a> </div>
+ </div>
+ </div>
+ <div id="wdn_wrapper_footer"> </div>
+</div>
+</body>
+</html>
diff --git a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Liquid.tpl b/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Liquid.tpl
index 0b127201..903f7678 100644
--- a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Liquid.tpl
+++ b/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Liquid.tpl
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"><!-- InstanceBegin template="/Templates/liquid.dwt" codeOutsideHTMLIsLocked="false" -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><!-- InstanceBegin template="/Templates/liquid.dwt" codeOutsideHTMLIsLocked="false" -->
<head>
<!--
Membership and regular participation in the UNL Web Developer Network
@@ -13,7 +13,7 @@
create a derivative work.
This message may not be removed from any pages based on the UNL site template.
- $Id: liquid.dwt 536 2009-07-23 15:47:30Z bbieber2 $
+ $Id: liquid.dwt 1390 2010-11-18 15:24:33Z bbieber2 $
-->
<link rel="stylesheet" type="text/css" media="screen" href="/wdn/templates_3.0/css/all.css" />
<link rel="stylesheet" type="text/css" media="print" href="/wdn/templates_3.0/css/print.css" />
diff --git a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Mobile.tpl b/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Mobile.tpl
new file mode 100644
index 00000000..38c61a85
--- /dev/null
+++ b/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Mobile.tpl
@@ -0,0 +1,119 @@
+<!DOCTYPE html>
+<html lang="en"><!-- InstanceBegin template="/Templates/mobile.dwt" codeOutsideHTMLIsLocked="false" -->
+<head>
+<!--#include virtual="/wdn/templates_3.0/includes/metanfavico_html5.html" -->
+<!--
+ Membership and regular participation in the UNL Web Developer Network
+ is required to use the UNL templates. Visit the WDN site at
+ http://wdn.unl.edu/. Click the WDN Registry link to log in and
+ register your unl.edu site.
+ All UNL template code is the property of the UNL Web Developer Network.
+ The code seen in a source code view is not, and may not be used as, a
+ template. You may not use this code, a reverse-engineered version of
+ this code, or its associated visual presentation in whole or in part to
+ create a derivative work.
+ This message may not be removed from any pages based on the UNL site template.
+
+ $Id: mobile.dwt 756 2009-09-15 02:31:02Z bbieber2 $
+-->
+<meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width" />
+<link rel="stylesheet" type="text/css" media="screen" href="/wdn/templates_3.0/css/mobile.css" />
+<script type="text/javascript" src="/wdn/templates_3.0/scripts/mobile.js"></script>
+<!--#include virtual="/wdn/templates_3.0/includes/browserspecifics_html5.html" -->
+<!-- InstanceBeginEditable name="doctitle" -->
+<title>UNL | Department | New Page</title>
+<!-- InstanceEndEditable -->
+<!-- InstanceBeginEditable name="head" -->
+<!-- Place optional header elements here -->
+<!-- InstanceEndEditable -->
+</head>
+<body class="html5 mobile">
+<p class="skipnav"> <a class="skipnav" href="#maincontent">Skip Navigation</a> </p>
+<div id="wdn_wrapper">
+ <div id="header"> <a href="http://m.unl.edu/" title="UNL website"><img src="/wdn/templates_3.0/images/logo.png" alt="UNL graphic identifier" id="logo" /></a>
+ <h1>University of Nebraska–Lincoln</h1>
+ <!--#include virtual="/wdn/templates_3.0/includes/wdnTools_html5.html" -->
+ </div>
+ <div id="wdn_navigation_bar">
+ <div id="breadcrumbs">
+ <!-- WDN: see glossary item 'breadcrumbs' -->
+
+<!-- InstanceBeginEditable name="breadcrumbs" -->
+ <ul>
+ <li><a href="http://www.unl.edu/" title="University of Nebraska–Lincoln">UNL</a></li>
+ <li>Department</li>
+ </ul>
+
+<!-- InstanceEndEditable -->
+</div>
+ <div id="wdn_navigation_wrapper">
+ <div id="navigation">
+<!-- InstanceBeginEditable name="navlinks" -->
+ <!--#include virtual="../sharedcode/navigation.html" -->
+
+<!-- InstanceEndEditable -->
+</div>
+ </div>
+ </div>
+ <div id="wdn_content_wrapper">
+ <div id="titlegraphic">
+<!-- InstanceBeginEditable name="titlegraphic" -->
+ <h1>Department</h1>
+
+<!-- InstanceEndEditable -->
+</div>
+ <div id="pagetitle">
+<!-- InstanceBeginEditable name="pagetitle" -->
+
+<!-- InstanceEndEditable -->
+</div>
+ <div id="maincontent">
+ <!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
+
+<!-- InstanceBeginEditable name="maincontentarea" -->
+ <p>Place your content here.<br />
+ Remember to validate your pages before publishing! Sample layouts are available through the <a href="http://wdn.unl.edu//">Web Developer Network</a>. <br />
+ <a href="http://validator.unl.edu/check/referer">Check this page</a> </p>
+
+<!-- InstanceEndEditable -->
+ <div class="clear"></div>
+ <!--#include virtual="/wdn/templates_3.0/includes/noscript.html" -->
+ <!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
+ </div>
+ <div id="footer">
+ <div id="footer_floater"></div>
+ <div class="footer_col">
+ <!--#include virtual="/wdn/templates_3.0/includes/feedback.html" -->
+ </div>
+ <div class="footer_col">
+<!-- InstanceBeginEditable name="leftcollinks" -->
+ <!--#include virtual="../sharedcode/relatedLinks.html" -->
+
+<!-- InstanceEndEditable -->
+</div>
+ <div class="footer_col">
+<!-- InstanceBeginEditable name="contactinfo" -->
+ <!--#include virtual="../sharedcode/footerContactInfo.html" -->
+
+<!-- InstanceEndEditable -->
+</div>
+ <div class="footer_col">
+ <!--#include virtual="/wdn/templates_3.0/includes/socialmediashare.html" -->
+ </div>
+
+<!-- InstanceBeginEditable name="optionalfooter" -->
+
+<!-- InstanceEndEditable -->
+ <div id="wdn_copyright">
+<!-- InstanceBeginEditable name="footercontent" -->
+ <!--#include virtual="../sharedcode/footer.html" -->
+
+<!-- InstanceEndEditable -->
+ <!--#include virtual="/wdn/templates_3.0/includes/wdn.html" -->
+ | <a href="http://validator.unl.edu/check/referer">W3C</a> | <a href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3">CSS</a> <a href="http://www.unl.edu/" title="UNL Home" id="wdn_unl_wordmark"><img src="/wdn/templates_3.0/css/footer/images/wordmark.png" alt="UNL's wordmark" /></a> </div>
+ </div>
+ </div>
+ <div id="wdn_wrapper_footer"> </div>
+</div>
+</body>
+</html>
diff --git a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Popup.tpl b/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Popup.tpl
index 6c7b1370..c1ce640a 100644
--- a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Popup.tpl
+++ b/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Popup.tpl
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"><!-- InstanceBegin template="/Templates/popup.dwt" codeOutsideHTMLIsLocked="false" -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><!-- InstanceBegin template="/Templates/popup.dwt" codeOutsideHTMLIsLocked="false" -->
<head>
<!--
Membership and regular participation in the UNL Web Developer Network
@@ -13,7 +13,7 @@
create a derivative work.
This message may not be removed from any pages based on the UNL site template.
- $Id: popup.dwt 536 2009-07-23 15:47:30Z bbieber2 $
+ $Id: popup.dwt 1390 2010-11-18 15:24:33Z bbieber2 $
-->
<link rel="stylesheet" type="text/css" media="screen" href="/wdn/templates_3.0/css/all.css" />
<link rel="stylesheet" type="text/css" media="print" href="/wdn/templates_3.0/css/print.css" />
@@ -65,12 +65,8 @@
<!--#include virtual="../sharedcode/footer.html" -->
<!-- InstanceEndEditable -->
- <ul>
- <li><a href="http://validator.unl.edu/check/referer">W3C</a></li>
- <li><a href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3">CSS</a></li>
- </ul>
<!--#include virtual="/wdn/templates_3.0/includes/wdn.html" -->
- <a href="http://www.unl.edu/" title="UNL Home" id="wdn_unl_wordmark"><img src="/wdn/templates_3.0/css/footer/images/wordmark.png" alt="UNL's wordmark" /></a> </div>
+ | <a href="http://validator.unl.edu/check/referer">W3C</a> | <a href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3">CSS</a> <a href="http://www.unl.edu/" title="UNL Home" id="wdn_unl_wordmark"><img src="/wdn/templates_3.0/css/footer/images/wordmark.png" alt="UNL's wordmark" /></a> </div>
</div>
</div>
<div id="wdn_wrapper_footer"> </div>
diff --git a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Secure.tpl b/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Secure.tpl
index e16e1afd..7d30b122 100644
--- a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Secure.tpl
+++ b/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Secure.tpl
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"><!-- InstanceBegin template="/Templates/secure.dwt" codeOutsideHTMLIsLocked="false" -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><!-- InstanceBegin template="/Templates/secure.dwt" codeOutsideHTMLIsLocked="false" -->
<head>
<!--
Membership and regular participation in the UNL Web Developer Network
@@ -13,7 +13,7 @@
create a derivative work.
This message may not be removed from any pages based on the UNL site template.
- $Id: secure.dwt 562 2009-07-28 19:58:23Z bbieber2 $
+ $Id: secure.dwt 1390 2010-11-18 15:24:33Z bbieber2 $
-->
<link rel="stylesheet" type="text/css" media="screen" href="/wdn/templates_3.0/css/debug.css" />
<link rel="stylesheet" type="text/css" media="print" href="/wdn/templates_3.0/css/print.css" />
@@ -32,11 +32,6 @@
<div id="wdn_wrapper">
<div id="header"> <a href="http://www.unl.edu/" title="UNL website"><img src="/wdn/templates_3.0/images/logo.png" alt="UNL graphic identifier" id="logo" /></a>
<h1>University of Nebraska–Lincoln</h1>
- <div id="wdn_identity_management">
-<!-- InstanceBeginEditable name="identitymanagement" -->
-<a href="https://login.unl.edu/cas/logout">Logout</a>
-<!-- InstanceEndEditable -->
- </div>
</div>
<div id="wdn_navigation_bar">
<div id="breadcrumbs">
diff --git a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Shared_column_left.tpl b/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Shared_column_left.tpl
index 378c147c..c87ba9f1 100644
--- a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Shared_column_left.tpl
+++ b/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Shared_column_left.tpl
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"><!-- InstanceBegin template="/Templates/shared_column_left.dwt" codeOutsideHTMLIsLocked="false" -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><!-- InstanceBegin template="/Templates/shared_column_left.dwt" codeOutsideHTMLIsLocked="false" -->
<head>
<!--
Membership and regular participation in the UNL Web Developer Network
@@ -13,7 +13,7 @@
create a derivative work.
This message may not be removed from any pages based on the UNL site template.
- $Id: shared_column_left.dwt 536 2009-07-23 15:47:30Z bbieber2 $
+ $Id: shared_column_left.dwt 1390 2010-11-18 15:24:33Z bbieber2 $
-->
<link rel="stylesheet" type="text/css" media="screen" href="/wdn/templates_3.0/css/all.css" />
<link rel="stylesheet" type="text/css" media="print" href="/wdn/templates_3.0/css/print.css" />
diff --git a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Shared_column_right.tpl b/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Shared_column_right.tpl
index 9e07cc61..ed15b31f 100644
--- a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Shared_column_right.tpl
+++ b/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Shared_column_right.tpl
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"><!-- InstanceBegin template="/Templates/shared_column_right.dwt" codeOutsideHTMLIsLocked="false" -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><!-- InstanceBegin template="/Templates/shared_column_right.dwt" codeOutsideHTMLIsLocked="false" -->
<head>
<!--
Membership and regular participation in the UNL Web Developer Network
@@ -13,7 +13,7 @@
create a derivative work.
This message may not be removed from any pages based on the UNL site template.
- $Id: shared_column_right.dwt 536 2009-07-23 15:47:30Z bbieber2 $
+ $Id: shared_column_right.dwt 1390 2010-11-18 15:24:33Z bbieber2 $
-->
<link rel="stylesheet" type="text/css" media="screen" href="/wdn/templates_3.0/css/all.css" />
<link rel="stylesheet" type="text/css" media="print" href="/wdn/templates_3.0/css/print.css" />
diff --git a/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Unlaffiliate.tpl b/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Unlaffiliate.tpl
new file mode 100644
index 00000000..dd91819a
--- /dev/null
+++ b/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/tpl_cache/Version3/Unlaffiliate.tpl
@@ -0,0 +1,127 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><!-- InstanceBegin template="/Templates/unlaffiliate.dwt" codeOutsideHTMLIsLocked="false" -->
+<head>
+<!--
+ Membership and regular participation in the UNL Web Developer Network
+ is required to use the UNL templates. Visit the WDN site at
+ http://wdn.unl.edu/. Click the WDN Registry link to log in and
+ register your unl.edu site.
+ All UNL template code is the property of the UNL Web Developer Network.
+ The code seen in a source code view is not, and may not be used as, a
+ template. You may not use this code, a reverse-engineered version of
+ this code, or its associated visual presentation in whole or in part to
+ create a derivative work.
+ This message may not be removed from any pages based on the UNL site template.
+
+ $Id: unlaffiliate.dwt 1390 2010-11-18 15:24:33Z bbieber2 $
+-->
+<link rel="stylesheet" type="text/css" media="screen" href="/wdn/templates_3.0/css/all.css" />
+<link rel="stylesheet" type="text/css" media="print" href="/wdn/templates_3.0/css/print.css" />
+<link rel="stylesheet" type="text/css" media="screen" href="../sharedcode/affiliate.css" />
+<script type="text/javascript" src="/wdn/templates_3.0/scripts/all.js"></script>
+<!--#include virtual="/wdn/templates_3.0/includes/browserspecifics.html" -->
+<!--#include virtual="/wdn/templates_3.0/includes/metanfavico.html" -->
+<!-- InstanceBeginEditable name="doctitle" -->
+<title>UNL | Department | New Page</title>
+<!-- InstanceEndEditable -->
+<!-- InstanceBeginEditable name="head" -->
+<!-- Place optional header elements here -->
+<!-- InstanceEndEditable -->
+</head>
+<body class="fixed">
+<p class="skipnav"> <a class="skipnav" href="#maincontent">Skip Navigation</a> </p>
+<div id="wdn_wrapper">
+ <div id="header">
+
+<!-- InstanceBeginEditable name="sitebranding" -->
+ <div id="affiliate_note"><a href="http://www.unl.edu" title="University of Nebraska–Lincoln">An affiliate of the University of Nebraska–Lincoln</a></div>
+ <a href="/" title="Through the Eyes of the Child Initiative"><img src="../sharedcode/affiliate_imgs/affiliate_logo.png" alt="Through the Eyes of the Child Initiative" id="logo" /></a>
+ <h1>Through the Eyes of the Child Initiative</h1>
+ <div id='tag_line'>A Nebraska Supreme Court Initiative</div>
+
+<!-- InstanceEndEditable -->
+ <!--#include virtual="/wdn/templates_3.0/includes/wdnTools.html" -->
+ </div>
+ <div id="wdn_navigation_bar">
+ <div id="breadcrumbs">
+ <!-- WDN: see glossary item 'breadcrumbs' -->
+
+<!-- InstanceBeginEditable name="breadcrumbs" -->
+ <ul>
+ <li><a href="http://www.unl.edu/" title="University of Nebraska–Lincoln">UNL</a></li>
+ <li>Department</li>
+ </ul>
+
+<!-- InstanceEndEditable -->
+</div>
+ <div id="wdn_navigation_wrapper">
+ <div id="navigation">
+<!-- InstanceBeginEditable name="navlinks" -->
+ <!--#include virtual="../sharedcode/navigation.html" -->
+
+<!-- InstanceEndEditable -->
+</div>
+ </div>
+ </div>
+ <div id="wdn_content_wrapper">
+ <div id="titlegraphic">
+<!-- InstanceBeginEditable name="titlegraphic" -->
+ <h1>Department</h1>
+
+<!-- InstanceEndEditable -->
+</div>
+ <div id="pagetitle">
+<!-- InstanceBeginEditable name="pagetitle" -->
+
+<!-- InstanceEndEditable -->
+</div>
+ <div id="maincontent">
+ <!--THIS IS THE MAIN CONTENT AREA; WDN: see glossary item 'main content area' -->
+
+<!-- InstanceBeginEditable name="maincontentarea" -->
+ <p>Place your content here.<br />
+ Remember to validate your pages before publishing! Sample layouts are available through the <a href="http://wdn.unl.edu//">Web Developer Network</a>. <br />
+ <a href="http://validator.unl.edu/check/referer">Check this page</a> </p>
+
+<!-- InstanceEndEditable -->
+ <div class="clear"></div>
+ <!--#include virtual="/wdn/templates_3.0/includes/noscript.html" -->
+ <!--THIS IS THE END OF THE MAIN CONTENT AREA.-->
+ </div>
+ <div id="footer">
+ <div id="footer_floater"></div>
+ <div class="footer_col">
+ <!--#include virtual="/wdn/templates_3.0/includes/feedback.html" -->
+ </div>
+ <div class="footer_col">
+<!-- InstanceBeginEditable name="leftcollinks" -->
+ <!--#include virtual="../sharedcode/relatedLinks.html" -->
+
+<!-- InstanceEndEditable -->
+</div>
+ <div class="footer_col">
+<!-- InstanceBeginEditable name="contactinfo" -->
+ <!--#include virtual="../sharedcode/footerContactInfo.html" -->
+
+<!-- InstanceEndEditable -->
+</div>
+ <div class="footer_col">
+ <!--#include virtual="/wdn/templates_3.0/includes/socialmediashare.html" -->
+ </div>
+
+<!-- InstanceBeginEditable name="optionalfooter" -->
+
+<!-- InstanceEndEditable -->
+ <div id="wdn_copyright">
+<!-- InstanceBeginEditable name="footercontent" -->
+ <!--#include virtual="../sharedcode/footer.html" -->
+
+<!-- InstanceEndEditable -->
+ <!--#include virtual="/wdn/templates_3.0/includes/wdn.html" -->
+ | <a href="http://validator.unl.edu/check/referer">W3C</a> | <a href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3">CSS</a> <a href="http://www.unl.edu/" title="UNL Home" id="wdn_unl_wordmark"><img src="/wdn/templates_3.0/css/footer/images/wordmark.png" alt="UNL's wordmark" /></a> </div>
+ </div>
+ </div>
+ <div id="wdn_wrapper_footer"> </div>
+</div>
+</body>
+</html>
diff --git a/sites/all/themes/unl_wdn/lib/docs/UNL_Templates/docs/examples/convert.php b/sites/all/themes/unl_wdn/lib/docs/UNL_Templates/docs/examples/convert.php
new file mode 100644
index 00000000..f16cee1a
--- /dev/null
+++ b/sites/all/themes/unl_wdn/lib/docs/UNL_Templates/docs/examples/convert.php
@@ -0,0 +1,37 @@
+#!/usr/bin/env php
+<?php
+if (!isset($_SERVER['argv'],$_SERVER['argv'][1])
+ || $_SERVER['argv'][1] == '--help' || $_SERVER['argc'] != 2) {
+ echo "This program requires 1 argument.\n";
+ echo "convert.php oldfile.shtml newfile.shtml\n\n";
+ exit();
+}
+
+require_once 'UNL/Autoload.php';
+
+if (!file_exists($_SERVER['argv'][1])) {
+ echo "Filename does not exist!\n";
+ exit();
+}
+
+UNL_Templates::$options['version'] = 3;
+UNL_Templates::$options['templatedependentspath'] = '/Library/WebServer/Documents';
+
+
+$p = new UNL_Templates_Scanner(file_get_contents($_SERVER['argv'][1]));
+
+
+
+$new = UNL_Templates::factory('Fixed');
+UNL_Templates::$options['templatedependentspath'] = '/Library/WebServer/Documents';
+
+
+foreach ($p->getRegions() as $region) {
+ if (count($region)) {
+ $new->{$region->name} = $region->value;
+ }
+}
+UNL_Templates::$options['templatedependentspath'] = 'paththatdoesnotexist!';
+
+echo $new;
+?>
\ No newline at end of file
diff --git a/sites/all/themes/unl_wdn/lib/docs/UNL_Templates/docs/examples/example1.php b/sites/all/themes/unl_wdn/lib/docs/UNL_Templates/docs/examples/example1.php
index cc5245dc..c0bf90b2 100644
--- a/sites/all/themes/unl_wdn/lib/docs/UNL_Templates/docs/examples/example1.php
+++ b/sites/all/themes/unl_wdn/lib/docs/UNL_Templates/docs/examples/example1.php
@@ -7,7 +7,7 @@
*/
ini_set('display_errors', true);
error_reporting(E_ALL);
-set_include_path(realpath(dirname(__FILE__).'/../../').PATH_SEPARATOR.realpath(dirname(__FILE__).'/../../lib/php'));
+set_include_path(realpath(dirname(__FILE__).'/../../').PATH_SEPARATOR.realpath(dirname(__FILE__).'/../../../../php'));
require_once 'UNL/Templates.php';
UNL_Templates::$options['version'] = 3;
diff --git a/sites/all/themes/unl_wdn/lib/downloads/UNL_Templates-1.2.0.tgz b/sites/all/themes/unl_wdn/lib/downloads/UNL_Templates-1.2.0.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..f8765662990f550d9727cc4fc810072caa48e352
GIT binary patch
literal 21250
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
literal 0
HcmV?d00001
diff --git a/sites/all/themes/unl_wdn/lib/php/UNL/Templates.php b/sites/all/themes/unl_wdn/lib/php/UNL/Templates.php
index 6be3b790..5bac867e 100644
--- a/sites/all/themes/unl_wdn/lib/php/UNL/Templates.php
+++ b/sites/all/themes/unl_wdn/lib/php/UNL/Templates.php
@@ -1,9 +1,9 @@
<?php
/**
* Object oriented interface to create UNL Template based HTML pages.
- *
+ *
* PHP version 5
- *
+ *
* @category Templates
* @package UNL_Templates
* @author Brett Bieber <brett.bieber@gmail.com>
@@ -19,13 +19,13 @@
require_once 'UNL/DWT.php';
/**
- * Allows you to create UNL Template based HTML pages through an object
+ * Allows you to create UNL Template based HTML pages through an object
* oriented interface.
- *
+ *
* Install on your PHP server with:
* pear channel-discover pear.unl.edu
* pear install unl/UNL_Templates
- *
+ *
* <code>
* <?php
* require_once 'UNL/Templates.php';
@@ -35,7 +35,7 @@ require_once 'UNL/DWT.php';
* $page->loadSharedcodeFiles();
* echo $page;
* </code>
- *
+ *
* @category Templates
* @package UNL_Templates
* @author Brett Bieber <brett.bieber@gmail.com>
@@ -48,14 +48,14 @@ class UNL_Templates extends UNL_DWT
{
const VERSION2 = 2;
const VERSION3 = 3;
-
+
/**
* Cache object for output caching
- *
+ *
* @var UNL_Templates_CachingService
*/
static protected $cache;
-
+
static public $options = array(
'debug' => 0,
'sharedcodepath' => 'sharedcode',
@@ -63,26 +63,28 @@ class UNL_Templates extends UNL_DWT
'cache' => array(),
'version' => self::VERSION3
);
-
+
/**
* The version of the templates we're using.
- *
+ *
* @var UNL_Templates_Version
*/
static public $template_version;
-
+
/**
* Construct a UNL_Templates object
*/
public function __construct()
{
date_default_timezone_set(date_default_timezone_get());
- self::$options['templatedependentspath'] = $_SERVER['DOCUMENT_ROOT'];
+ if (empty(self::$options['templatedependentspath'])) {
+ self::$options['templatedependentspath'] = $_SERVER['DOCUMENT_ROOT'];
+ }
}
-
+
/**
* Initialize the configuration for the UNL_DWT class
- *
+ *
* @return void
*/
public static function loadDefaultConfig()
@@ -92,7 +94,7 @@ class UNL_Templates extends UNL_DWT
self::$template_version = new $class();
UNL_DWT::$options = array_merge(UNL_DWT::$options, self::$template_version->getConfig());
}
-
+
/**
* The factory returns a template object for any UNL Template style requested:
* * Fixed
@@ -101,14 +103,14 @@ class UNL_Templates extends UNL_DWT
* * Document
* * Secure
* * Unlaffiliate
- *
+ *
* <code>
* $page = UNL_Templates::factory('Fixed');
* </code>
*
* @param string $type Type of template to get, Fixed, Liquid, Doc, Popup
* @param mixed $coptions Options for the constructor
- *
+ *
* @return UNL_Templates
*/
static function &factory($type, $coptions = false)
@@ -116,11 +118,11 @@ class UNL_Templates extends UNL_DWT
UNL_Templates::loadDefaultConfig();
return parent::factory($type, $coptions);
}
-
+
/**
* Attempts to connect to the template server and grabs the latest cache of the
* template (.tpl) file. Set options for Cache_Lite in self::$options['cache']
- *
+ *
* @return string
*/
function getCache()
@@ -147,14 +149,14 @@ class UNL_Templates extends UNL_DWT
}
return $data;
}
-
+
/**
* Loads standard customized content (sharedcode) files from the filesystem.
- *
+ *
* @return void
*/
function loadSharedcodeFiles()
- {
+ {
$includes = array(
'footercontent' => 'footer.html',
'contactinfo' => 'footerContactInfo.html',
@@ -173,12 +175,12 @@ class UNL_Templates extends UNL_DWT
/**
* Add a link within the head of the page.
- *
+ *
* @param string $href URI to the resource
* @param string $relation Relation of this link element (alternate)
* @param string $relType The type of relation (rel)
* @param array $attributes Any additional attribute=>value combinations
- *
+ *
* @return void
*/
function addHeadLink($href, $relation, $relType = 'rel', array $attributes = array())
@@ -186,10 +188,10 @@ class UNL_Templates extends UNL_DWT
$attributeString = '';
foreach ($attributes as $name=>$value) {
$attributeString .= $name.'="'.$value.'" ';
- }
-
+ }
+
$this->head .= '<link '.$relType.'="'.$relation.'" href="'.$href.'" '.$attributeString.' />'.PHP_EOL;
-
+
}
/**
@@ -197,7 +199,7 @@ class UNL_Templates extends UNL_DWT
*
* @param string $url URL to the script
* @param string $type Type of script text/javascript
- *
+ *
* @return void
*/
function addScript($url, $type = 'text/javascript')
@@ -210,7 +212,7 @@ class UNL_Templates extends UNL_DWT
*
* @param string $content The javascript you wish to add.
* @param string $type Type of script tag.
- *
+ *
* @return void
*/
function addScriptDeclaration($content, $type = 'text/javascript')
@@ -226,20 +228,20 @@ class UNL_Templates extends UNL_DWT
*
* @param string $content CSS content to add
* @param string $type type attribute for the style element
- *
+ *
* @return void
*/
function addStyleDeclaration($content, $type = 'text/css')
{
$this->head .= '<style type="'.$type.'">'.$content.'</style>'.PHP_EOL;
}
-
+
/**
* Add a link to a stylesheet.
*
* @param string $url Address of the stylesheet, absolute or relative
* @param string $media Media target (screen/print/projector etc)
- *
+ *
* @return void
*/
function addStyleSheet($url, $media = 'all')
@@ -249,7 +251,7 @@ class UNL_Templates extends UNL_DWT
/**
* Returns the page in HTML form.
- *
+ *
* @return string THe full HTML of the page.
*/
function toHtml()
@@ -258,7 +260,7 @@ class UNL_Templates extends UNL_DWT
$regions = get_object_vars($this);
return $this->replaceRegions($p, $regions);
}
-
+
/**
* returns this template as a string.
*
@@ -268,33 +270,33 @@ class UNL_Templates extends UNL_DWT
{
return $this->toHtml();
}
-
-
+
+
/**
* Populates templatedependents files
- *
- * Replaces the template dependent include statements with the corresponding
+ *
+ * Replaces the template dependent include statements with the corresponding
* files from the /ucomm/templatedependents/ directory. To specify the location
* of your templatedependents directory, use something like
* $page->options['templatedependentspath'] = '/var/www/';
* and set the path to the directory containing /ucomm/templatedependents/
*
* @param string $p Page to make replacements in
- *
+ *
* @return string
*/
function makeIncludeReplacements($p)
{
return self::$template_version->makeIncludeReplacements($p);
}
-
+
/**
* Debug handler for messages.
*
* @param string $message Message to send to debug output
* @param int $logtype Which log to send this to
* @param int $level The threshold to send this message or not.
- *
+ *
* @return void
*/
static function debug($message, $logtype = 0, $level = 1)
@@ -302,7 +304,7 @@ class UNL_Templates extends UNL_DWT
UNL_DWT::$options['debug'] = self::$options['debug'];
parent::debug($message, $logtype, $level);
}
-
+
/**
* Cleans the cache.
*
@@ -314,12 +316,12 @@ class UNL_Templates extends UNL_DWT
{
return self::getCachingService()->clean($object);
}
-
+
static public function setCachingService(UNL_Templates_CachingService $cache)
{
self::$cache = $cache;
}
-
+
static public function getCachingService()
{
if (!isset(self::$cache)) {
@@ -348,9 +350,10 @@ class UNL_Templates extends UNL_DWT
static public function getDataDir()
{
- if ('/Users/bbieber/Documents/workspace/wdn_thm_drupal/sites/all/themes/unl_wdn/lib/data' != '@DATA_DIR'.'@') {
- // pear/pyrus installation
- return '/Users/bbieber/Documents/workspace/wdn_thm_drupal/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/';
+
+ if (file_exists(dirname(__FILE__).'/../../data/UNL_Templates/data')) {
+ // relative package installation layout
+ return dirname(__FILE__).'/../../data/UNL_Templates/data';
}
if (file_exists(dirname(__FILE__).'/../data/tpl_cache')) {
@@ -358,7 +361,16 @@ class UNL_Templates extends UNL_DWT
return realpath(dirname(__FILE__).'/../data');
}
- // new pear2 package & pyrus installation layout
- return dirname(__FILE__).'/../../data/UNL_Templates/pear.unl.edu/data';
+ if (file_exists(dirname(__FILE__).'/../../data/pear.unl.edu/UNL_Templates/data')) {
+ // new pear2 package & pyrus installation layout
+ return dirname(__FILE__).'/../../data/pear.unl.edu/UNL_Templates/data';
+ }
+
+ if ('/Users/bbieber/Documents/workspace/wdn_thm_drupal/sites/all/themes/unl_wdn/lib/data' != '@DATA_DIR'.'@') {
+ // pear/pyrus installation
+ return '/Users/bbieber/Documents/workspace/wdn_thm_drupal/sites/all/themes/unl_wdn/lib/data/UNL_Templates/data/';
+ }
+
+ throw new Exception('Cannot determine data directory!');
}
}
diff --git a/sites/all/themes/unl_wdn/lib/php/UNL/Templates/Version2.php b/sites/all/themes/unl_wdn/lib/php/UNL/Templates/Version2.php
index 06e5e484..22a3a553 100644
--- a/sites/all/themes/unl_wdn/lib/php/UNL/Templates/Version2.php
+++ b/sites/all/themes/unl_wdn/lib/php/UNL/Templates/Version2.php
@@ -26,7 +26,7 @@ class UNL_Templates_Version2 implements UNL_Templates_Version
{
// Always try and retrieve the latest
if (!(UNL_Templates::getCachingService() instanceof UNL_Templates_CachingService_Null)
- && $tpl = file_get_contents('http://pear.unl.edu/UNL/Templates/server.php?template='.$template)) {
+ && $tpl = file_get_contents('http://pear.unl.edu/UNL/Templates/server.php?version=2&template='.$template)) {
return $tpl;
}
diff --git a/sites/all/themes/unl_wdn/lib/php/UNL/Templates/Version3.php b/sites/all/themes/unl_wdn/lib/php/UNL/Templates/Version3.php
index 8dd1e100..e6a71076 100644
--- a/sites/all/themes/unl_wdn/lib/php/UNL/Templates/Version3.php
+++ b/sites/all/themes/unl_wdn/lib/php/UNL/Templates/Version3.php
@@ -59,7 +59,7 @@ class UNL_Templates_Version3 implements UNL_Templates_Version
UNL_Templates::debug('Now making template include replacements.',
'makeIncludeReplacements', 3);
$includes = array();
- preg_match_all('<!--#include virtual="(/wdn/templates_3.0/[A-Za-z0-9\.\/]+)" -->',
+ preg_match_all('<!--#include virtual="(/wdn/templates_3.0/[A-Za-z0-9\.\/_]+)" -->',
$html, $includes);
UNL_Templates::debug(print_r($includes, true), 'makeIncludeReplacements', 3);
foreach ($includes[1] as $include) {
diff --git a/sites/all/themes/unl_wdn/lib/php/UNL/Templates/Version3/Fixed_html5.php b/sites/all/themes/unl_wdn/lib/php/UNL/Templates/Version3/Fixed_html5.php
new file mode 100644
index 00000000..7e359fa6
--- /dev/null
+++ b/sites/all/themes/unl_wdn/lib/php/UNL/Templates/Version3/Fixed_html5.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Template Definition for fixed_html5.dwt
+ */
+require_once 'UNL/Templates.php';
+
+class UNL_Templates_Version3_Fixed_html5 extends UNL_Templates
+{
+ ###START_AUTOCODE
+ /* the code below is auto generated do not remove the above tag */
+
+ public $__template = 'Fixed_html5.tpl'; // template name
+ public $doctitle = "<title>UNL | Department | New Page</title>"; // string()
+ public $head = "<!-- Place optional header elements here -->"; // string()
+ public $breadcrumbs = "<ul> <li><a href=\"http://www.unl.edu/\" title=\"University of Nebraska–Lincoln\">UNL</a></li> <li>Department</li> </ul>"; // string()
+ public $navlinks = "<!--#include virtual=\"../sharedcode/navigation.html\" -->"; // string()
+ public $titlegraphic = "<h1>Department</h1>"; // string()
+ public $pagetitle = ""; // string()
+ public $maincontentarea = "<p>Place your content here.<br /> Remember to validate your pages before publishing! Sample layouts are available through the <a href=\"http://wdn.unl.edu//\">Web Developer Network</a>. <br /> <a href=\"http://validator.unl.edu/check/referer\">Check this page</a> </p>"; // string()
+ public $leftcollinks = "<!--#include virtual=\"../sharedcode/relatedLinks.html\" -->"; // string()
+ public $contactinfo = "<!--#include virtual=\"../sharedcode/footerContactInfo.html\" -->"; // string()
+ public $optionalfooter = ""; // string()
+ public $footercontent = "<!--#include virtual=\"../sharedcode/footer.html\" -->"; // string()
+
+ /* Static get */
+ function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version3_Fixed_html5',$k,$v); }
+
+ /* the code above is auto generated do not remove the tag below */
+ ###END_AUTOCODE
+}
diff --git a/sites/all/themes/unl_wdn/lib/php/UNL/Templates/Version3/Mobile.php b/sites/all/themes/unl_wdn/lib/php/UNL/Templates/Version3/Mobile.php
new file mode 100644
index 00000000..ce3a0f1e
--- /dev/null
+++ b/sites/all/themes/unl_wdn/lib/php/UNL/Templates/Version3/Mobile.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Template Definition for mobile.dwt
+ *
+ * PHP version 5
+ *
+ * @category Templates
+ * @package UNL_Templates
+ * @author Kyle Powers <kylepowers@gmail.com>
+ * @license http://www1.unl.edu/wdn/wiki/Software_License BSD License
+ * @link http://pear.unl.edu/
+ */
+require_once 'UNL/Templates.php';
+
+class UNL_Templates_Version3_Mobile extends UNL_Templates
+{
+ ###START_AUTOCODE
+ /* the code below is auto generated do not remove the above tag */
+
+ public $__template = 'Mobile.tpl'; // template name
+ public $doctitle = "<title>UNL | Department | New Page</title>"; // string()
+ public $head = "<!-- Place optional header elements here -->"; // string()
+ public $breadcrumbs = "<ul> <li><a href=\"http://www.unl.edu/\" title=\"University of Nebraska–Lincoln\">UNL</a></li> <li>Department</li> </ul>"; // string()
+ public $navlinks = "<!--#include virtual=\"../sharedcode/navigation.html\" -->"; // string()
+ public $titlegraphic = "<h1>Department</h1>"; // string()
+ public $pagetitle = ""; // string()
+ public $maincontentarea = "<p>Place your content here.<br /> Remember to validate your pages before publishing! Sample layouts are available through the <a href=\"http://wdn.unl.edu//\">Web Developer Network</a>. <br /> <a href=\"http://validator.unl.edu/check/referer\">Check this page</a> </p>"; // string()
+ public $leftcollinks = "<!--#include virtual=\"../sharedcode/relatedLinks.html\" -->"; // string()
+ public $contactinfo = "<!--#include virtual=\"../sharedcode/footerContactInfo.html\" -->"; // string()
+ public $optionalfooter = ""; // string()
+ public $footercontent = "<!--#include virtual=\"../sharedcode/footer.html\" -->"; // string()
+
+ /* Static get */
+ function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version3_Mobile',$k,$v); }
+
+ /* the code above is auto generated do not remove the tag below */
+ ###END_AUTOCODE
+}
diff --git a/sites/all/themes/unl_wdn/lib/php/UNL/Templates/Version3/Secure.php b/sites/all/themes/unl_wdn/lib/php/UNL/Templates/Version3/Secure.php
index 21a45250..03d4f90b 100644
--- a/sites/all/themes/unl_wdn/lib/php/UNL/Templates/Version3/Secure.php
+++ b/sites/all/themes/unl_wdn/lib/php/UNL/Templates/Version3/Secure.php
@@ -32,7 +32,6 @@ class UNL_Templates_Version3_Secure extends UNL_Templates
public $__template = 'Secure.tpl'; // template name
public $doctitle = "<title>UNL | Department | New Page</title>"; // string()
public $head = "<!-- Place optional header elements here -->"; // string()
- public $identitymanagement = "<a href=\"https://login.unl.edu/cas/logout\">Logout</a>"; // string()
public $breadcrumbs = "<ul> <li><a href=\"http://www.unl.edu/\" title=\"University of Nebraska–Lincoln\">UNL</a></li> <li>Department</li> </ul>"; // string()
public $navlinks = "<!--#include virtual=\"../sharedcode/navigation.html\" -->"; // string()
public $titlegraphic = "<h1>Department</h1>"; // string()
diff --git a/sites/all/themes/unl_wdn/lib/php/UNL/Templates/Version3/Unlaffiliate.php b/sites/all/themes/unl_wdn/lib/php/UNL/Templates/Version3/Unlaffiliate.php
new file mode 100644
index 00000000..c36dfc35
--- /dev/null
+++ b/sites/all/themes/unl_wdn/lib/php/UNL/Templates/Version3/Unlaffiliate.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Template Definition for unlaffiliate.dwt
+ */
+require_once 'UNL/Templates.php';
+
+class UNL_Templates_Version3_Unlaffiliate extends UNL_Templates
+{
+ ###START_AUTOCODE
+ /* the code below is auto generated do not remove the above tag */
+
+ public $__template = 'Unlaffiliate.tpl'; // template name
+ public $doctitle = "<title>UNL | Department | New Page</title>"; // string()
+ public $head = "<!-- Place optional header elements here -->"; // string()
+ public $sitebranding = "<div id=\"affiliate_note\"><a href=\"http://www.unl.edu\" title=\"University of Nebraska–Lincoln\">An affiliate of the University of Nebraska–Lincoln</a></div> <a href=\"/\" title=\"Through the Eyes of the Child Initiative\"><img src=\"../sharedcode/affiliate_imgs/affiliate_logo.png\" alt=\"Through the Eyes of the Child Initiative\" id=\"logo\" /></a> <h1>Through the Eyes of the Child Initiative</h1> <div id=\'tag_line\'>A Nebraska Supreme Court Initiative</div>"; // string()
+ public $breadcrumbs = "<ul> <li><a href=\"http://www.unl.edu/\" title=\"University of Nebraska–Lincoln\">UNL</a></li> <li>Department</li> </ul>"; // string()
+ public $navlinks = "<!--#include virtual=\"../sharedcode/navigation.html\" -->"; // string()
+ public $titlegraphic = "<h1>Department</h1>"; // string()
+ public $pagetitle = ""; // string()
+ public $maincontentarea = "<p>Place your content here.<br /> Remember to validate your pages before publishing! Sample layouts are available through the <a href=\"http://wdn.unl.edu//\">Web Developer Network</a>. <br /> <a href=\"http://validator.unl.edu/check/referer\">Check this page</a> </p>"; // string()
+ public $leftcollinks = "<!--#include virtual=\"../sharedcode/relatedLinks.html\" -->"; // string()
+ public $contactinfo = "<!--#include virtual=\"../sharedcode/footerContactInfo.html\" -->"; // string()
+ public $optionalfooter = ""; // string()
+ public $footercontent = "<!--#include virtual=\"../sharedcode/footer.html\" -->"; // string()
+
+ /* Static get */
+ function staticGet($k,$v=NULL) { return UNL_DWT::staticGet('UNL_Templates_Version3_Unlaffiliate',$k,$v); }
+
+ /* the code above is auto generated do not remove the tag below */
+ ###END_AUTOCODE
+}
diff --git a/sites/all/themes/unl_wdn/template.php b/sites/all/themes/unl_wdn/template.php
index 4efa62a7..711d03ec 100644
--- a/sites/all/themes/unl_wdn/template.php
+++ b/sites/all/themes/unl_wdn/template.php
@@ -156,13 +156,21 @@ function unl_wdn_get_instance() {
UNL_Templates::$options['version'] = UNL_Templates::VERSION3;
- if (theme_get_setting('toggle_main_menu')) {
- $instance = UNL_Templates::factory('Fixed');
+ // Set a default template
+ $template = 'Fixed';
+
+ if (false === theme_get_setting('toggle_main_menu')) {
+ $template = 'Document';
}
- else {
- $instance = UNL_Templates::factory('Document');
+
+ // Tell caches to cache mobile and non-mobile pages separately.
+ drupal_add_http_header('Vary', 'X-UNL-Mobile', TRUE);
+ if (isset($_GET['format']) && $_GET['format'] == 'mobile') {
+ $template = 'Mobile';
}
+ $instance = UNL_Templates::factory($template);
+
if (theme_get_setting('wdn_beta')) {
UNL_Templates::$options['templatedependentspath'] = $_SERVER['DOCUMENT_ROOT'].'/wdntemplates-dev';
}
--
GitLab