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

Commit

Permalink
IE Fix, Sidebars
Browse files Browse the repository at this point in the history 
Had respond.js loading in the wrong spot, was breaking IE8/7.
Added some files for sidebar.
Removed old-whatever. We don't do this anymore.
  • Loading branch information
andrewmbacon committed Jul 22, 2014
1 parent 77d8093 commit 5c053f6
Show file tree
Hide file tree
Showing 14 changed files with 32 additions and 43 deletions.
2 changes: 1 addition & 1 deletion _notes/dwsync.xml
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion css/_notes/dwsync.xml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?xml version="1.0" encoding="utf-8" ?><dwsync><file name="bootstrap-ie7.css.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488485542" remote="997424038209786114" Dst="-1" /><file name=".htaccess" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488485421" remote="602446763926622264" Dst="-1" /><file name=".htaccess" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488820515" remote="-4611763925645316704" Dst="-1" /><file name=".DS_Store" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488485036" remote="-4611763925645316704" Dst="-1" /><file name="accessibility.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488820515" remote="-4611763925645316704" Dst="-1" /><file name="admin-style.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488820515" remote="-4611763925645316704" Dst="-1" /><file name="bootstrap-ie7.css.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488820515" remote="1060845724326112672" Dst="-1" /><file name="cal.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488820515" remote="-4611763925645316704" Dst="-1" /><file name="in-page-menus.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488820515" remote="-4611763925645316704" Dst="-1" /><file name="link-flags.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488820515" remote="-4611763925645316704" Dst="-1" /><file name="nav.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488820515" remote="-4611763925645316704" Dst="-1" /><file name="test.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488820515" remote="-4611763925645316704" Dst="-1" /><file name="uup.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488820515" remote="-4611763925645316704" Dst="-1" /><file name="bootstrap.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3486644051" remote="602446763927034221" Dst="-1" /></dwsync>
<?xml version="1.0" encoding="utf-8" ?><dwsync><file name="bootstrap-ie7.css.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488485542" remote="997424038209786114" Dst="-1" /><file name=".htaccess" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488485421" remote="602446763926622264" Dst="-1" /><file name=".htaccess" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488820515" remote="-4611742485168493604" Dst="-1" /><file name=".DS_Store" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488485036" remote="-4611742485168493604" Dst="-1" /><file name="bootstrap-ie7.css.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488820515" remote="-4611742485168493603" Dst="-1" /><file name="bootstrap.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488900613" remote="-4611742485168493603" Dst="-1" /><file name="accessibility.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488902039" remote="-4611742485168493604" Dst="-1" /><file name="admin-style.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488902039" remote="-4611742485168493603" Dst="-1" /><file name="cal.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488902039" remote="-4611742485168493602" Dst="-1" /><file name="in-page-menus.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488902039" remote="-4611742485168493602" Dst="-1" /><file name="link-flags.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488902039" remote="-4611742485168493602" Dst="-1" /><file name="nav.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488902039" remote="-4611742485168493602" Dst="-1" /><file name="test.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488902039" remote="-4611742485168493602" Dst="-1" /><file name="uup.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488902039" remote="-4611742485168493601" Dst="-1" /></dwsync>
Expand Down
5 changes: 4 additions & 1 deletion functions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,17 @@ function htmlShiv(){
echo '<!--[if lt IE 9]>
<script src="' . $template . '/js/html5shiv/html5shiv.min.js"></script>
<script src="' . $template . '/js/html5shiv/html5shiv-printshiv.min.js"></script>
<script src="' . $template . '/js/respond.min.js"></script>
<![endif]-->';
}

add_action( 'wp_head', htmlShiv, 1 );

function ie7Bootstrap(){
$template = get_template_directory_uri();
echo '<!--[if lt IE 9]>
<script src="' . $template . '/js/respond.min.js"></script>
<![endif]-->';

echo '<!--[if lt IE 8]>
<link href="'. $template .'/css/bootstrap-ie7.css.php" rel="stylesheet">
<![endif]-->';
Expand Down
2 changes: 1 addition & 1 deletion img/_notes/dwsync.xml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?xml version="1.0" encoding="utf-8" ?><dwsync><file name="JonathanStill.jpg" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611765574913112878" Dst="-1" /><file name="JonathanStill.jpg" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488820509" remote="-4611763925645316703" Dst="-1" /></dwsync>
<?xml version="1.0" encoding="utf-8" ?><dwsync><file name="JonathanStill.jpg" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611765574913112878" Dst="-1" /><file name="JonathanStill.jpg" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488900613" remote="-4611742485168493600" Dst="-1" /></dwsync>
Expand Down
2 changes: 1 addition & 1 deletion inc/_notes/dwsync.xml
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?xml version="1.0" encoding="utf-8" ?><dwsync><file name="bootstrap-forms.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3484062356" remote="-4611765574913112878" Dst="-1" /><file name="custom-header.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3483712245" remote="-4611765574913112878" Dst="-1" /><file name="customizer.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611765574913112878" Dst="-1" /><file name="extras.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611765574913112878" Dst="-1" /><file name="jetpack.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3482672152" remote="-4611765574913112878" Dst="-1" /><file name="nav-walker.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3482666228" remote="-4611765574913112878" Dst="-1" /><file name="reg-sidebars.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611765574913112878" Dst="-1" /><file name="template-tags.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611765574913112878" Dst="-1" /><file name=".DS_Store" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488829033" remote="-4611763925645245562" Dst="-1" /><file name="bootstrap-forms.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3484062356" remote="-4611763925645316703" Dst="-1" /><file name="custom-header.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3483712245" remote="-4611763925645316703" Dst="-1" /><file name="customizer.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488820515" remote="-4611763925645316703" Dst="-1" /><file name="extras.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488820509" remote="-4611763925645316703" Dst="-1" /><file name="jetpack.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3482672152" remote="-4611763925645316703" Dst="-1" /><file name="nav-walker.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3482666228" remote="-4611763925645316703" Dst="-1" /><file name="reg-sidebars.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488827242" remote="-4611763925645310102" Dst="-1" /><file name="template-tags.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488820509" remote="-4611763925645316703" Dst="-1" /><file name="sidebar-if-active.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488825285" remote="1060845724326117317" Dst="-1" /></dwsync>
<?xml version="1.0" encoding="utf-8" ?><dwsync><file name="bootstrap-forms.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3484062356" remote="-4611765574913112878" Dst="-1" /><file name="custom-header.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3483712245" remote="-4611765574913112878" Dst="-1" /><file name="customizer.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611765574913112878" Dst="-1" /><file name="extras.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611765574913112878" Dst="-1" /><file name="jetpack.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3482672152" remote="-4611765574913112878" Dst="-1" /><file name="nav-walker.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3482666228" remote="-4611765574913112878" Dst="-1" /><file name="reg-sidebars.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611765574913112878" Dst="-1" /><file name="template-tags.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="3488466044" remote="-4611765574913112878" Dst="-1" /><file name=".DS_Store" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488829033" remote="-4611742485168493600" Dst="-1" /><file name="bootstrap-forms.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3484062356" remote="-4611742485168493600" Dst="-1" /><file name="custom-header.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3483712245" remote="-4611742485168493600" Dst="-1" /><file name="customizer.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488820515" remote="-4611742485168493600" Dst="-1" /><file name="extras.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488820509" remote="-4611742485168493599" Dst="-1" /><file name="nav-walker.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3482666228" remote="-4611742485168493599" Dst="-1" /><file name="reg-sidebars.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488900390" remote="-4611742485168493599" Dst="-1" /><file name="jetpack.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488900613" remote="-4611742485168493599" Dst="-1" /><file name="sidebar-if-active.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488900613" remote="-4611742485168493599" Dst="-1" /><file name="template-tags.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488900613" remote="-4611742485168493598" Dst="-1" /><file name="sidebar-check.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/themes/cornerstone/" local="3488902827" remote="602446763927039715" Dst="-1" /></dwsync>
Expand Down
14 changes: 14 additions & 0 deletions inc/sidebar-check.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php
// sidebar custom field check.
$sidebar = get_post_meta( get_the_ID(), 'uc_sidebar', true );
if( !is_active_sidebar( $sidebar ) ){
foreach(get_post_ancestors(get_the_ID()) as $ancestor){
$parent_sidebar = get_post_meta( $ancestor, 'uc_sidebar', true );
$parent_sidebar_children = get_post_meta( $ancestor, 'uc_sidebar_children', true );
if( is_active_sidebar( $parent_sidebar ) && $parent_sidebar_children != '' && $parent_sidebar_children ){
$sidebar = $parent_sidebar;
break;
}
}
}
?>
Loading

0 comments on commit 5c053f6

Please sign in to comment.