From 98448acad5dd5afdd3172d3839a3b1f6451a594e Mon Sep 17 00:00:00 2001 From: Kevin Abel <kabel2@unl.edu> Date: Tue, 12 Jan 2016 12:31:09 -0600 Subject: [PATCH] Redo embed templates to be lighter. Remove most WDN markup and just use custom JS build. --- www/templates/embed-debug.tpl.php | 40 +++++++------------------------ www/templates/embed.tpl.php | 40 +++++++------------------------ 2 files changed, 16 insertions(+), 64 deletions(-) diff --git a/www/templates/embed-debug.tpl.php b/www/templates/embed-debug.tpl.php index 38a9a07..9cb6087 100644 --- a/www/templates/embed-debug.tpl.php +++ b/www/templates/embed-debug.tpl.php @@ -1,41 +1,17 @@ <!DOCTYPE html> -<!--[if IEMobile 7 ]><html class="ie iem7 embed"><![endif]--> -<!--[if lt IE 7 ]><html class="ie ie6 embed" lang="en"><![endif]--> -<!--[if IE 7 ]><html class="ie ie7 embed" lang="en"><![endif]--> -<!--[if IE 8 ]><html class="ie ie8 embed" lang="en"><![endif]--> -<!--[if (gte IE 9)|(gt IEMobile 7) ]><html class="ie embed" lang="en"><![endif]--> -<!--[if !(IEMobile) | !(IE)]><!--><html class="embed" lang="en"><!--<![endif]--> +<html class="no-js embed" lang="en"> <head> <meta charset="utf-8" /> + <meta http-equiv="x-ua-compatible" content="ie=edge" /> <title>UNL Search | University of Nebraska–Lincoln</title> -<!-- Load Cloud.typography fonts --> - <link rel="stylesheet" type="text/css" href="//cloud.typography.com/7717652/616662/css/fonts.css" /> -<!-- Load our base CSS file --> -<!--[if gte IE 9]><!--> - <link rel="stylesheet" type="text/css" media="all" href="/wdn/templates_4.0/css/all.css" /> -<!--<![endif]--> - -<!-- Load the template JS file --> - <script type="text/javascript" src="/wdn/templates_4.0/scripts/compressed/all.js" id="wdn_dependents"></script> - -<!--[if lt IE 9]> - <link rel="stylesheet" type="text/css" media="all" href="/wdn/templates_4.0/css/all_oldie.css" /> - <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script> -<![endif]--> - -<!-- For all IE versions, bring in the tweaks --> -<!--[if IE]> - <link rel="stylesheet" type="text/css" media="all" href="/wdn/templates_4.0/css/ie.css" /> -<![endif]--> + <link rel="stylesheet" href="https://cloud.typography.com/7717652/616662/css/fonts.css" /> + <link rel="stylesheet" href="/wdn/templates_4.1/css/all.css" /> + <script data-main="js/embed-src/main.js" src="js/embed-src/require.js"></script> <?php echo $head ?> </head> <body> - <div id="wdn_wrapper"> - <div id="wdn_content_wrapper"> - <div id="maincontent" class="wdn-main"> - <?php echo $maincontent ?> - </div> - </div> - </div> + <main> + <?php echo $maincontent ?> + </main> </body> </html> diff --git a/www/templates/embed.tpl.php b/www/templates/embed.tpl.php index 03da953..ddf2f77 100644 --- a/www/templates/embed.tpl.php +++ b/www/templates/embed.tpl.php @@ -1,41 +1,17 @@ <!DOCTYPE html> -<!--[if IEMobile 7 ]><html class="ie iem7 embed"><![endif]--> -<!--[if lt IE 7 ]><html class="ie ie6 embed" lang="en"><![endif]--> -<!--[if IE 7 ]><html class="ie ie7 embed" lang="en"><![endif]--> -<!--[if IE 8 ]><html class="ie ie8 embed" lang="en"><![endif]--> -<!--[if (gte IE 9)|(gt IEMobile 7) ]><html class="ie embed" lang="en"><![endif]--> -<!--[if !(IEMobile) | !(IE)]><!--><html class="embed" lang="en"><!--<![endif]--> +<html class="no-js embed" lang="en"> <head> <meta charset="utf-8" /> + <meta http-equiv="x-ua-compatible" content="ie=edge" /> <title>UNL Search | University of Nebraska–Lincoln</title> -<!-- Load Cloud.typography fonts --> - <link rel="stylesheet" type="text/css" href="//cloud.typography.com/7717652/616662/css/fonts.css" /> -<!-- Load our base CSS file --> -<!--[if gte IE 9]><!--> - <link rel="stylesheet" type="text/css" media="all" href="//unlcms.unl.edu/wdn/templates_4.0/css/all.css" /> -<!--<![endif]--> - -<!-- Load the template JS file --> - <script type="text/javascript" src="//unlcms.unl.edu/wdn/templates_4.0/scripts/compressed/all.js?dep=$DEP_VERSION$" id="wdn_dependents"></script> - -<!--[if lt IE 9]> - <link rel="stylesheet" type="text/css" media="all" href="//unlcms.unl.edu/wdn/templates_4.0/css/all_oldie.css" /> - <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script> -<![endif]--> - -<!-- For all IE versions, bring in the tweaks --> -<!--[if IE]> - <link rel="stylesheet" type="text/css" media="all" href="//unlcms.unl.edu/wdn/templates_4.0/css/ie.css" /> -<![endif]--> + <link rel="stylesheet" href="https://cloud.typography.com/7717652/616662/css/fonts.css" /> + <link rel="stylesheet" href="https://unlcms.unl.edu/wdn/templates_4.1/css/all.css" /> + <script src="js/embed/all.js"></script> <?php echo $head ?> </head> <body> - <div id="wdn_wrapper"> - <div id="wdn_content_wrapper"> - <div id="maincontent" class="wdn-main"> - <?php echo $maincontent ?> - </div> - </div> - </div> + <main> + <?php echo $maincontent ?> + </main> </body> </html> -- GitLab