From 2450e218d704ae91a0cb5d43b19f89ab769b72c7 Mon Sep 17 00:00:00 2001 From: Brian Date: Thu, 14 Jul 2016 16:12:03 -0400 Subject: [PATCH] Quarterly Update Check 5/5/16 email for purple/green descriptions of work and 7/13/16 email for clarifications --- archive.php | 142 ++++++++++++ content-presspage-top.php | 72 +++---- content-single.php | 86 ++++++-- content.php | 24 ++- css/executive.css | 318 ++++++++++++++++++++++++--- functions.php | 375 ++++++++++++++++++-------------- header.php | 178 +++++++-------- javascripts/executive.js | 10 +- sass/executive.scss | 361 +++++++++++++++++++++++++++++-- single.php | 101 +++++---- user-people.php | 440 +++++++++++++++++++------------------- 11 files changed, 1502 insertions(+), 605 deletions(-) create mode 100644 archive.php diff --git a/archive.php b/archive.php new file mode 100644 index 0000000..7185fbc --- /dev/null +++ b/archive.php @@ -0,0 +1,142 @@ + +
+
+
+
+
+ +
+ +

+ ' . get_the_author() . '' ); + + elseif ( is_day() ) : + printf( __( 'Day: %s', 'cs' ), '' . get_the_date() . '' ); + + elseif ( is_month() ) : + printf( __( 'Month: %s', 'cs' ), '' . get_the_date( _x( 'F Y', 'monthly archives date format', 'cs' ) ) . '' ); + + elseif ( is_year() ) : + printf( __( 'Year: %s', 'cs' ), '' . get_the_date( _x( 'Y', 'yearly archives date format', 'cs' ) ) . '' ); + + elseif ( is_tax( 'post_format', 'post-format-aside' ) ) : + _e( 'Asides', 'cs' ); + + elseif ( is_tax( 'post_format', 'post-format-gallery' ) ) : + _e( 'Galleries', 'cs'); + + elseif ( is_tax( 'post_format', 'post-format-image' ) ) : + _e( 'Images', 'cs'); + + elseif ( is_tax( 'post_format', 'post-format-video' ) ) : + _e( 'Videos', 'cs' ); + + elseif ( is_tax( 'post_format', 'post-format-quote' ) ) : + _e( 'Quotes', 'cs' ); + + elseif ( is_tax( 'post_format', 'post-format-link' ) ) : + _e( 'Links', 'cs' ); + + elseif ( is_tax( 'post_format', 'post-format-status' ) ) : + _e( 'Statuses', 'cs' ); + + elseif ( is_tax( 'post_format', 'post-format-audio' ) ) : + _e( 'Audios', 'cs' ); + + elseif ( is_tax( 'post_format', 'post-format-chat' ) ) : + _e( 'Chats', 'cs' ); + + elseif ( is_tax( 'group') || is_tax('persontag')): + global $wp_query; + $term = $wp_query->get_queried_object(); + $name = $term->name; + echo $name; + + else : + _e( 'Archives', 'cs' ); + + endif; + ?> +

+ %s
', $term_description ); + endif; + ?> + +
+ + + + + + + + + + + + + + + + + +
+ +
+ + diff --git a/content-presspage-top.php b/content-presspage-top.php index 207b69c..df364e9 100644 --- a/content-presspage-top.php +++ b/content-presspage-top.php @@ -1,37 +1,37 @@ -
-
> -
-
- 0 || !empty($external_link)) && has_post_thumbnail()) { - echo''.get_the_post_thumbnail().''; - } elseif(has_post_thumbnail()) { - the_post_thumbnail(); - } else { - echo '

Missing Featured Image for this post.

'; - } - ?> -
-
-
-

- 0 || !empty($external_link)) { - echo''.get_the_title().''; - } else { - the_title(); - } - ?> -

-
-
- -
- -
- -
-
+
+
> +
+
+ 0 || !empty($external_link)) && has_post_thumbnail()) { + echo''.get_the_post_thumbnail().''; + } elseif(has_post_thumbnail()) { + the_post_thumbnail(); + } else { + echo '

Missing Featured Image for this post.

'; + } + ?> +
+
+
+

+ 0 || !empty($external_link)) { + echo''.get_the_title().''; + } else { + the_title(); + } + ?> +

+
+
+ +
+ +
+ +
+
\ No newline at end of file diff --git a/content-single.php b/content-single.php index ef899db..6783720 100644 --- a/content-single.php +++ b/content-single.php @@ -13,7 +13,7 @@ ', '' ); ?>
- +
+
+ ID, 'shareline', true); + if(empty($shareline)) $shareline = get_the_title(); + + ?> + &url=&via=UConnBusiness', 'Twitter', 'width=500,height=500');"> +
+ +
+ +
+
@@ -41,15 +54,27 @@
parent); + if($parent->slug != 'authors'){ + $cats[] = ''.$cat->name.''; + $catids[] = $cat->term_id; + } + } + if(count($cats) > 0){ + $category_list = implode(', ', $cats); + } + //$category_list = get_the_category_list( __( ', ', 'cs' ) ); /* translators: used between list items, there is a space after the comma */ $tag_list = get_the_tag_list( '', __( ', ', 'cs' ) ); if ( ! cs_categorized_blog() ) { // This blog only has 1 category so we just need to worry about tags in the meta text if ( '' != $tag_list ) { - $meta_text = __( 'This entry was tagged %2$s.', 'cs' ); + $meta_text = __( '
Tags:
%2$s.
', 'cs' ); } else { $meta_text = __( '', 'cs' ); } @@ -57,9 +82,9 @@ } else { // But this blog has loads of categories so we should probably display them here if ( '' != $tag_list ) { - $meta_text = __( 'This entry was posted in %1$s and tagged %2$s.', 'cs' ); + $meta_text = __( '
Categories:
%1$s
Tags:
%2$s
', 'cs' ); } else { - $meta_text = __( 'This entry was posted in %1$s.', 'cs' ); + $meta_text = __( 'Categories: %1$s.', 'cs' ); } } // end check for categories on this blog @@ -75,13 +100,50 @@
- Share on:  facebookFacebook - TwitterTwitter - LinkedInLinkedIn - emailEmail +
Share on:
+
+ID, 'printthis', true); +if(strlen($printthis) > 0 || $printthis == 'false') echo '
+ +
'; +?>
- + + +
+
diff --git a/content.php b/content.php index d09d551..ee801ae 100644 --- a/content.php +++ b/content.php @@ -17,7 +17,7 @@ @@ -31,26 +31,36 @@ ) ); ?>
- +
parent); + if($parent->slug != 'authors'){ + $cats[] = ''.$cat->name.''; + } + } + if(count($cats) > 0){ + $categories_list = implode(', ', $cats); + } + //$categories_list = get_the_category_list( __( ', ', 'cs' ) ); if ( $categories_list && cs_categorized_blog() ) : ?> - + ', 'cs' ), $categories_list ); ?> - - + @@ -61,4 +71,4 @@ ', '' ); ?>
- \ No newline at end of file +
\ No newline at end of file diff --git a/css/executive.css b/css/executive.css index 992105f..d1751b4 100644 --- a/css/executive.css +++ b/css/executive.css @@ -10208,6 +10208,19 @@ h2 { font-size: 28px !important; } +p { + margin-bottom: 14px; +} + +blockquote { + border-left: 5px solid #428bca; + font-size: 24px; +} + +.wp-caption-text { + font-style: italic; +} + @media (max-width: 767px) { ol.breadcrumb { display: none !important; @@ -10432,6 +10445,18 @@ h2 { color: #000; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.7); } +#page-business-home .entry-content .panel-grid .caption-green a { + color: black !important; +} + +#page-business-home .entry-content .panel-grid .caption-green .widget_sp_image-description { + background-color: rgba(208, 231, 81, 0.9); + color: #000; + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.7); +} +#page-business-home .entry-content .panel-grid .caption-green a { + color: black !important; +} .ie8 #page-business-home .entry-content .panel-grid .caption-green .widget_sp_image-description { background-color: #d0e751; @@ -10446,6 +10471,16 @@ h2 { background-color: #4a0500; } +#page-business-home .caption-teal .widget_sp_image-description { + background-color: rgba(11, 186, 186, 0.9); + color: #fff; + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.7); +} + +.ie8 #page-business-home .caption-teal .widget_sp_image-description { + background-color: #0bbaba; +} + #page-business-home .caption-purple .widget_sp_image-description { background-color: rgba(132, 54, 181, 0.9); color: #fff; @@ -10456,6 +10491,16 @@ h2 { background-color: #8436b5; } +#page-business-home .caption-darkpurple .widget_sp_image-description { + background-color: rgba(81, 7, 127, 0.9); + color: #fff; + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.7); +} + +.ie8 #page-business-home .caption-darkpurple .widget_sp_image-description { + background-color: #51077f; +} + #page-business-home .caption-orange .widget_sp_image-description { background-color: rgba(209, 112, 17, 0.9); color: #fff; @@ -10589,7 +10634,7 @@ h2 { #mega-menu-wrap-primary #mega-menu-primary > li.mega-menu-megamenu > ul.mega-sub-menu { background-color: rgba(30, 96, 146, 0.95); top: 0; - margin-top: 46px; + margin-top: 0px; padding: 15px 20px !important; } @@ -10674,39 +10719,73 @@ h2 { padding-bottom: 0; background-color: transparent; } -#content #page-press .entry-content #presstop .post .col-sm-6:nth-child(1) { +#content #page-press .entry-content #presstop .post .col-md-6:nth-child(1) { padding-left: 0px; } -#content #page-press .entry-content #presstop .post .col-sm-6:nth-child(2) { +@media (max-width: 991px) { + #content #page-press .entry-content #presstop .post .col-md-6:nth-child(1) { + padding-right: 0px; + } +} +#content #page-press .entry-content #presstop .post .col-md-6:nth-child(2) { padding-left: 38px; padding-right: 38px; } -#content #page-press .entry-content #presstop .post .col-sm-6:nth-child(2) .entry-title { - padding-top: 38px; - font-size: 40px; +#content #page-press .entry-content #presstop .post .col-md-6:nth-child(2) .entry-title { + padding-top: 20px; + font-size: 32px; font-weight: bold; color: #3d3d3d; line-height: 1.1em; + margin-bottom: 0px; } -#content #page-press .entry-content #presstop .post .col-sm-6:nth-child(2) .btn-default { +#content #page-press .entry-content #presstop .post .col-md-6:nth-child(2) .btn-default { background-color: #e0e0e0; text-decoration: none; } -#content #page-press .entry-content #presstop .post .col-sm-6:nth-child(2) .btn-default a { +#content #page-press .entry-content #presstop .post .col-md-6:nth-child(2) .btn-default a { color: #636363; text-decoration: none; } -#content #page-press .entry-content #presstop .post .col-sm-6:nth-child(2) .moretag { +#content #page-press .entry-content #presstop .post .col-md-6:nth-child(2) .moretag { background-color: #4cbde7; color: white; font-size: 10px; padding: 5px 11px 3px; text-decoration: none; text-transform: uppercase; + display: inline-block; + margin-top: 8px; + margin-bottom: 8px; +} +@media (max-width: 991px) { + #content #page-press .entry-content #presstop .post .col-md-6:nth-child(2) .moretag { + margin-bottom: 0px; + } } -#content #page-press .entry-content #presstop .post .col-sm-6:nth-child(2) .moretag:hover { +#content #page-press .entry-content #presstop .post .col-md-6:nth-child(2) .moretag:hover { background-color: #39AAD3; } +#content #page-press .entry-content #presstop .post .col-md-6:nth-child(2) .entry-content img { + display: none; + /* Hiding image from excerpt */ +} +#content #page-press .entry-content #presstop .post .col-md-6:nth-child(2) .entry-content iframe { + display: none; + /* Hiding youtube and other embeds from excerpt */ +} +#content #page-press .entry-content #presstop .post .col-md-6:nth-child(2) .entry-content .wp-caption-text { + /* Hiding image caption from excerpt */ + display: none; +} +@media (max-width: 991px) { + #content #page-press .entry-content #presstop .post .col-md-6:nth-child(2) { + padding-bottom: 18px; + } + #content #page-press .entry-content #presstop .post .col-md-6:nth-child(2) h4.entry-title { + padding-top: 15px; + } +} #content #page-press .entry-content #presstop .entry-header h4.entry-title a { color: #3d3d3d !important; } @@ -10763,6 +10842,10 @@ h2 { margin: 0; } +#mega-menu-wrap-primary #mega-menu-primary { + z-index: 9999 !important; +} + #mega-menu-wrap-primary #mega-menu-primary li.mega-menu-item a:before { font-size: 1.9em; margin-top: -2px; @@ -11287,6 +11370,7 @@ h2 { } #footers #mega-footer .widget.widget_siteorigin-panels-builder { margin-bottom: 0px !important; + padding-bottom: 0px !important; } #footers #mega-footer .widget.widget_siteorigin-panels-builder .widget { margin-bottom: 20px !important; @@ -11312,6 +11396,10 @@ h2 { #footers #mega-footer .textwidget ul li { list-style-type: none !important; } +#footers #mega-footer .panel-grid-cell .widget:nth-last-child(1) { + padding-bottom: 0 !important; + margin-bottom: 0 !important; +} #footers #footer { margin-top: 0em; color: white; @@ -11691,36 +11779,192 @@ h1.entry-title { font-size: 20px !important; } -#page-single #main { - border: 1px solid #ebebeb; +#page-single, #page-archive { + background-color: transparent; + border: none; + border-top: none; +} +#page-single #main, #page-archive #main { padding: 40px; + background-color: white; + border: 1px solid #ebebeb; + border-top: none; } @media (max-width: 767px) { - #page-single #main { + #page-single #main, #page-archive #main { padding: 22px; } } -#page-single #page-sidebar { +@media (max-width: 991px) { + #page-single .col-md-9, #page-archive .col-md-9 { + padding-left: 0px; + padding-right: 0px; + } +} +@media (max-width: 991px) { + #page-single .col-md-3, #page-archive .col-md-3 { + padding-left: 0px; + padding-right: 0px; + } +} +#page-single .col-sm-2, #page-archive .col-sm-2 { + padding-left: 0px; +} +#page-single .col-sm-10, #page-archive .col-sm-10 { + padding-left: 0px; + margin-left: -40px; +} +@media (max-width: 1200px) { + #page-single .col-sm-10, #page-archive .col-sm-10 { + margin-left: 0px; + } +} +@media (max-width: 767px) { + #page-single .col-sm-10, #page-archive .col-sm-10 { + margin-bottom: 10px; + } +} +@media (max-width: 767px) { + #page-single .col-sm-10.social-section a, #page-archive .col-sm-10.social-section a { + margin-bottom: 8px; + display: block; + } +} +#page-single .col-sm-12, #page-archive .col-sm-12 { + padding-left: 0px; + padding-right: 0px; +} +#page-single #page-sidebar, #page-archive #page-sidebar { + padding: 60px 20px 20px 20px; background-color: white; border: 1px solid #ebebeb; - padding-top: 24px; - padding-bottom: 20px; + border-top: none; } -@media (max-width: 767px) { - #page-single #page-sidebar { - margin: 15px; +@media (max-width: 991px) { + #page-single #page-sidebar, #page-archive #page-sidebar { + width: 100%; + margin-top: 20px; + padding-top: 20px; + border-top: 1px solid #ebebeb; } } -#page-single #page-sidebar .widget-head { +#page-single #page-sidebar .widget-head, #page-archive #page-sidebar .widget-head { padding-left: 0px; margin-bottom: 15px; + border: none; } -#page-single #page-sidebar .screen-reader-text { +#page-single #page-sidebar .screen-reader-text, #page-archive #page-sidebar .screen-reader-text { display: none; } -#page-single #page-sidebar h2.widget-title { +#page-single #page-sidebar h2.widget-title, #page-archive #page-sidebar h2.widget-title { font-size: 20px !important; } +#page-single #page-sidebar .post, #page-archive #page-sidebar .post { + background-color: transparent; +} +#page-single #page-sidebar .col-sm-5, #page-archive #page-sidebar .col-sm-5 { + /* For post loop widget using small image */ + padding-right: 0px; +} +@media (max-width: 767px) { + #page-single #page-sidebar .col-sm-5 img, #page-archive #page-sidebar .col-sm-5 img { + width: 60%; + margin-bottom: 20px; + } +} +#page-single .shareline-twitter, #page-archive .shareline-twitter { + border-top: 1px solid #ededed; + padding: 6px 0 4px; +} +#page-single .shareline-twitter a, #page-archive .shareline-twitter a { + color: #555; + display: inline-block; + padding-top: 2px; + text-decoration: none; +} +#page-single .shareline-twitter a:hover, #page-archive .shareline-twitter a:hover { + color: #20a1da; + text-decoration: underline; +} +#page-single .shareline-twitter a:hover .social-twitter::before, #page-archive .shareline-twitter a:hover .social-twitter::before { + color: #20a1da; +} +#page-single .shareline-twitter a .social-twitter::before, #page-archive .shareline-twitter a .social-twitter::before { + font-size: 20px; + color: #555; + display: inline-block; + margin-top: -2px; +} +#page-single .shareline-facebook, #page-archive .shareline-facebook { + border-bottom: 1px solid #ededed; + border-top: 1px solid #ededed; + margin-bottom: 20px; + padding: 6px 0 4px; +} +#page-single .shareline-facebook a, #page-archive .shareline-facebook a { + color: #555; + display: inline-block; + padding-top: 2px; + text-decoration: none; +} +#page-single .shareline-facebook a:hover, #page-archive .shareline-facebook a:hover { + color: #20a1da; + text-decoration: underline; +} +#page-single .shareline-facebook a:hover .social-facebook::before, #page-archive .shareline-facebook a:hover .social-facebook::before { + color: #20a1da; +} +#page-single .shareline-facebook a .social-facebook::before, #page-archive .shareline-facebook a .social-facebook::before { + font-size: 20px; + color: #555; + display: inline-block; + margin-top: -2px; +} +#page-single .social, #page-archive .social { + margin-right: 6px; +} +#page-single .relatedpost, #page-archive .relatedpost { + padding-left: 0px; + padding-right: 8px; +} +#page-single .relatedpost img, #page-archive .relatedpost img { + margin-bottom: 2px; +} +#page-single .relatedpost h5, #page-archive .relatedpost h5 { + margin-top: 10px; + line-height: 1.35em; +} +#page-single .relatedpost a.relatedtitle, #page-archive .relatedpost a.relatedtitle { + color: black; + text-decoration: none; +} +#page-single .relatedpost a.relatedtitle:hover, #page-archive .relatedpost a.relatedtitle:hover { + text-decoration: underline; +} + +@media (max-width: 991px) { + #page-archive #page-sidebar { + margin-left: 0px; + } +} +#page-archive .post { + padding-left: 0px; +} +#page-archive h1.page-title { + text-transform: uppercase; +} +#page-archive h1.entry-title { + font-size: 30px; +} +#page-archive .widget { + margin-bottom: 25px; +} +#page-archive hr { + margin-top: 5px !important; +} +#page-archive .hentry { + margin-bottom: 0px; +} .panel-grid .uc-cal .uc-cal-event-title { color: #20a1da !important; @@ -11937,10 +12181,13 @@ body.home #page-page-builder .uc-cal-event-date, body.home #page-page-builder-ca body.home #content .panel-grid .widget.widget_metaslider_widget ul li { margin-bottom: 0px; } - -#social-buttons { - margin-top: 15px; +body.home #content .panel-grid .row-darkgrey .widget .widget-title { + color: white; + text-shadow: none; + margin-bottom: 10px; + margin-top: 20px; } + #social-buttons a { margin-right: 10px; } @@ -11954,3 +12201,24 @@ body.home #content .panel-grid .widget.widget_metaslider_widget ul li { padding: 0px; width: 60%; } + +.printbutton { + background-color: white; + border: 1px solid #ccc; + border-radius: 4px; + font-size: 12px; + padding: 5px 13px 4px; + margin-top: 18px; +} +.printbutton:hover { + background-color: #eee; +} + +.byline { + display: inline; +} + +.post-password-required .glyphicons-lock { + margin-right: 10px; + font-size: 31px; +} diff --git a/functions.php b/functions.php index 40e3819..7ca4d77 100644 --- a/functions.php +++ b/functions.php @@ -1,162 +1,215 @@ -ID) . '">Continue Reading'; -} -add_filter('excerpt_more', 'new_excerpt_more'); - -add_filter( 'the_content_more_link', 'modify_read_more_link' ); -function modify_read_more_link() { -return 'Continue Reading'; -} - - - - - -function sherman_remove_theme_features() { - remove_theme_support( 'custom-header' ); - remove_theme_support( 'custom-background' ); -// remove_theme_support( 'post-formats' ); -} -add_action( 'init', 'sherman_remove_theme_features' ); - -function sherman_customize_register( $wp_customize ) { - $wp_customize->remove_section('colors'); - $wp_customize->remove_section('background_image'); - $wp_customize->remove_section('nav'); -} -add_action( 'customize_register', 'sherman_customize_register' ); - - - - -function executive_header_split( $wp_customize ){ - $wp_customize->add_setting( 'titlesplit', //Give it a SERIALIZED name (so all theme settings can live under one db record) - array( - 'default' => '3_9', //Default setting/value to save - 'type' => 'theme_mod', //Is this an 'option' or a 'theme_mod'? - 'capability' => 'edit_theme_options', //Optional. Special permissions for accessing this setting. - 'transport' => 'refresh', //What triggers a refresh of the setting? 'refresh' or 'postMessage' (instant)? - ) - ); - $wp_customize->add_control('titlesplit', array( - 'type' => 'select', - 'label' => 'Title / Navigation Split', - 'section' => 'title_tagline', - 'choices' => array( - '3_9' =>'3/9', - '4_8' =>'4/8', - '6_6' =>'6/6', - '12_12' =>'2row' - ) - ) - ); -} -add_action( 'customize_register', 'executive_header_split' ); - -/* - -add_filter('megamenu_nav_menu_args ', 'my_megamenu_nav_menu_args '); -function my_megamenu_nav_menu_args($defaults, $menu_id, $current_theme_location) { - - $defaults = array( - 'menu' => $menu_id, - 'container' => 'div', - 'container_class' => 'mega-menu-wrap', - 'container_id' => 'mega-menu-wrap-' . $sanitized_location, - 'menu_class' => 'mega-menu mega-menu-horizontal', - 'menu_id' => 'mega-menu-' . $sanitized_location, - 'fallback_cb' => 'wp_page_menu', - 'before' => '', - 'after' => '', - 'link_before' => '', - 'link_after' => '', - 'items_wrap' => '

HELLO FILTERS

%3$s', - 'depth' => 0, - 'walker' => new Mega_Menu_Walker() - ); - $array = array($defaults, $menu_id,$current_theme_location); - return $array; -} -*/ - - -function executive_breadcrumbs(){ - $thisID = get_the_ID(); - $ancestors = get_ancestors($thisID, 'page'); - $ancestors = array_reverse($ancestors); - - - if ($ancestors) { - echo ''; - } - } - -function press_link($id){ - $presslink = ''; - $external_link = get_post_meta( $id, 'external_link'); - $external_link = $external_link[0]; - if ($external_link){ - $presslink = $external_link; - } else { - $presslink = get_the_permalink(); - } - return $presslink; -} -function press_source($id){ - $src = get_post_meta( $id, 'story_source'); - if ($src[0]){ - echo '

'.$src[0].'

'; - } -} - - +ID) . '">Continue Reading'; +} +add_filter('excerpt_more', 'new_excerpt_more'); + +add_filter( 'the_content_more_link', 'modify_read_more_link' ); +function modify_read_more_link() { +return 'Continue Reading'; +} + + + + + +function sherman_remove_theme_features() { + remove_theme_support( 'custom-header' ); + remove_theme_support( 'custom-background' ); +// remove_theme_support( 'post-formats' ); +} +add_action( 'init', 'sherman_remove_theme_features' ); + +function sherman_customize_register( $wp_customize ) { + $wp_customize->remove_section('colors'); + $wp_customize->remove_section('background_image'); + $wp_customize->remove_section('nav'); +} +add_action( 'customize_register', 'sherman_customize_register' ); + + + + +function executive_header_split( $wp_customize ){ + $wp_customize->add_setting( 'titlesplit', //Give it a SERIALIZED name (so all theme settings can live under one db record) + array( + 'default' => '3_9', //Default setting/value to save + 'type' => 'theme_mod', //Is this an 'option' or a 'theme_mod'? + 'capability' => 'edit_theme_options', //Optional. Special permissions for accessing this setting. + 'transport' => 'refresh', //What triggers a refresh of the setting? 'refresh' or 'postMessage' (instant)? + ) + ); + $wp_customize->add_control('titlesplit', array( + 'type' => 'select', + 'label' => 'Title / Navigation Split', + 'section' => 'title_tagline', + 'choices' => array( + '3_9' =>'3/9', + '4_8' =>'4/8', + '6_6' =>'6/6', + '12_12' =>'2row' + ) + ) + ); +} +add_action( 'customize_register', 'executive_header_split' ); + +/* + +add_filter('megamenu_nav_menu_args ', 'my_megamenu_nav_menu_args '); +function my_megamenu_nav_menu_args($defaults, $menu_id, $current_theme_location) { + + $defaults = array( + 'menu' => $menu_id, + 'container' => 'div', + 'container_class' => 'mega-menu-wrap', + 'container_id' => 'mega-menu-wrap-' . $sanitized_location, + 'menu_class' => 'mega-menu mega-menu-horizontal', + 'menu_id' => 'mega-menu-' . $sanitized_location, + 'fallback_cb' => 'wp_page_menu', + 'before' => '', + 'after' => '', + 'link_before' => '', + 'link_after' => '', + 'items_wrap' => '

HELLO FILTERS

%3$s', + 'depth' => 0, + 'walker' => new Mega_Menu_Walker() + ); + $array = array($defaults, $menu_id,$current_theme_location); + return $array; +} +*/ + + +function executive_breadcrumbs(){ + $thisID = get_the_ID(); + $ancestors = get_ancestors($thisID, 'page'); + $ancestors = array_reverse($ancestors); + + + if ($ancestors) { + echo ''; + } + } + +function press_link($id){ + $presslink = ''; + $external_link = get_post_meta( $id, 'external_link'); + $external_link = $external_link[0]; + if ($external_link){ + $presslink = $external_link; + } else { + $presslink = get_the_permalink(); + } + return $presslink; +} +function press_source($id){ + $src = get_post_meta( $id, 'story_source'); + if ($src[0]){ + echo '

'.$src[0].'

'; + } +} + +if ( ! function_exists( 'bus_posted_on' ) ) : +/** + * Prints HTML with meta information for the current post-date/time and author. + */ +function bus_posted_on($categories) { + $time_string = ''; + if ( get_the_time( 'U' ) !== get_the_modified_time( 'U' ) ) { + $time_string .= ''; + } + + $time_string = sprintf( $time_string, + esc_attr( get_the_date( 'c' ) ), + esc_html( get_the_date() ), + esc_attr( get_the_modified_date( 'c' ) ), + esc_html( get_the_modified_date() ) + ); + + $authors = array(); + foreach($categories as $cat){ + $parent = get_category($cat->parent); + if($parent->slug == 'authors'){ + $authors[] = ''.$cat->name.''; + } + } + if(count($authors) > 0){ + $by = implode(', ', $authors); + } + else { + $by = sprintf( '%2$s', + esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ), + esc_html( get_the_author() ) + ); + } + printf( __( 'Posted on %1$s', 'cs' ), + sprintf( '%2$s', + esc_url( get_permalink() ), + $time_string + ), + $by + ); +} +endif; + +add_filter('protected_title_format', 'protected_wrapper'); +function protected_wrapper($title) { + return 'Protected: %s'; +} +function print_shortcode( $atts ) { + return '
+ +
'; +} +add_shortcode( 'printthis', 'print_shortcode' ); + ?> \ No newline at end of file diff --git a/header.php b/header.php index cf68796..1891262 100644 --- a/header.php +++ b/header.php @@ -1,87 +1,91 @@ - section and everything up till
- * - */ -include 'inc/vars.php'; -?> - -> - - - - - - -<?php wp_title( '|', true, 'right' ); ?> - - - - - - - - - - -> - - - - - - - -
- - -
-
+ section and everything up till
+ * + */ +include 'inc/vars.php'; +?> + +> + + + + + +ID, 'ogtitle', true); +if(strlen($ogtitle) > 0) echo ''; +?> + +<?php wp_title( '|', true, 'right' ); ?> + + + + + + + + + + +> + + + + + + + +
+ + +
+
diff --git a/javascripts/executive.js b/javascripts/executive.js index 52985d9..c74c314 100644 --- a/javascripts/executive.js +++ b/javascripts/executive.js @@ -45,10 +45,12 @@ function stripCategories(){ }); } function positionNav(){ - if(!$('#navspan').hasClass('col-sm-12')) $('#navspan').css('top',($('#masthead').outerHeight(true)-$('#navspan').outerHeight())/2+'px'); - $('#mega-menu-primary > li > .mega-sub-menu').each(function(i,e){ - $(this).css('margin-top',($('#masthead').outerHeight(true)-$('#navspan').position().top+1)+'px'); - }); + if($(window).width() > $('#mega-menu-primary').attr('data-breakpoint')){ + if(!$('#navspan').hasClass('col-sm-12')) $('#navspan').css('top',($('#masthead').outerHeight(true)-$('#navspan').outerHeight())/2+'px'); + $('#mega-menu-primary > li > .mega-sub-menu').each(function(i,e){ + $(this).css('margin-top',($('#masthead').outerHeight(true)-$('#navspan').position().top+1)+'px'); + }); + } //$('#navspan').css('top','0px'); } $(document).ready(function(){ diff --git a/sass/executive.scss b/sass/executive.scss index 3aebe29..3ee2917 100644 --- a/sass/executive.scss +++ b/sass/executive.scss @@ -39,6 +39,19 @@ h2 { font-size:28px !important; } +p { + margin-bottom:14px; +} + +blockquote { + border-left: 5px solid #428bca; + font-size: 24px; +} + +.wp-caption-text { + font-style: italic; +} + ol.breadcrumb { @media (max-width:767px) { display:none !important; @@ -176,6 +189,12 @@ $darkgrey: rgba($darkgrey_hex, $transparency); $lightgrey_hex: #EFEFEF; $lightgrey: rgba($lightgrey_hex, $transparency); +$teal_hex: #0BBABA; +$teal: rgba($teal_hex, $transparency); + +$darkpurple_hex: #51077F; +$darkpurple: rgba($darkpurple_hex, $transparency); + #page-business-home { .entry-content { @@ -356,7 +375,25 @@ $lightgrey: rgba($lightgrey_hex, $transparency); text-shadow: 0 1px 1px rgba(255,255,255,.70); } + + a { + color:black !important; + } +} + +#page-business-home .entry-content .panel-grid .caption-green { + .widget_sp_image-description { + background-color:$green; + color:#000; + text-shadow: 0 1px 1px rgba(255,255,255,.70); + + } + + a { + color:black !important; + } } + .ie8 #page-business-home .entry-content .panel-grid .caption-green .widget_sp_image-description { background-color:$green_hex; } @@ -372,6 +409,18 @@ $lightgrey: rgba($lightgrey_hex, $transparency); background-color:$darkred_hex; } +#page-business-home .caption-teal { + .widget_sp_image-description { + background-color:$teal; + color:#fff; + text-shadow: 0 1px 1px rgba(0,0,0,.70); + + } +} +.ie8 #page-business-home .caption-teal .widget_sp_image-description { + background-color:$teal_hex; +} + #page-business-home .caption-purple { .widget_sp_image-description { background-color:$purple; @@ -384,6 +433,18 @@ $lightgrey: rgba($lightgrey_hex, $transparency); background-color:$purple_hex; } +#page-business-home .caption-darkpurple { + .widget_sp_image-description { + background-color:$darkpurple; + color:#fff; + text-shadow: 0 1px 1px rgba(0,0,0,.70); + + } +} +.ie8 #page-business-home .caption-darkpurple .widget_sp_image-description { + background-color:$darkpurple_hex; +} + #page-business-home .caption-orange { .widget_sp_image-description { @@ -522,7 +583,7 @@ $lightgrey: rgba($lightgrey_hex, $transparency); #mega-menu-wrap-primary #mega-menu-primary > li.mega-menu-megamenu > ul.mega-sub-menu { background-color:rgba(#1e6092, .95); top:0; - margin-top:46px; + margin-top:0px; //Previously 46px - change to mobile menu padding:15px 20px !important; } @@ -585,20 +646,25 @@ $lightgrey: rgba($lightgrey_hex, $transparency); padding-bottom:0; background-color:transparent; - .col-sm-6:nth-child(1) { + .col-md-6:nth-child(1) { padding-left:0px; + + @media (max-width:991px) { + padding-right:0px; + } } - .col-sm-6:nth-child(2) { + .col-md-6:nth-child(2) { padding-left:38px; padding-right:38px; .entry-title { - padding-top:38px; - font-size: 40px; + padding-top:20px; + font-size: 32px; font-weight: bold; color: #3d3d3d; line-height:1.1em; + margin-bottom:0px; } .btn-default { @@ -618,10 +684,37 @@ $lightgrey: rgba($lightgrey_hex, $transparency); padding: 5px 11px 3px; text-decoration: none; text-transform: uppercase; + display:inline-block; + margin-top:8px; + margin-bottom:8px; + + @media (max-width:991px) { + margin-bottom:0px; + } } .moretag:hover { background-color: #39AAD3; } + + .entry-content { + img { + display:none; /* Hiding image from excerpt */ + } + iframe { + display:none; /* Hiding youtube and other embeds from excerpt */ + } + .wp-caption-text { /* Hiding image caption from excerpt */ + display:none; + } + } + + @media (max-width:991px) { + padding-bottom:18px; + + h4.entry-title { + padding-top:15px; + } + } } } @@ -735,6 +828,10 @@ $lightgrey: rgba($lightgrey_hex, $transparency); } +#mega-menu-wrap-primary #mega-menu-primary { + z-index:9999 !important; +} + #mega-menu-wrap-primary #mega-menu-primary li.mega-menu-item a:before { font-size:1.9em; margin-top:-2px; @@ -901,13 +998,13 @@ $widget-head-padding:20px 20px 0; } } - - + .widget { color:white !important; &.widget_siteorigin-panels-builder { margin-bottom:0px !important; + padding-bottom:0px !important; .widget { margin-bottom:20px !important; @@ -946,6 +1043,11 @@ $widget-head-padding:20px 20px 0; } } } + + .panel-grid-cell .widget:nth-last-child(1) { + padding-bottom: 0 !important; + margin-bottom:0 !important; + } } #footer { @@ -1371,28 +1473,84 @@ padding:8px 12px 4px -#page-single { +#page-single, #page-archive { + background-color:transparent; + border:none; + //border:1px solid #ebebeb; + border-top:none; + #main { - border:1px solid #ebebeb; padding:40px; + background-color:white; + border:1px solid #ebebeb; + border-top:none; @media (max-width:767px) { padding:22px; } } + + .col-md-9 { + @media (max-width:991px) { + padding-left:0px; + padding-right:0px; + } + } + .col-md-3 { + // padding-right:0px; + @media (max-width:991px) { + padding-left:0px; + padding-right:0px; + } + } + .col-sm-2 { + padding-left:0px; + } + .col-sm-10 { + padding-left:0px; + margin-left:-40px; + + @media (max-width:1200px) { + margin-left:0px; + } + @media (max-width:767px) { + margin-bottom:10px; + } + + &.social-section { + a { + @media (max-width:767px) { + margin-bottom:8px; + display:block; + } + } + } + } + + .col-sm-12 { + padding-left:0px; + padding-right:0px; + } #page-sidebar { - background-color: white; - border: 1px solid #ebebeb; - padding-top: 24px; - padding-bottom:20px; + padding: 60px 20px 20px 20px; + background-color:white; + border:1px solid #ebebeb; + border-top:none; - @media (max-width:767px) { - margin:15px; + @media (max-width:991px) { + width:100%; + margin-top:20px; + padding-top:20px; + border-top:1px solid #ebebeb; + } + + @media (max-width:767px) { } .widget-head { padding-left:0px; margin-bottom:15px; + border:none; } .screen-reader-text { display:none; @@ -1401,9 +1559,143 @@ padding:8px 12px 4px h2.widget-title { font-size:20px !important; } + .post { + background-color:transparent; + } + + .col-sm-5 { /* For post loop widget using small image */ + padding-right: 0px; + + img { + @media (max-width:767px) { + width:60%; + margin-bottom:20px; + } + } + } + + } + + .shareline-twitter { + border-top: 1px solid #ededed; + padding: 6px 0 4px; + + a { + color: #555; + display: inline-block; + padding-top: 2px; + text-decoration: none; + + &:hover { + color:#20a1da; + text-decoration: underline; + + .social-twitter::before { + color:#20a1da; + } + } + + .social-twitter::before { + font-size:20px; + color:#555; + display: inline-block; + margin-top:-2px; + } + } + + + } + + .shareline-facebook { + border-bottom: 1px solid #ededed; + border-top: 1px solid #ededed; + margin-bottom: 20px; + padding: 6px 0 4px; + + a { + color: #555; + display: inline-block; + padding-top: 2px; + text-decoration: none; + + &:hover { + color:#20a1da; + text-decoration: underline; + + .social-facebook::before { + color:#20a1da; + } + } + + .social-facebook::before { + font-size:20px; + color:#555; + display: inline-block; + margin-top:-2px; + } + } + + + } + + .social { + margin-right:6px; + } + + .relatedpost{ + padding-left:0px; + padding-right:8px; + + img { + margin-bottom:2px; + } + h5 { + margin-top:10px; + line-height: 1.35em; + } + + a.relatedtitle { + color:black; + text-decoration: none; + + &:hover { + text-decoration: underline; + } + } } + } +#page-archive { + #page-sidebar { + @media (max-width:991px) { + margin-left:0px; + } + } + + .post { + padding-left:0px; + } + + h1.page-title { + text-transform: uppercase; + } + + h1.entry-title { + font-size:30px; + } + + .widget { + margin-bottom:25px; + } + + hr { + margin-top:5px !important; + } + .hentry { + margin-bottom:0px; + } +} .panel-grid { .uc-cal { @@ -1694,13 +1986,24 @@ body.home { } } } + + .row-darkgrey { + .widget { + .widget-title { + color:white; + text-shadow: none; + margin-bottom:10px; + margin-top:20px; + } + } + } } } + } #social-buttons { - margin-top:15px; a { margin-right:10px; @@ -1721,8 +2024,32 @@ body.home { } } +.printbutton { + background-color: white; + border: 1px solid #ccc; + border-radius: 4px; + font-size: 12px; + padding: 5px 13px 4px; + margin-top:18px; + + + &:hover { + background-color:#eee; + } +} - +.byline { + display:inline; +} + +// ---------------------- Password Protected Pages/Posts ------------------ + +.post-password-required { + .glyphicons-lock { + margin-right:10px; + font-size:31px; + } +} diff --git a/single.php b/single.php index 40e8d60..6b9c282 100644 --- a/single.php +++ b/single.php @@ -1,38 +1,65 @@ -post->ID,'external_link'); -if(!empty($url)) wp_redirect($url[0]); -get_header(); ?> -
-
-
- -
-
- - - - - - - - - - - -
-
-
- -
-
+post->ID,'external_link'); +if(!empty($url)) wp_redirect($url[0]); +get_header(); ?> +
+
+ +
+ +
+
+ + + + + + + + + + + +
+
+
+ + + +
+
\ No newline at end of file diff --git a/user-people.php b/user-people.php index ff8dc9d..98040d0 100644 --- a/user-people.php +++ b/user-people.php @@ -1,220 +1,222 @@ - -
- - - - -
- -
-
-
-
> -
- ', '' ); ?> -
-
- -
- ', '' ); ?> -
-
- -1, - 'post_type' => 'person', - 'meta_key' => 'last_name', - 'orderby' => 'menu_order meta_value title', - 'order' => 'ASC', - ); - - - - // Settings - - $layout = get_field( "layout" ); - $people_to_display = get_field( "people_to_display" ); - $break_into_groups = get_field( "break_into_groups" ); - $specific_people = get_field( "specific_people" ); - $specific_groups = get_field( "specific_groups" ); - $specific_tags = get_field( "specific_tags" ); - $information_to_display = get_field( "information_to_display" ); - - function createTextCell($setting, $field){ - global $information_to_display; - if (in_array($setting, $information_to_display)) { - echo ''; - the_field($field); - echo ''; - } - }; - - function sort_group_by_order( $a, $b ){ - // Getting the order for groups $a and $b - $groupA = get_term_by('slug', $a, 'group')->term_id; - $array_orderGroupA = get_option( "taxonomy_{$groupA}" ); - $orderGroupA = $array_orderGroupA['group_order']; - - $groupB = get_term_by('slug', $b, 'group')->term_id; - $array_orderGroupB = get_option( "taxonomy_{$groupB}" ); - $orderGroupB = $array_orderGroupB['group_order']; - - $r = strnatcasecmp( $orderGroupA, $orderGroupB ); - if( $r === 0 ){ - $r = strnatcasecmp( $a, $b ); - } - return $r; - } - - if ($specific_people){ - global $specific_people; - global $args; - $post__in = array(); - foreach($specific_people as &$value){ - //array_push($post__in, $value->ID); - array_push($post__in, $value); - } - $args[post__in]= $post__in; - } - - // do we need a tax query? - if ($specific_groups != false || $specific_tags != false){ - - $tax_query = array(); - $isTagSet = false; - - if ($specific_groups != false) { - $group_query = array( - 'taxonomy' => 'group', - 'field' => 'term_id', - 'terms' => $specific_groups - ); - array_push($tax_query, $group_query); - } - if ($specific_tags != false) { - $isTagSet = true; - $tag_query = array( - 'taxonomy' => 'persontag', - 'field' => 'term_id', - 'terms' => $specific_tags - ); - array_push($tax_query, $tag_query); - } - $args[tax_query] = $tax_query; - - } - if ($break_into_groups == 1 ){ - //echo '

Break into Groups

'; - - // get all the people - $the_query = new WP_Query( $args ); - - // focusing on just the people, not the rest of the query. - $people = $the_query->posts; - - // look at each person, and see each group used, use that to create a list of terms. - $groups_in_use = array(); - - foreach($people as $value){ - //$id = $value->ID; - $id = $value; - $terms = get_the_terms($id, 'group'); - if (is_array($terms)){ - foreach($terms as $key => $value){ - //duplicates will overwrite themselves... - $slug = $value->slug; - $groups_in_use[$slug]= $slug; - } - }; - } - if(!empty($specific_groups) && is_array($specific_groups)){ - $groups_in_use = array(); - foreach($specific_groups as $group){ - $group = get_term_by('id', $group, 'group'); - $groups_in_use[] = $group->slug; - } - } - // sort the groups in use alphabetically - //sort($groups_in_use); - usort($groups_in_use, 'sort_group_by_order' ); - - // for each item in the list of terms, do a new query, but this time we're going to limit it to ONLY items from that one group. - foreach($groups_in_use as $value){ - - // this sets up the query we'll need, and will overwrite any group queries from the original settings. - $tax_query = array(); - $group_query = array( - 'taxonomy' => 'group', - 'field' => 'slug', - 'terms' => $value - ); - array_push($tax_query, $group_query); - if( $isTagSet != false ){ - array_push($tax_query, $tag_query); - } - $args['tax_query'] = $tax_query; - - // with $arg updated, let's do a new query. - echo '

'.get_term_by('slug', $value, 'group')->name.'

'; - - if ($layout == 'grid') { - include('inc/people-grid.php'); - } - if ($layout == 'table') { - include(get_template_directory().'/inc/people-table.php'); - } - - } - - } else { - - if ($layout == 'grid') { - include('inc/people-grid.php'); - } - if ($layout == 'table') { - include(get_template_directory().'/inc/people-table.php'); - } - - } - ?> - - -
-
-
-
-
-
- -
- - -
- + +
+ + + + +
+ +
+
+
+
> +
+ ', '' ); ?> +
+
+ +
+ ', '' ); ?> +
+
+ -1, + 'post_type' => 'person', + 'meta_key' => 'last_name', + 'orderby' => 'menu_order meta_value title', + 'order' => 'ASC', + ); + + + + // Settings + + $layout = get_field( "layout" ); + $people_to_display = get_field( "people_to_display" ); + $break_into_groups = get_field( "break_into_groups" ); + $specific_people = get_field( "specific_people" ); + $specific_groups = get_field( "specific_groups" ); + $specific_tags = get_field( "specific_tags" ); + $information_to_display = get_field( "information_to_display" ); + + function createTextCell($setting, $field){ + global $information_to_display; + if (in_array($setting, $information_to_display)) { + echo ''; + the_field($field); + echo ''; + } + }; + + function sort_group_by_order( $a, $b ){ + // Getting the order for groups $a and $b + $groupA = get_term_by('slug', $a, 'group')->term_id; + $array_orderGroupA = get_option( "taxonomy_{$groupA}" ); + $orderGroupA = $array_orderGroupA['group_order']; + + $groupB = get_term_by('slug', $b, 'group')->term_id; + $array_orderGroupB = get_option( "taxonomy_{$groupB}" ); + $orderGroupB = $array_orderGroupB['group_order']; + + $r = strnatcasecmp( $orderGroupA, $orderGroupB ); + if( $r === 0 ){ + $r = strnatcasecmp( $a, $b ); + } + return $r; + } + + if ($specific_people){ + global $specific_people; + global $args; + $post__in = array(); + foreach($specific_people as &$value){ + //array_push($post__in, $value->ID); + array_push($post__in, $value); + } + $args[post__in]= $post__in; + } + + // do we need a tax query? + if ($specific_groups != false || $specific_tags != false){ + + $tax_query = array(); + $isTagSet = false; + + if ($specific_groups != false) { + $group_query = array( + 'taxonomy' => 'group', + 'field' => 'term_id', + 'terms' => $specific_groups + ); + array_push($tax_query, $group_query); + } + if ($specific_tags != false) { + $isTagSet = true; + $tag_query = array( + 'taxonomy' => 'persontag', + 'field' => 'term_id', + 'terms' => $specific_tags + ); + array_push($tax_query, $tag_query); + } + $args[tax_query] = $tax_query; + + } + if ($break_into_groups == 1 ){ + //echo '

Break into Groups

'; + + // get all the people + $the_query = new WP_Query( $args ); + + // focusing on just the people, not the rest of the query. + $people = $the_query->posts; + + // look at each person, and see each group used, use that to create a list of terms. + $groups_in_use = array(); + + foreach($people as $value){ + //$id = $value->ID; + $id = $value; + $terms = get_the_terms($id, 'group'); + if (is_array($terms)){ + foreach($terms as $key => $value){ + //duplicates will overwrite themselves... + $slug = $value->slug; + $groups_in_use[$slug]= $slug; + } + }; + } + if(!empty($specific_groups) && is_array($specific_groups)){ + $groups_in_use = array(); + foreach($specific_groups as $group){ + $group = get_term_by('id', $group, 'group'); + $groups_in_use[] = $group->slug; + } + } + // sort the groups in use alphabetically + //sort($groups_in_use); + usort($groups_in_use, 'sort_group_by_order' ); + + // for each item in the list of terms, do a new query, but this time we're going to limit it to ONLY items from that one group. + foreach($groups_in_use as $value){ + + // this sets up the query we'll need, and will overwrite any group queries from the original settings. + $tax_query = array(); + $group_query = array( + 'taxonomy' => 'group', + 'field' => 'slug', + 'terms' => $value + ); + array_push($tax_query, $group_query); + if( $isTagSet != false ){ + array_push($tax_query, $tag_query); + } + $args['tax_query'] = $tax_query; + + // with $arg updated, let's do a new query. + echo '

'.get_term_by('slug', $value, 'group')->name.'

'; + + if ($layout == 'grid') { + include('inc/people-grid.php'); + } + if ($layout == 'table') { + include(get_template_directory().'/inc/people-table.php'); + } + + } + + } else { + + if ($layout == 'grid') { + include('inc/people-grid.php'); + } + if ($layout == 'table') { + include(get_template_directory().'/inc/people-table.php'); + } + + } + } + ?> + + +
+
+
+
+
+
+ +
+ + +
+ \ No newline at end of file