Skip to content
Snippets Groups Projects
Commit cfc10153 authored by Tim Steiner's avatar Tim Steiner
Browse files

[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
parent f8d8b9cf
Branches
Tags
No related merge requests found
Showing
with 601 additions and 87 deletions
...@@ -32,7 +32,13 @@ sites/all/modules/form_builder/modules/webform/form_builder_webform.module ...@@ -32,7 +32,13 @@ 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 * 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 * 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 sites/sites.php
* Added support for $default_domains array. See includes/bootstrap.inc conf_path(). * Added support for $default_domains array. See includes/bootstrap.inc conf_path().
......
...@@ -1360,7 +1360,9 @@ function drupal_serve_page_from_cache(stdClass $cache) { ...@@ -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 // revalidation. If a Vary header has been set in hook_boot(), it is assumed
// that the module knows how to cache the page. // that the module knows how to cache the page.
if (!isset($hook_boot_headers['vary']) && !variable_get('omit_vary_cookie')) { 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) { if ($page_compression) {
......
<?php <?php
/** /**
* Enable the set up of multiple sites without making symbolics links. * Do so special setup for UNL specific features.
* Instead, a few entries in .htaccess will be all that is needed.
*/ */
function unl_bootstrap() { 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']; $original_script_name = $_SERVER['SCRIPT_NAME'];
$php_file = basename($original_script_name); $php_file = basename($original_script_name);
...@@ -39,14 +48,70 @@ function unl_bootstrap() { ...@@ -39,14 +48,70 @@ function unl_bootstrap() {
$previous_script_name = $_SERVER['SCRIPT_NAME']; $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'])) { 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['base_url'] = 'http://' . $_SERVER['HTTP_X_FORWARDED_HOST'] . $_SERVER['HTTP_X_FORWARDED_PATH'];
$GLOBALS['cookie_domain'] = $_SERVER['HTTP_X_FORWARDED_HOST']; $GLOBALS['cookie_domain'] = $_SERVER['HTTP_X_FORWARDED_HOST'];
$_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_FORWARDED_PATH'] . '/' . request_path(); $_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_FORWARDED_PATH'] . '/' . request_path();
} }
}
conf_path(TRUE, TRUE); /**
* 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';
}
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;
} }
/** /**
......
No preview for this file type
<?xml version="1.0" encoding="UTF-8"?> <?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> <name>UNL_Templates</name>
<channel>pear.unl.edu</channel> <channel>pear.unl.edu</channel>
<summary>The UNL HTML Templates as a PEAR Package.</summary> <summary>The UNL HTML Templates as a PEAR Package.</summary>
...@@ -16,10 +16,10 @@ ...@@ -16,10 +16,10 @@
<email>nhummel2@math.unl.edu</email> <email>nhummel2@math.unl.edu</email>
<active>yes</active> <active>yes</active>
</lead> </lead>
<date>2010-09-08</date> <date>2011-08-31</date>
<time>10:31:36</time> <time>11:02:54</time>
<version> <version>
<release>1.0.0</release> <release>1.2.0</release>
<api>1.0.0</api> <api>1.0.0</api>
</version> </version>
<stability> <stability>
...@@ -28,47 +28,26 @@ ...@@ -28,47 +28,26 @@
</stability> </stability>
<license uri="http://www1.unl.edu/wdn/wiki/Software_License">BSD License</license> <license uri="http://www1.unl.edu/wdn/wiki/Software_License">BSD License</license>
<notes> <notes>
Feature Release! Update .tpl cache so template files are in sync with latest wdntemplates.
Added support for specifying the template version, 2 or 3. Allow underscores within Version3 template include files.
* 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. New templates!
* If local files are not present for the &lt;!--#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.
New methods: * Fixed_html5
* addHeadLink($href, $relation, $relType = 'rel', array $attributes = array()) * Unlaffiliate
* 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: Template updates:
* optionalfooter=&gt;optionalFooter.html
* collegenavigationlist=&gt;unitNavigation.html
* contactinfo=&gt;footerContactInfo.html
New Remote Template Scanner UNL_Templates_Scanner * Meta lang fixes
* Scans a rendered UNL Template page for the editable content areas. * Remove IDM region from the secure template
* Mobile template now supports navigation and move to HTML5
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.
Add example of a custom class with auto-breadcrumb generation and body content loading.
</notes> </notes>
<contents> <contents>
<dir name="/"> <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"> <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="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_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 ...@@ -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="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/> <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file> </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="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/> <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file> </file>
...@@ -85,10 +64,18 @@ Add example of a custom class with auto-breadcrumb generation and body content l ...@@ -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="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/> <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file> </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"> <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="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/> <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file> </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"> <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="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_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 ...@@ -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="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/> <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file> </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="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/> <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file> </file>
...@@ -141,7 +128,7 @@ Add example of a custom class with auto-breadcrumb generation and body content l ...@@ -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="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/> <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file> </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="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/> <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file> </file>
...@@ -169,7 +156,7 @@ Add example of a custom class with auto-breadcrumb generation and body content l ...@@ -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="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/> <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file> </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="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/> <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file> </file>
...@@ -181,7 +168,7 @@ Add example of a custom class with auto-breadcrumb generation and body content l ...@@ -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="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/> <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file> </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="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/> <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file> </file>
...@@ -197,39 +184,55 @@ Add example of a custom class with auto-breadcrumb generation and body content l ...@@ -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="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/> <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file> </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="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/> <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file> </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="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/> <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file> </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="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/> <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file> </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="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/> <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file> </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="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/> <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file> </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="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/> <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file> </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="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/> <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file> </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="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/> <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file> </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="@DATA_DIR@" to="data_dir" type="pear-config"/>
<tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/> <tasks:replace from="@PHP_DIR@" to="php_dir" type="pear-config"/>
</file> </file>
...@@ -805,6 +808,51 @@ Other fixes: ...@@ -805,6 +808,51 @@ Other fixes:
Add example of a custom class with auto-breadcrumb generation and body content loading. Add example of a custom class with auto-breadcrumb generation and body content loading.
</notes> </notes>
</release> </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> </changelog>
</phprelease> </phprelease>
</package> </package>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!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> <head>
<!-- <!--
Membership and regular participation in the UNL Web Developer Network Membership and regular participation in the UNL Web Developer Network
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
create a derivative work. create a derivative work.
This message may not be removed from any pages based on the UNL site template. 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="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" /> <link rel="stylesheet" type="text/css" media="print" href="http://www.unl.edu/wdn/templates_3.0/css/print.css" />
......
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!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> <head>
<!-- <!--
Membership and regular participation in the UNL Web Developer Network Membership and regular participation in the UNL Web Developer Network
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
create a derivative work. create a derivative work.
This message may not be removed from any pages based on the UNL site template. 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="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" /> <link rel="stylesheet" type="text/css" media="print" href="/wdn/templates_3.0/css/print.css" />
......
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!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> <head>
<!-- <!--
Membership and regular participation in the UNL Web Developer Network Membership and regular participation in the UNL Web Developer Network
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
create a derivative work. create a derivative work.
This message may not be removed from any pages based on the UNL site template. 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="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="print" href="/wdn/templates_3.0/css/print.css" />
......
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!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> <head>
<!-- <!--
Membership and regular participation in the UNL Web Developer Network Membership and regular participation in the UNL Web Developer Network
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
create a derivative work. create a derivative work.
This message may not be removed from any pages based on the UNL site template. 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="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="print" href="/wdn/templates_3.0/css/print.css" />
......
<!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&ndash;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&ndash;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>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!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> <head>
<!-- <!--
Membership and regular participation in the UNL Web Developer Network Membership and regular participation in the UNL Web Developer Network
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
create a derivative work. create a derivative work.
This message may not be removed from any pages based on the UNL site template. 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="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="print" href="/wdn/templates_3.0/css/print.css" />
......
<!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&ndash;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&ndash;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>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!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> <head>
<!-- <!--
Membership and regular participation in the UNL Web Developer Network Membership and regular participation in the UNL Web Developer Network
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
create a derivative work. create a derivative work.
This message may not be removed from any pages based on the UNL site template. 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="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="print" href="/wdn/templates_3.0/css/print.css" />
...@@ -65,12 +65,8 @@ ...@@ -65,12 +65,8 @@
<!--#include virtual="../sharedcode/footer.html" --> <!--#include virtual="../sharedcode/footer.html" -->
<!-- InstanceEndEditable --> <!-- 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" --> <!--#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> </div>
<div id="wdn_wrapper_footer"> </div> <div id="wdn_wrapper_footer"> </div>
......
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!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> <head>
<!-- <!--
Membership and regular participation in the UNL Web Developer Network Membership and regular participation in the UNL Web Developer Network
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
create a derivative work. create a derivative work.
This message may not be removed from any pages based on the UNL site template. 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="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" /> <link rel="stylesheet" type="text/css" media="print" href="/wdn/templates_3.0/css/print.css" />
...@@ -32,11 +32,6 @@ ...@@ -32,11 +32,6 @@
<div id="wdn_wrapper"> <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> <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&ndash;Lincoln</h1> <h1>University of Nebraska&ndash;Lincoln</h1>
<div id="wdn_identity_management">
<!-- InstanceBeginEditable name="identitymanagement" -->
<a href="https://login.unl.edu/cas/logout">Logout</a>
<!-- InstanceEndEditable -->
</div>
</div> </div>
<div id="wdn_navigation_bar"> <div id="wdn_navigation_bar">
<div id="breadcrumbs"> <div id="breadcrumbs">
......
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!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> <head>
<!-- <!--
Membership and regular participation in the UNL Web Developer Network Membership and regular participation in the UNL Web Developer Network
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
create a derivative work. create a derivative work.
This message may not be removed from any pages based on the UNL site template. 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="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="print" href="/wdn/templates_3.0/css/print.css" />
......
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!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> <head>
<!-- <!--
Membership and regular participation in the UNL Web Developer Network Membership and regular participation in the UNL Web Developer Network
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
create a derivative work. create a derivative work.
This message may not be removed from any pages based on the UNL site template. 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="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="print" href="/wdn/templates_3.0/css/print.css" />
......
<!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&ndash;Lincoln">An affiliate of the University of Nebraska&ndash;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&ndash;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>
#!/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
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
*/ */
ini_set('display_errors', true); ini_set('display_errors', true);
error_reporting(E_ALL); 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'; require_once 'UNL/Templates.php';
UNL_Templates::$options['version'] = 3; UNL_Templates::$options['version'] = 3;
......
File added
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment