Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Attempting to fix merge error
# Conflicts:
#	header.php
  • Loading branch information
bcd04001 committed Jul 14, 2016
2 parents 2450e21 + a8db15b commit 9f608be
Show file tree
Hide file tree
Showing 2 changed files with 101 additions and 94 deletions.
182 changes: 91 additions & 91 deletions header.php
@@ -1,91 +1,91 @@
<?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">
<?php
$ogtitle = get_post_meta( $post->ID, 'ogtitle', true);
if(strlen($ogtitle) > 0) echo '<meta property="og:title" content="'.$ogtitle.'" />';
?>
<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 lt IE 9]>
<script src="<?php echo get_stylesheet_directory_uri(); ?>/javascripts/html5shiv-master/src/html5shiv.js"></script>
<script src="<?php echo get_stylesheet_directory_uri(); ?>/javascripts/html5shiv-master/src/html5shiv-printshiv.js"></script>
<![endif]-->
<!--[if !IE]><!--><script>
if (/*@cc_on!@*/false) {
// document.documentElement.className+=' ie10';
}
</script><!--<![endif]-->
<script src="http://use.typekit.net/uzm8fts.js"></script>
<script>try{Typekit.load();}catch(e){}</script>

</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();}?>
<?php
$titlespan = '';
$navspan = '';
$titlesplit = get_theme_mod('titlesplit');
if ($titlesplit == '2_10') {
$titlespan = '2';
$navspan = '10';
} elseif ($titlesplit == '3_9') {
$titlespan = '3';
$navspan = '9';
} elseif ($titlesplit == '4_8') {
$titlespan = '4';
$navspan = '8';
} elseif ($titlesplit == '5_7') {
$titlespan = '5';
$navspan = '7';
} elseif ($titlesplit == '6_6') {
$titlespan = '6';
$navspan = '6';
} elseif ($titlesplit == '12_12') {
$titlespan = '12';
$navspan = '12';
}
?>
<div id="page" class="hfeed site">
<header id="masthead" class="site-header" role="banner">
<div id="site-title">
<div class="container">
<div class="row">
<div id="titlespan" class=" col-sm-<?php echo $titlespan; ?>">
<div class="site-branding" id="uc-site-header">
<?php include 'inc/site-title.php'; ?>
</div>
</div>
<?php if ($titlesplit == '12_12') {echo '</div><div class="row">';}?>
<div id="navspan" class="col-sm-<?php echo $navspan; ?>">
<?php wp_nav_menu(array('theme_location' => 'primary'));?>
</div>
</div>
</div>
</div>
</header>
<!-- #masthead -->
<div id="content" class="site-content">
<div class="container">
<?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">
<?php
$ogtitle = get_post_meta( $post->ID, 'ogtitle', true);
if(strlen($ogtitle) > 0) echo '<meta property="og:title" content="'.$ogtitle.'" />';
?>
<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 lt IE 9]>
<script src="<?php echo get_stylesheet_directory_uri(); ?>/javascripts/html5shiv-master/src/html5shiv.js"></script>
<script src="<?php echo get_stylesheet_directory_uri(); ?>/javascripts/html5shiv-master/src/html5shiv-printshiv.js"></script>
<![endif]-->
<!--[if !IE]><!--><script>
if (/*@cc_on!@*/false) {
// document.documentElement.className+=' ie10';
}
</script><!--<![endif]-->
<script src="http://use.typekit.net/uzm8fts.js"></script>
<script>try{Typekit.load();}catch(e){}</script>

</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();}?>
<?php
$titlespan = '';
$navspan = '';
$titlesplit = get_theme_mod('titlesplit');
if ($titlesplit == '2_10') {
$titlespan = '2';
$navspan = '10';
} elseif ($titlesplit == '3_9') {
$titlespan = '3';
$navspan = '9';
} elseif ($titlesplit == '4_8') {
$titlespan = '4';
$navspan = '8';
} elseif ($titlesplit == '5_7') {
$titlespan = '5';
$navspan = '7';
} elseif ($titlesplit == '6_6') {
$titlespan = '6';
$navspan = '6';
} elseif ($titlesplit == '12_12') {
$titlespan = '12';
$navspan = '12';
}
?>
<div id="page" class="hfeed site">
<header id="masthead" class="site-header" role="banner">
<div id="site-title">
<div class="container">
<div class="row">
<div id="titlespan" class=" col-sm-<?php echo $titlespan; ?>">
<div class="site-branding" id="uc-site-header">
<?php include 'inc/site-title.php'; ?>
</div>
</div>
<?php if ($titlesplit == '12_12') {echo '</div><div class="row">';}?>
<div id="navspan" class="col-sm-<?php echo $navspan; ?>">
<?php wp_nav_menu(array('theme_location' => 'primary'));?>
</div>
</div>
</div>
</div>
</header>
<!-- #masthead -->
<div id="content" class="site-content">
<div class="container">
13 changes: 10 additions & 3 deletions search.php
Expand Up @@ -21,18 +21,25 @@ get_header(); ?>
<?php /* Start the Loop */ ?>
<?php while ( have_posts() ) : the_post();?>
<?php

$post = get_post( get_the_ID() );

// is this a 'post' type?
$is_post_type = ( $post->post_type == "post" );

$url = get_field('external_url');
if( !empty($url) ){
$url = '<a href="'.$url.'" target="_blank">';
}elseif(strlen(get_the_content()) > 0){
}elseif( (strlen(get_the_content()) > 0 ) || ( ! $is_post_type )){
$url = '<a href="'.get_permalink().'">';
}

?>

<h3><?php echo $url; ?><?php the_title();?></h3>
<?php if(strlen(get_the_content()) > 0 || !empty($url)) echo '</a>'; ?>
<?php if(strlen(get_the_content()) > 0 || !empty($url) || $is_person_post_type) echo '</a>'; ?>

<?php the_excerpt(); ?> <!-- e.g. "All about jellyfish" -->
<?php the_excerpt(); ?>

<?php endwhile; ?>

Expand Down

0 comments on commit 9f608be

Please sign in to comment.