Skip to content
This repository has been archived by the owner. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #132 from jmr06005/master 
UC People Updates
  • Loading branch information
@jmr06005
jmr06005 committed Dec 10, 2015
2 parents 64601ae + 5d88867 commit f161931
Show file tree
Hide file tree
Showing 7 changed files with 640 additions and 576 deletions.
176 changes: 95 additions & 81 deletions footer.php
View file
@@ -1,81 +1,95 @@
<?php
/**
* The template for displaying the footer.
*
* Contains the closing of the #content div and all content after
*
* @package cornerstone
*/
?>

</div><!-- .container-->
</div><!-- #content -->
<div id="footers">
<?php get_template_part('inc/mega','footer'); ?>
<footer id="footer" class="site-footer" role="contentinfo">
<div class="container">
<ul id="uc-footer-links" class="clearfix">
<?php
$options = get_option('uconn_banner_options');
$text_string = $options['text_string'];
$location = $text_string;
if($location == 'uchc'){
?>
<li>
<a href="http://www.uchc.edu/siteindex/index.html">A-Z Index</a>
</li>
<li>
<a href="http://www.uchc.edu/" >UConn Health</a>
</li>
<li>
<a href="http://www.uchc.edu/disclaimer/index.html">Disclaimer, Privacy Notice &amp; Copyright</a>
</li>
<li>
<a href="http://www.uchc.edu/directions/index.html" >Maps &amp; Directions</a>
</li>
<!-- <li>
<a href="http://www.uchc.edu/contact/index.html">Contact Us</a>
</li> -->
<li>
&copy; UConn Health
</li>
<?php
} else {
?>
<li>
&copy; <a href="http://uconn.edu">University of Connecticut</a>
</li>
<li>
<a href="http://uconn.edu/disclaimers-privacy-copyright/">Disclaimers, Privacy &amp; Copyright</a>
</li>
<?php
}
?>
<li>
<a href="<?php echo site_url(); ?>/wp-admin/">Webmaster Login</a>
</li>
<?php

// Only display the footer if a menu of "Footer" exists in the site.
if (wp_get_nav_menu_object('Footer')){
$defaults = array(
'menu' => 'Footer',
'container' => false,
'items_wrap' => '%3$s',
'depth' => 1,
'fallback_cb' => false
);
wp_nav_menu( $defaults );
}

?>
</ul>
</div>
</footer>
</div><!-- #footers -->
</div><!-- #page -->
<!--[if lte IE 9]></div><![endif]-->
<?php wp_footer(); ?>

</body>
</html>
<?php
/**
* The template for displaying the footer.
*
* Contains the closing of the #content div and all content after
*
* @package cornerstone
*/
if ( apply_filters( 'load_custom_footer', false ) ) {
$custom_footer = apply_filters( 'get_custom_footer', '' );

if ( '' != $custom_footer ) {
// Get the header that we just received
// and call the native 'get_header' function
// as usual
load_template( $custom_footer );

// By calling 'return' we are skipping
// parsing this template any further
return;
}
}
?>

</div><!-- .container-->
</div><!-- #content -->
<div id="footers">
<?php get_template_part('inc/mega','footer'); ?>
<footer id="footer" class="site-footer" role="contentinfo">
<div class="container">
<ul id="uc-footer-links" class="clearfix">
<?php
$options = get_option('uconn_banner_options');
$text_string = $options['text_string'];
$location = $text_string;
if($location == 'uchc'){
?>
<li>
<a href="http://www.uchc.edu/siteindex/index.html">A-Z Index</a>
</li>
<li>
<a href="http://www.uchc.edu/" >UConn Health</a>
</li>
<li>
<a href="http://www.uchc.edu/disclaimer/index.html">Disclaimer, Privacy Notice &amp; Copyright</a>
</li>
<li>
<a href="http://www.uchc.edu/directions/index.html" >Maps &amp; Directions</a>
</li>
<!-- <li>
<a href="http://www.uchc.edu/contact/index.html">Contact Us</a>
</li> -->
<li>
&copy; UConn Health
</li>
<?php
} else {
?>
<li>
&copy; <a href="http://uconn.edu">University of Connecticut</a>
</li>
<li>
<a href="http://uconn.edu/disclaimers-privacy-copyright/">Disclaimers, Privacy &amp; Copyright</a>
</li>
<?php
}
?>
<li>
<a href="<?php echo site_url(); ?>/wp-admin/">Webmaster Login</a>
</li>
<?php

// Only display the footer if a menu of "Footer" exists in the site.
if (wp_get_nav_menu_object('Footer')){
$defaults = array(
'menu' => 'Footer',
'container' => false,
'items_wrap' => '%3$s',
'depth' => 1,
'fallback_cb' => false
);
wp_nav_menu( $defaults );
}

?>
</ul>
</div>
</footer>
</div><!-- #footers -->
</div><!-- #page -->
<!--[if lte IE 9]></div><![endif]-->
<?php wp_footer(); ?>

</body>
</html>
174 changes: 94 additions & 80 deletions header.php
View file
@@ -1,81 +1,95 @@
<?php
/**
* The Header for our theme.
*
* Displays all of the <head> section and everything up till <div id="content">
*
*/
include 'inc/vars.php';
?>
<!DOCTYPE html>
<html <?php language_attributes(); ?>>
<head>
<meta charset="<?php bloginfo( 'charset' ); ?>">
<link rel="shortcut icon" href="<?php echo get_stylesheet_directory_uri(); ?>/favicon.ico" />
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title><?php wp_title( '|', true, 'right' ); ?></title>
<link rel="profile" href="http://gmpg.org/xfn/11">
<link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>">
<?php wp_head(); ?>
<!--[if !IE]><!--><script>
if (/*@cc_on!@*/false) {
document.documentElement.className+=' ie10';
}
</script><!--<![endif]-->
</head>
<body <?php body_class(); ?>>
<!--[if lt IE 7]> <div class="ie lte9 lte8 lte7 lte6"> <![endif]-->
<!--[if IE 7]> <div class="ie ie7 lte9 lte8 lte7"> <![endif]-->
<!--[if IE 8]> <div class="ie ie8 lte9 lte8"> <![endif]-->
<!--[if IE 9]> <div class="ie ie9 lte9"> <![endif]-->
<nav id="skiplinks">
<a href="#site-navigation">Skip to Navigation</a>
<a href="#uc-search">Skip to UConn Search</a>
<a href="#content">Skip to Content</a>
</nav>
<?php if(function_exists('uconn_banner_hook')){uconn_banner_hook();}?>
<div id="page" class="hfeed site">
<header id="masthead" class="site-header <?php if ($headerImg != ''){echo 'header-image';} ?>" role="banner">
<div id="site-title" class="hidden-xs">
<div class="container">
<?php include 'inc/header-img.php'; ?>
<div class="row">
<div class="col-sm-8">
<div class="site-branding" id="uc-site-header">
<?php include 'inc/site-title.php'; ?>
</div>
</div>
<div class="col-sm-4">
<?php get_search_form(); ?>
</div>
</div>
</div>
</div>
<div id="nav-wrapper">

<?php
// Check to see if max mega menu is active
include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
$maxMegaMenuActive = is_plugin_active('megamenu/megamenu.php');

if (!$maxMegaMenuActive){
if ($navStyle == 'drop-multi'){
include 'inc/nav-drop-multi.php';
} else if ($navStyle == 'tabs'){
include 'inc/nav-tabs.php';
} else {
// std. Bootstrap dropdowns.
include 'inc/nav.php';
}
} else {
include 'inc/nav-maxmegamenu.php';
}


?>
</div>
</header>
<!-- #masthead -->
<div id="content" class="site-content">
<?php
/**
* The Header for our theme.
*
* Displays all of the <head> section and everything up till <div id="content">
*
*/
if ( apply_filters( 'load_custom_header', false ) ) {
$custom_header = apply_filters( 'get_custom_header', '' );

if ( '' != $custom_header ) {
// Get the header that we just received
// and call the native 'get_header' function
// as usual
load_template( $custom_header );

// By calling 'return' we are skipping
// parsing this template any further
return;
}
}
include 'inc/vars.php';
?>
<!DOCTYPE html>
<html <?php language_attributes(); ?>>
<head>
<meta charset="<?php bloginfo( 'charset' ); ?>">
<link rel="shortcut icon" href="<?php echo get_stylesheet_directory_uri(); ?>/favicon.ico" />
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title><?php wp_title( '|', true, 'right' ); ?></title>
<link rel="profile" href="http://gmpg.org/xfn/11">
<link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>">
<?php wp_head(); ?>
<!--[if !IE]><!--><script>
if (/*@cc_on!@*/false) {
document.documentElement.className+=' ie10';
}
</script><!--<![endif]-->
</head>
<body <?php body_class(); ?>>
<!--[if lt IE 7]> <div class="ie lte9 lte8 lte7 lte6"> <![endif]-->
<!--[if IE 7]> <div class="ie ie7 lte9 lte8 lte7"> <![endif]-->
<!--[if IE 8]> <div class="ie ie8 lte9 lte8"> <![endif]-->
<!--[if IE 9]> <div class="ie ie9 lte9"> <![endif]-->
<nav id="skiplinks">
<a href="#site-navigation">Skip to Navigation</a>
<a href="#uc-search">Skip to UConn Search</a>
<a href="#content">Skip to Content</a>
</nav>
<?php if(function_exists('uconn_banner_hook')){uconn_banner_hook();}?>
<div id="page" class="hfeed site">
<header id="masthead" class="site-header <?php if ($headerImg != ''){echo 'header-image';} ?>" role="banner">
<div id="site-title" class="hidden-xs">
<div class="container">
<?php include 'inc/header-img.php'; ?>
<div class="row">
<div class="col-sm-8">
<div class="site-branding" id="uc-site-header">
<?php include 'inc/site-title.php'; ?>
</div>
</div>
<div class="col-sm-4">
<?php get_search_form(); ?>
</div>
</div>
</div>
</div>
<div id="nav-wrapper">

<?php
// Check to see if max mega menu is active
include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
$maxMegaMenuActive = is_plugin_active('megamenu/megamenu.php');

if (!$maxMegaMenuActive){
if ($navStyle == 'drop-multi'){
include 'inc/nav-drop-multi.php';
} else if ($navStyle == 'tabs'){
include 'inc/nav-tabs.php';
} else {
// std. Bootstrap dropdowns.
include 'inc/nav.php';
}
} else {
include 'inc/nav-maxmegamenu.php';
}


?>
</div>
</header>
<!-- #masthead -->
<div id="content" class="site-content">
<div class="container">

0 comments on commit f161931

Please sign in to comment.