Skip to content

Commit

Permalink
Merge branch 'develop' into footer
Browse files Browse the repository at this point in the history
  • Loading branch information
skoolbus39 committed Nov 27, 2017
2 parents fa852d4 + e9ac264 commit c6677e2
Show file tree
Hide file tree
Showing 97 changed files with 4,632 additions and 2,120 deletions.
1 change: 1 addition & 0 deletions .gitattributes
@@ -1,2 +1,3 @@
Templates/*.dwt* filter=rcs-keywords
wdn/templates_*/includes/scriptsandstyles*.html filter=rcs-keywords
wdn/templates_*/includes/speedy_body_scripts.html filter=rcs-keywords
6 changes: 3 additions & 3 deletions .travis.yml
Expand Up @@ -6,12 +6,12 @@ cache:
- build/vendor
- node_modules
php:
- 5.6
- 7
install:
- nvm install node
- npm install
# install `pa11y`
- npm install phantomjs-prebuilt pa11y http-server grunt-cli
- npm install phantomjs-prebuilt http-server grunt-cli
# build the templates
- ./node_modules/.bin/grunt
# import test dependencies
Expand All @@ -21,7 +21,7 @@ install:
script:
# start a localhost server on 8080 for the root
- nohup node_modules/.bin/http-server -d false -r >/dev/null &
- phpunit tests
- ./build/vendor/bin/phpunit tests
branches:
only:
- develop
39 changes: 39 additions & 0 deletions CHANGELOG.md
@@ -1,6 +1,45 @@
# Changelog
All notable changes to this project will be documented in this file.

## 4.1.27 (November 7, 2017)
- Updated framework absolute links to use https([#1083](https://github.com/unl/wdntemplates/pull/1083))

## 4.1.26 (October 3, 2017)
- No commits made, version bumped

## 4.1.25 (September 5, 2017)
- Fixed contrast issues in table elements
- Fixed the visual height of the button within .wdn-input-group-btn
- Fixed some specificity rules in tables

## 4.1.24 (August 1, 2017)
- Changed Tungsten to load in the head on Speedy template, this will make the FOUT much less violent in the header

## 4.1.23 (July 4, 2017)
- No commits made, version bumped

## 4.1.22 (June 6, 2017)
- [Fixed the location](https://github.com/unl/wdntemplates/commit/1282778babe24510805af4e4ae36a15832bcdbbe) of the search button
- Fixed a Flash of No CSS on hard refresh([#1073](https://github.com/unl/wdntemplates/pull/1073))
- Restored button cursor lost in normalize update ([#1075](https://github.com/unl/wdntemplates/pull/1075))

## 4.1.21 (May 9, 2017)
- Removed Font Face Observer to ensure fonts were loaded

## 4.1.20 (May 9, 2017)
- Added a new speedy template to improve page speed
- Improved CSS distribution, only putting critical CSS in the head and loading other CSS later
- Fixed a change in Chrome that caused a random [border to appear](https://github.com/unl/wdntemplates/pull/1065).

## 4.1.19 (March 13, 2017)
- Updated events widget to force use of https, even if option not selected ([#1055](https://github.com/unl/wdntemplates/commit/9dae8df39db9839268e3a6537ebb1afd789e2b76))
- Disabled the direction navigation on carousels by default ([#1052](https://github.com/unl/wdntemplates/commit/2bde94c5cd76ed656645941813a8dea8ae9f0a31))

## 4.1.18 (February 13, 2017)
- Changed Nebraska N logo to improve pixel-fitting
- Updates to font size calculation in footer
- Add margin to last element (if not a .wdn-band) to add vertical space between main content and footer

## 4.1.17 (January 24, 2017)
- Happy new copyright year ([d274265](https://github.com/unl/wdntemplates/commit/d2742655fe9d0a902a52ff1dde0d28ce5f5d1aef))
- Fix subpixel border appearing below navigation bar ([#1043](ttps://github.com/unl/wdntemplates/pull/1043))
Expand Down
27 changes: 24 additions & 3 deletions Gruntfile.js
Expand Up @@ -3,7 +3,8 @@ module.exports = function (grunt) {
var cssObjs = [
'all',
'modules/pagination',
'modules/infographics'
'modules/infographics',
'critical'
];

var jsCssObjs = [
Expand All @@ -25,12 +26,13 @@ module.exports = function (grunt) {

// project layout variables (directories)
var mainDir = 'wdn',
buildDir = 'build',
templateDir = mainDir + '/templates_4.1',
templateLess = templateDir + '/less',
templateCss = templateDir + '/css',
templateJs = templateDir + '/scripts',
builtJsDir = 'compressed',
buildJsDir = 'build/' + builtJsDir,
buildJsDir = buildDir + '/' + builtJsDir,
templateCompileJs = templateJs + '/' + builtJsDir,
templateIncludeDir = templateDir + '/includes',
templateHtmlDir = 'Templates',
Expand All @@ -43,7 +45,8 @@ module.exports = function (grunt) {
// files for keyword replacement (should match .gitattributes)
var filterFiles = [
templateHtmlDir + '/*.dwt*',
templateIncludeDir + '/scriptsandstyles*.html'
templateIncludeDir + '/scriptsandstyles*.html',
templateIncludeDir + '/speedy_body_scripts.html'
];

// polyfill modules that need sync loading (should match scripts loaded in debug.js)
Expand Down Expand Up @@ -87,6 +90,8 @@ module.exports = function (grunt) {
'!js-css/**',
'!analytics.*',
'!debug.*',
'!fontfaceobserver.*',
'!fontsloaded.*',
'!form_validation.*',
'!ga.*',
'!jquery.*',
Expand Down Expand Up @@ -255,6 +260,18 @@ module.exports = function (grunt) {
dist: [zipDir + '/*.zip', zipDir + '/*.gz']
},

includes: {
build: {
cwd: buildDir,
src: '*.html',
dest: templateIncludeDir,
options: {
flatten: true,
includePath: [templateCss, templateCompileJs]
}
}
},

"filter-clean": {
options: {
files: filterFiles
Expand Down Expand Up @@ -312,6 +329,10 @@ module.exports = function (grunt) {
js: {
files: [templateJs + '/**/*.js', '!' + templateCompileJs + '/**/*.js'],
tasks: ['js']
},
includes: {
files: [buildDir + '/**/*.html', templateLess + '/**/*.less', templateJs + '/js-css/*.less'],
tasks: ['includes']
}
}
});
Expand Down
108 changes: 108 additions & 0 deletions Templates/jsp.speedy.dwt.jsp
@@ -0,0 +1,108 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<!DOCTYPE html>
<html class="no-js" lang="en">
<head>
<c:import url="https://unlcms.unl.edu/wdn/templates_4.1/includes/metanfavico.html"/>
<!--
Membership and regular participation in the UNL Web Developer Network is required to use the UNLedu Web Framework. Visit the WDN site at http://wdn.unl.edu/. Register for our mailing list and add your site or server to UNLwebaudit.
All framework 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 UNLedu Web Framework.
$Id$
-->
<c:import url="https://unlcms.unl.edu/wdn/templates_4.1/includes/scriptsandstyles_speedy.html"/>
<!-- TemplateBeginEditable name="doctitle" -->
<title>Use a descriptive page title | Optional Site Title (use for context) | University of Nebraska&ndash;Lincoln</title>
<!-- TemplateEndEditable -->
<!-- TemplateBeginEditable name="head" -->
<!-- TemplateEndEditable -->
<!-- TemplateParam name="class" type="text" value="" -->
</head>
<body class="@@(_document['class'])@@" data-version="$HTML_VERSION$">
<c:import url="https://unlcms.unl.edu/wdn/templates_4.1/includes/skipnav.html"/>
<div id="wdn_wrapper">
<input type="checkbox" id="wdn_menu_toggle" value="Show navigation menu" class="wdn-content-slide wdn-input-driver" />
<c:import url="https://unlcms.unl.edu/wdn/templates_4.1/includes/noscript-padding.html"/>
<header id="header" role="banner" class="wdn-content-slide wdn-band">
<div id="wdn_header_top">
<span id="wdn_institution_title"><a href="http://www.unl.edu/">University of Nebraska&ndash;Lincoln</a></span>
<div id="wdn_resources">
<c:import url="https://unlcms.unl.edu/wdn/templates_4.1/includes/wdnResources.html"/>
<c:import url="https://unlcms.unl.edu/wdn/templates_4.1/includes/idm.html"/>
<c:import url="https://unlcms.unl.edu/wdn/templates_4.1/includes/search.html"/>
</div>
</div>
<div id="wdn_logo_lockup">
<div class="wdn-inner-wrapper">
<c:import url="https://unlcms.unl.edu/wdn/templates_4.1/includes/logo.html"/>
<span id="wdn_site_affiliation"><!-- TemplateBeginEditable name="affiliation" -->My site affiliation<!-- TemplateEndEditable --></span>
<span id="wdn_site_title"><!-- TemplateBeginEditable name="titlegraphic" -->Title of my site<!-- TemplateEndEditable --></span>
</div>
</div>
</header>
<div id="wdn_navigation_bar" class="wdn-band">
<nav id="breadcrumbs" class="wdn-inner-wrapper" role="navigation" aria-label="breadcrumbs">
<!-- TemplateBeginEditable name="breadcrumbs" -->
<ul>
<li><a href="http://www.unl.edu/">Nebraska</a></li>
<li><a href="#">Site Title</a></li>
<li>Home</li>
</ul>
<!-- TemplateEndEditable -->
</nav>
<div id="wdn_navigation_wrapper">
<nav id="navigation" role="navigation" aria-label="main navigation">
<!-- TemplateBeginEditable name="navlinks" -->
<%@ include file="../sharedcode/navigation.html" %>
<!-- TemplateEndEditable -->
<c:import url="https://unlcms.unl.edu/wdn/templates_4.1/includes/navigation-addons.html"/>
</nav>
</div>
</div>
<div class="wdn-menu-trigger wdn-content-slide">
<label for="wdn_menu_toggle" class="wdn-icon-menu">Menu</label>
<c:import url="https://unlcms.unl.edu/wdn/templates_4.1/includes/share.html"/>
</div>
<main id="wdn_content_wrapper" role="main" class="wdn-content-slide" tabindex="-1">
<div id="maincontent" class="wdn-main">
<div id="pagetitle">
<!-- TemplateBeginEditable name="pagetitle" -->
<h1>Please Title Your Page Here</h1>
<!-- TemplateEndEditable -->
</div>
<!-- TemplateBeginEditable name="maincontentarea" -->
<div class="wdn-band">
<div class="wdn-inner-wrapper">
<p>Impress your audience with awesome content!</p>
</div>
</div>
<!-- TemplateEndEditable -->
</div>
</main>
<footer id="footer" role="contentinfo" class="wdn-content-slide">
<div id="wdn_optional_footer" class="wdn-band wdn-footer-optional">
<div class="wdn-inner-wrapper">
<!-- TemplateBeginEditable name="optionalfooter" -->
<!-- TemplateEndEditable -->
</div>
</div>
<div id="wdn_local_footer" class="wdn-band wdn-footer-local">
<div class="wdn-inner-wrapper">
<!-- TemplateBeginEditable name="contactinfo" -->
<%@ include file="../sharedcode/localFooter.html" %>
<!-- TemplateEndEditable -->
<!-- TemplateBeginEditable name="leftcollinks" -->
<!-- TemplateEndEditable -->
</div>
</div>
<div id="wdn_global_footer" class="wdn-band wdn-footer-global">
<div class="wdn-inner-wrapper">
<c:import url="https://unlcms.unl.edu/wdn/templates_4.1/includes/globalfooter.html"/>
</div>
</div>
</footer>
<c:import url="https://unlcms.unl.edu/wdn/templates_4.1/includes/noscript.html"/>
</div>
<c:import url="https://unlcms.unl.edu/wdn/templates_4.1/includes/speedy_body_scripts.html"/>
</body>
</html>
115 changes: 115 additions & 0 deletions Templates/php.speedy.dwt.php
@@ -0,0 +1,115 @@
<?php
function wdnInclude($path)
{
$documentRoot = 'https://unlcms.unl.edu';

return readfile($documentRoot . $path);
}
?>
<!DOCTYPE html>
<html class="no-js" lang="en">
<head>
<?php wdnInclude("/wdn/templates_4.1/includes/metanfavico.html"); ?>
<!--
Membership and regular participation in the UNL Web Developer Network is required to use the UNLedu Web Framework. Visit the WDN site at http://wdn.unl.edu/. Register for our mailing list and add your site or server to UNLwebaudit.
All framework 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 UNLedu Web Framework.
$Id$
-->
<?php wdnInclude("/wdn/templates_4.1/includes/scriptsandstyles_speedy.html"); ?>
<!-- TemplateBeginEditable name="doctitle" -->
<title>Use a descriptive page title | Optional Site Title (use for context) | University of Nebraska&ndash;Lincoln</title>
<!-- TemplateEndEditable -->
<!-- TemplateBeginEditable name="head" -->
<!-- TemplateEndEditable -->
<!-- TemplateParam name="class" type="text" value="" -->
</head>
<body class="@@(_document['class'])@@" data-version="$HTML_VERSION$">
<?php wdnInclude("/wdn/templates_4.1/includes/skipnav.html"); ?>
<div id="wdn_wrapper">
<input type="checkbox" id="wdn_menu_toggle" value="Show navigation menu" class="wdn-content-slide wdn-input-driver" />
<?php wdnInclude("/wdn/templates_4.1/includes/noscript-padding.html"); ?>
<header id="header" role="banner" class="wdn-content-slide wdn-band">
<div id="wdn_header_top">
<span id="wdn_institution_title"><a href="http://www.unl.edu/">University of Nebraska&ndash;Lincoln</a></span>
<div id="wdn_resources">
<?php wdnInclude("/wdn/templates_4.1/includes/wdnResources.html"); ?>
<?php wdnInclude("/wdn/templates_4.1/includes/idm.html"); ?>
<?php wdnInclude("/wdn/templates_4.1/includes/search.html"); ?>
</div>
</div>
<div id="wdn_logo_lockup">
<div class="wdn-inner-wrapper">
<?php wdnInclude("/wdn/templates_4.1/includes/logo.html"); ?>
<span id="wdn_site_affiliation"><!-- TemplateBeginEditable name="affiliation" -->My site affiliation<!-- TemplateEndEditable --></span>
<span id="wdn_site_title"><!-- TemplateBeginEditable name="titlegraphic" -->Title of my site<!-- TemplateEndEditable --></span>
</div>
</div>
</header>
<div id="wdn_navigation_bar" class="wdn-band">
<nav id="breadcrumbs" class="wdn-inner-wrapper" role="navigation" aria-label="breadcrumbs">
<!-- TemplateBeginEditable name="breadcrumbs" -->
<ul>
<li><a href="http://www.unl.edu/">Nebraska</a></li>
<li><a href="#">Site Title</a></li>
<li>Home</li>
</ul>
<!-- TemplateEndEditable -->
</nav>
<div id="wdn_navigation_wrapper">
<nav id="navigation" role="navigation" aria-label="main navigation">
<!-- TemplateBeginEditable name="navlinks" -->
<?php include "../sharedcode/navigation.html"; ?>
<!-- TemplateEndEditable -->
<?php wdnInclude("/wdn/templates_4.1/includes/navigation-addons.html"); ?>
</nav>
</div>
</div>
<div class="wdn-menu-trigger wdn-content-slide">
<label for="wdn_menu_toggle" class="wdn-icon-menu">Menu</label>
<?php wdnInclude("/wdn/templates_4.1/includes/share.html"); ?>
</div>
<main id="wdn_content_wrapper" role="main" class="wdn-content-slide" tabindex="-1">
<div id="maincontent" class="wdn-main">
<div id="pagetitle">
<!-- TemplateBeginEditable name="pagetitle" -->
<h1>Please Title Your Page Here</h1>
<!-- TemplateEndEditable -->
</div>
<!-- TemplateBeginEditable name="maincontentarea" -->
<div class="wdn-band">
<div class="wdn-inner-wrapper">
<p>Impress your audience with awesome content!</p>
</div>
</div>
<!-- TemplateEndEditable -->
</div>
</main>
<footer id="footer" role="contentinfo" class="wdn-content-slide">
<div id="wdn_optional_footer" class="wdn-band wdn-footer-optional">
<div class="wdn-inner-wrapper">
<!-- TemplateBeginEditable name="optionalfooter" -->
<!-- TemplateEndEditable -->
</div>
</div>
<div id="wdn_local_footer" class="wdn-band wdn-footer-local">
<div class="wdn-inner-wrapper">
<!-- TemplateBeginEditable name="contactinfo" -->
<?php include "../sharedcode/localFooter.html"; ?>
<!-- TemplateEndEditable -->
<!-- TemplateBeginEditable name="leftcollinks" -->
<!-- TemplateEndEditable -->
</div>
</div>
<div id="wdn_global_footer" class="wdn-band wdn-footer-global">
<div class="wdn-inner-wrapper">
<?php wdnInclude("/wdn/templates_4.1/includes/globalfooter.html"); ?>
</div>
</div>
</footer>
<?php wdnInclude("/wdn/templates_4.1/includes/noscript.html"); ?>
</div>
<?php wdnInclude("/wdn/templates_4.1/includes/speedy_body_scripts.html"); ?>
</body>
</html>

0 comments on commit c6677e2

Please sign in to comment.