From 122f6a2f889693b8a241e73bc936d60253ecc6ae Mon Sep 17 00:00:00 2001 From: Ian Weller Date: Fri, 6 Jan 2017 16:48:22 -0500 Subject: [PATCH] fast catch up I realized I only cloned the master branch before removing origin connection to the original git repo. I cloned it again and checkout the develop branch. I then copied the missing files to the generic theme forlder I'm working with. --- archive-miproduct.php | 84 +++ archive.php | 4 +- css/app.css | 1167 ++++++++++++++++++++++++------------ css/app.css.map | 3 +- footer.php | 24 +- front-page.php | 28 +- functions.php | 167 +++++- header.php | 28 +- home.php | 2 +- page-catelog.php | 27 + page-map.php | 28 + page-slideshow.php | 29 + page-table.php | 26 + page.php | 19 +- parts/glm-blocks.php | 10 +- parts/off-canvas-menu.php | 14 + parts/sidebar-l.php | 43 ++ parts/slide-show.php | 13 +- parts/top-bar.php | 5 +- scss/_blog.scss | 7 +- scss/_body.scss | 208 ++++++- scss/_copyright.scss | 12 +- scss/_left-off-canvas.scss | 19 +- scss/_main.scss | 171 +++++- scss/_page.footer.scss | 20 + scss/_page.header.scss | 191 +++--- scss/_settings.scss | 122 ++-- scss/_slideshow.scss | 15 +- scss/_structure.scss | 19 +- scss/_topbar.scss | 198 +++--- scss/_wordpress.scss | 8 +- scss/app.scss | 1 + scss/plugins/_upcp.scss | 144 +++++ search.php | 44 +- sidebar.php | 6 +- single-miproduct.php | 67 +++ 36 files changed, 2189 insertions(+), 784 deletions(-) create mode 100644 archive-miproduct.php create mode 100644 page-catelog.php create mode 100644 page-map.php create mode 100644 page-slideshow.php create mode 100644 page-table.php create mode 100644 parts/sidebar-l.php create mode 100644 scss/plugins/_upcp.scss create mode 100644 single-miproduct.php diff --git a/archive-miproduct.php b/archive-miproduct.php new file mode 100644 index 0000000..e932648 --- /dev/null +++ b/archive-miproduct.php @@ -0,0 +1,84 @@ + + +

+ +

id="interior"> + +

+

+ +

+

+ +

+

+ + +

+ +

+ ID)) == 0 ) { ?> +

> + ID, 'blog-feed-front'); ?> + +

+

+ +

+ + + + + + +

+

+ + + +

+

+ +

+ diff --git a/archive.php b/archive.php index 47d91e5..93e336f 100644 --- a/archive.php +++ b/archive.php @@ -1,7 +1,7 @@

id="interior"> - +

@@ -11,7 +11,7 @@

>

- Posted on +

+ -

- -

- diff --git a/front-page.php b/front-page.php index 853b913..4dde23b 100644 --- a/front-page.php +++ b/front-page.php @@ -5,20 +5,32 @@

- -

-

+

-

- +

+

Feature Products

+ +

+

diff --git a/functions.php b/functions.php index c693a07..2d12e7f 100644 --- a/functions.php +++ b/functions.php @@ -1,6 +1,5 @@ 'sidebar-r', 'description' => __('Appears in Right Sidebar') )); - register_sidebar(array( - 'name' => __('Slideshow'), - 'id' => 'slideshow', - 'description' => __('Meta Slider/Slideshow Area') - )); //register_sidebar(array( // 'name' => __('Footer'), // 'id' => 'sidebar-f', @@ -30,6 +24,123 @@ if (!function_exists('glm_quicksite_widget_init')) { } + +/** + * get_menu_options + * + * Grab the menu options from the theme.ini file + */ +function glm_get_menu_options() +{ + static $menu_options; + $themeConfig = get_template_directory() . '/theme.ini'; + + if (!$menu_options && is_file($themeConfig)) { + $menu_options = parse_ini_file($themeConfig, true); + } + return $menu_options; +} + + +register_nav_menus(array( + 'top-bar' => 'Site Navigation', + //'mobile-off-canvas' => 'Mobile', +// 'footer' => 'Footer' +)); + +if ( ! function_exists( 'michsci_top_bar' ) ) { + function michsci_top_bar() { + wp_nav_menu(array( + 'container' => false, // remove nav container + 'container_class' => '', // class of container + + 'items_wrap' => '

', + + 'menu' => '', // menu name + 'menu_class' => '', // adding custom nav class + 'theme_location' => 'top-bar', // where it's located in the theme + 'before' => '', // before each link + 'after' => '', // after each link + 'link_before' => '', // before each link text + 'link_after' => '', // after each link text + // limit the depth of the nav + 'fallback_cb' => false, // fallback function (see below) + 'walker' => new MichiganSci_Top_Bar_Walker() + )); + } +} +if ( ! class_exists( 'MichiganSci_Top_Bar_Walker()' ) ) : +class MichiganSci_Top_Bar_Walker extends Walker_Nav_Menu { + + function display_element( $element, &$children_elements, $max_depth, $depth = 0, $args, &$output ) { + $element->has_children = ! empty( $children_elements[ $element->ID ] ); + $element->classes[] = ( $element->current || $element->current_item_ancestor ) ? 'active' : ''; + $element->classes[] = ( $element->has_children && 1 !== $max_depth ) ? 'has-dropdown' : ''; + $element->classes[] = ( $element->post_parent == 0 && $element->menu_order > 10 ) ? 'drop-right' : 'drop-left'; + parent::display_element( $element, $children_elements, $max_depth, $depth, $args, $output ); + } + function start_lvl( &$output, $depth = 0, $args = array() ) { + $output .= "\n

'."\n"; + foreach ($pages as $page) { + $childs = get_pages('child_of=' . $page->ID); + if (count($childs) > 0) { + echo ''."\n"; + } else { + echo 'ID == $frontPageId) { + echo ' id="logo"'; + } + echo '>'; + echo ($page->ID == $frontPageId) ? '

': $page->post_title; + echo ''."\n"; + } + } + if ($parent == 0) { + echo '

'; + echo '

'."\n"; + echo ' '; + } + echo '

'."\n"; +} + /** * Return the client info option for the given key * @@ -54,28 +165,23 @@ if (!function_exists('glm_get_clientinfo_option')) { } } +/** + * glm_offcanvas_menu + * + * Generate the list of pages as nested ul li list + */ +function glm_offcanvas_menu() +{ + wp_page_menu(array( + 'depth' => 0, + 'sort_column' => 'menu_order', + 'menu_class' => 'left-off-canvas-list' + )); +} + add_theme_support('post-thumbnails'); set_post_thumbnail_size(120, 100, true); - -$defaults = array( - 'default-color' => '', - 'default-image' => '', - 'default-repeat' => '', - 'default-position-x' => '', - 'default-attachment' => '', - 'wp-head-callback' => '_custom_background_cb', - 'admin-head-callback' => '', - 'admin-preview-callback' => '' -); -add_theme_support( 'custom-background', $defaults ); -add_theme_support( 'title-tag' ); -add_theme_support( 'custom-logo', array( - 'height' => 200, - 'width' => 400, - 'flex-height' => true, - 'flex-width' => true, - 'header-text' => array ( 'site-title', 'site-description'), -) ); +add_image_size('glm-block-thumb', 280, 186, true); /** * glm_site_scripts * @@ -92,7 +198,7 @@ function glm_site_scripts() 'glm_foundation', get_template_directory_uri() . '/js/app.js', 'jquery', - '1.0', + '1.0.1', true ); if(is_front_page()) { @@ -109,7 +215,7 @@ function glm_get_header() { $image_data = wp_get_attachment_image_src(get_post_thumbnail_id(), "full"); echo ' style="background-image: url('.$image_data[0].');height:0;padding:0;padding-bottom:20%;background-position:center center;background-size: 100%;background-repeat:no-repeat;max-height: 300px; "'; } else { - //echo ' style="background-image: url('.get_template_directory_uri().'/assets/default-header.gif);height:0;padding:0;padding-bottom:30%;background-position:center center;background-size: 100%;background-repeat:no-repeat;max-height: 300px;"'; + echo ' style="background-image: url('.get_template_directory_uri().'/assets/header-image-1000x200.jpg);height:200px;padding:0;background-position:center center;background-size: 100%;background-repeat:no-repeat;width: 1200px;"'; echo ' class="no-featured"'; } echo '>'; @@ -178,3 +284,6 @@ function mytheme_search_loop() { add_action('thematic_searchloop', 'mytheme_search_loop'); // End of the Contextual/Highlight Search functions ?> + + + diff --git a/header.php b/header.php index c0bb978..249bfa9 100644 --- a/header.php +++ b/header.php @@ -12,22 +12,26 @@

-

+

-

+

-

- +

+

Jobs
FAQ
Site Map

+

-

+

-

+ diff --git a/home.php b/home.php index 488e5f8..a16a500 100644 --- a/home.php +++ b/home.php @@ -11,7 +11,7 @@

>

- Posted on +

diff --git a/page-catelog.php b/page-catelog.php new file mode 100644 index 0000000..3467fac --- /dev/null +++ b/page-catelog.php @@ -0,0 +1,27 @@ + + + +

+

+ +

+

+ +

+ + + + +

+ +

+

+ \ No newline at end of file diff --git a/page-map.php b/page-map.php new file mode 100644 index 0000000..a8a37e9 --- /dev/null +++ b/page-map.php @@ -0,0 +1,28 @@ + + + +

+

+ +

+

+ + + +

+ +

+

+ \ No newline at end of file diff --git a/page-slideshow.php b/page-slideshow.php new file mode 100644 index 0000000..f78a7f8 --- /dev/null +++ b/page-slideshow.php @@ -0,0 +1,29 @@ + + + +

+

+ +

+

+ +

+

+ + + +

+ +

+

+ \ No newline at end of file diff --git a/page-table.php b/page-table.php new file mode 100644 index 0000000..8c2b8f9 --- /dev/null +++ b/page-table.php @@ -0,0 +1,26 @@ + + + +

+

+ +

+

+ + + +

+ +

+

+ \ No newline at end of file diff --git a/page.php b/page.php index d01cf52..db77f80 100644 --- a/page.php +++ b/page.php @@ -1,7 +1,10 @@

'; + + get_template_part('parts/glm-kitchen-sink'); + echo '

'; } else { ?>

@@ -9,17 +12,21 @@ get_template_part('parts/bread-crumbs'); ?>

-

+ +

+

+ +

+ -

-

- +

diff --git a/parts/glm-blocks.php b/parts/glm-blocks.php index 636ea4d..ee70b4a 100644 --- a/parts/glm-blocks.php +++ b/parts/glm-blocks.php @@ -2,25 +2,25 @@

-

+

url):?> externalUrl){echo ' target="_blank"';}?>> - thumbnail;?> + ID, 'glm-block-thumb');?> + url):?> +

url):?> externalUrl){echo ' target="_blank"';}?>> -

post_title;?>

+

post_title;?>

url):?>

post_content . $block->post_excerpt;?>

- Read More...

-

diff --git a/parts/off-canvas-menu.php b/parts/off-canvas-menu.php index c9f9451..2614219 100644 --- a/parts/off-canvas-menu.php +++ b/parts/off-canvas-menu.php @@ -1,4 +1,18 @@ diff --git a/parts/sidebar-l.php b/parts/sidebar-l.php new file mode 100644 index 0000000..44049b9 --- /dev/null +++ b/parts/sidebar-l.php @@ -0,0 +1,43 @@ +

+

+ + +

+

\ No newline at end of file diff --git a/parts/slide-show.php b/parts/slide-show.php index 54a975c..400ac02 100644 --- a/parts/slide-show.php +++ b/parts/slide-show.php @@ -1,7 +1,6 @@ - -

- - - -

- \ No newline at end of file +'; + echo do_shortcode("[metaslider id=21]"); + echo '

'; +} +?> diff --git a/parts/top-bar.php b/parts/top-bar.php index 8e2bfb3..21dff7b 100644 --- a/parts/top-bar.php +++ b/parts/top-bar.php @@ -1,6 +1,7 @@ -

Feature Products

Upcoming Events

post_title;?>

post_title;?>

Features