From 98f8908ff462de387c9bf392a46020b011238757 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Fri, 4 Jan 2019 14:21:23 -0500 Subject: [PATCH] Theme updates Updating theme to get rid of some php notices. Updating theme member list view files to get it more like the main plugin version. Planning on merging everything in to main plugin. --- glm-member-db/views/front/members/list.html | 504 ++++++++++---------- inc/custom.php | 22 +- inc/menu-walker.php | 14 +- template-parts/search-overlay.php | 4 +- 4 files changed, 276 insertions(+), 268 deletions(-) diff --git a/glm-member-db/views/front/members/list.html b/glm-member-db/views/front/members/list.html index bedf082..e0345c9 100644 --- a/glm-member-db/views/front/members/list.html +++ b/glm-member-db/views/front/members/list.html @@ -1,8 +1,11 @@ +{include file='front/members/header.html'} +
+{if $view != 'no-map'} {if $settings.selected_map_interface == 1} @@ -11,6 +14,8 @@ + + {/if} {if $settings.selected_map_interface == 2} @@ -18,146 +23,126 @@ {/if} - - - {include file='front/members/header.html'} - +{/if} {apply_filters('glm-member-db-front-members-list-pageTop', '')}
{if $settings.list_show_map}
Map
{/if} + {if $settings.list_show_search} +
+
+ FILTERS +
+
+
Close
+
+ {if isset($smarty.request.s)}{/if} +
+ {apply_filters('glm-member-db-front-members-list-searchFormTop', '')} +
+

Refine Search

+
+ {if $settings.list_show_search_category} +
+ By Category: + + +
+ {/if} + {if $settings.list_show_search_amenities} + {if $amenities|@count gt 0} +
+ By Amenities: + +
+ {/if} + {/if} + {if $settings.list_show_search_region} + {if $regions|@count gt 0} +
+ By Regions: + +
+ {/if} + {/if} -{if $settings.list_show_search} -
-
- FILTERS -
-
-
Close
- - {if isset($smarty.request.s)} - - {/if} -
- {apply_filters('glm-member-db-front-members-list-searchFormTop', '')} -
-

Refine Search

-
- {if $settings.list_show_search_category} -
- By Category: - - + {if $cities|@count gt 0} +
+ By Cities: + +
+ {/if} -
- {/if} - {if $settings.list_show_search_amenities} - {if $amenities|@count gt 0} -
- By Amenities: - -
- {/if} - {/if} - {if $settings.list_show_search_region} - {if $regions|@count gt 0} -
- By Regions: - +
{/if} - {foreach from=$regions item=v} - - {/foreach} - +
+ {apply_filters('glm-member-db-front-members-list-searchFormBottom', '')}
- {/if} + +
+
+ {/if} {*list_show_search*} + {if $settings.list_show_map} + + {apply_filters('glm-member-db-front-members-list-mapTop', '')} +
+ + {if $settings.selected_map_interface == 1} + +
{/if} - {if $cities|@count gt 0} -
- By Cities: - -
+ {if $settings.selected_map_interface == 2} + +
(map loads here)
{/if} - - {if $settings.list_show_search_text} -
- By Name: -
- {/if} -
- {apply_filters('glm-member-db-front-members-list-searchFormBottom', '')}
- -
-
-{/if} {*list_show_search*} - -{if $settings.list_show_map} - - {apply_filters('glm-member-db-front-members-list-mapTop', '')} -
- - {if $settings.selected_map_interface == 1} - -
- {/if} - - {if $settings.selected_map_interface == 2} - -
(map loads here)
- {/if} - -
- {apply_filters('glm-member-db-front-members-list-mapBottom', '')} -{/if} - -{apply_filters('glm-member-db-front-members-list-listHeaderTop', '')} + {apply_filters('glm-member-db-front-members-list-mapBottom', '')} + {/if} + {apply_filters('glm-member-db-front-members-list-listHeaderTop', '')} - -
+ +
{* endless map bubbles *} {foreach $mapItems as $m}
{apply_filters('glm-member-db-front-members-list-mapBubbleTop', '', $m.member)} @@ -195,14 +180,12 @@ {if $m.region && $settings.list_map_show_region}Region: {$m.region}
{/if} {if $m.url && $settings.list_map_show_url}Website
{/if}

- + {if isset($m.descr) && $settings.list_map_show_descr}{$m.descr|nl2br}
{/if} {if $m.short_descr && $settings.list_map_show_short_descr}{$m.short_descr|truncate:200}
{/if} {if $settings.list_map_show_detaillink && !$m.has_no_profile} More Info {/if} - {if $m.categories && $settings.list_map_show_categories} + {if isset($m.categories) && $settings.list_map_show_categories}
{$terms.term_member_cap} Categories
    @@ -240,76 +223,109 @@ {apply_filters('glm-member-db-front-members-list-mapBubbleBottom', '', $m.member)}
{/foreach} -
- -{if $settings.list_show_list && !$blankStart} - {if $settings.list_header_text} -

{$settings.list_header_text}

- {elseif apply_filters('is_page', 'search')} -

List of {$terms.term_member_plur_cap}

- {/if} - - {* endless map bubbles *} -
{$terms.term_member_plur_cap} found: {$membersFound}
+ {if $settings.list_show_list && !$blankStart} + {if $settings.list_header_text} +

{$settings.list_header_text}

+ {elseif apply_filters('is_page', 'search')} +

List of {$terms.term_member_plur_cap}

+ {else} +

List of {$terms.term_member_plur_cap}

+ {/if} +
{* maybe a bad div? *} + {if $haveMembers} - {apply_filters('glm-member-db-front-members-list-listHeaderBottom', '')} +
{$terms.term_member_plur_cap} found: {$membersFound}
- + {apply_filters('glm-member-db-front-members-list-listHeaderBottom', '')} -
+ - {if $settings.list_show_search_alpha && !apply_filters("is_page", 'search')} -
- All - {foreach $alphaList as $a} - {$a.alpha} - {/foreach} -
- {/if} +
+ {if $settings.list_show_search_alpha && !apply_filters("is_page", 'search')} +
+ All + {foreach $alphaList as $a} + {$a.alpha} + {/foreach} +
+ {/if} - {if $paging} -
- -
- showing {$start} through {$lastDisplayed} of {$filteredMembersFound} - {/if} + {if $paging} +
+ +
+ showing {$start} through {$lastDisplayed} of {$filteredMembersFound} + {/if} - {* Loading members with ajax *} -
- loading... -
+ {* Loading members with ajax *} +
+ loading... +
- {if $paging} -
- - {if $nextStart} - [ Load More ] - {/if} -
- showing {$start} through {$lastDisplayed} of {$filteredMembersFound} - {/if} + {if $paging} +
+ + {if $nextStart} + [ Load More ] + {/if} +
+ showing {$start} through {$lastDisplayed} of {$filteredMembersFound} + {/if} - {apply_filters('glm-member-db-front-members-list-pageBottom', '')} + {apply_filters('glm-member-db-front-members-list-pageBottom', '')} - {else} -
(no {$terms.term_member_plur} listed)
- {/if} + {else} +
(no {$terms.term_member_plur} listed)
+ {/if} -
-
+
+
-{/if} {*list_show_list*} + {/if} {*list_show_list*} -
-
- +
+
{include file='front/footer.html'} diff --git a/inc/custom.php b/inc/custom.php index 85c2724..e265bc2 100644 --- a/inc/custom.php +++ b/inc/custom.php @@ -689,14 +689,14 @@ function select_dropdown_cities() { wp_reset_postdata(); -add_filter('admin_footer_text', remove_admin_footer_text, 1000); - -function remove_admin_footer_text($footer_text =''){ - return ''; -} - -add_filter('update_footer', remove_admin_footer_upgrade, 1000); - -function remove_admin_footer_upgrade($footer_text =''){ - return ''; -} +// add_filter('admin_footer_text', remove_admin_footer_text, 1000); +// +// function remove_admin_footer_text($footer_text =''){ +// return ''; +// } +// +// add_filter('update_footer', remove_admin_footer_upgrade, 1000); +// +// function remove_admin_footer_upgrade($footer_text =''){ +// return ''; +// } diff --git a/inc/menu-walker.php b/inc/menu-walker.php index 9c40c60..7dccfc6 100644 --- a/inc/menu-walker.php +++ b/inc/menu-walker.php @@ -11,16 +11,16 @@ class Glm_Theme_Top_Bar_Walker extends Walker_Nav_Menu { $hasThumb = has_post_thumbnail($element->object_id); $hasExcerpt = has_excerpt($element->object_id); } - - $numChildren = count( $children_elements[ $element->ID ] ); - + + $numChildren = ( isset( $children_elements[$element->ID] ) ) ? count( $children_elements[$element->ID] ): 0; + $element->has_children = ! empty( $children_elements[ $element->ID ] ); $element->classes[] = "object-id-" . $element->object_id; $element->classes[] = ( $element->current || $element->current_item_ancestor ) ? 'active' : ''; $element->classes[] = ( $element->has_children && 1 !== $max_depth ) ? '' : ''; $element->classes[] = ( $element->post_parent == 0 && $mainLevelCounter < 6 ) ? '' : 'drop-left'; - $element->classes[] = ( $hasThumb) ? 'dropdown-image' : 'no-dropdown-image'; - $element->classes[] = ( $hasExcerpt) ? 'has-excerpt' : 'no-excerpt'; + $element->classes[] = ( isset( $hasThumb ) && $hasThumb) ? 'dropdown-image' : 'no-dropdown-image'; + $element->classes[] = ( isset( $hasExcerpt ) && $hasExcerpt ) ? 'has-excerpt' : 'no-excerpt'; $element->classes[] = ( $numChildren > 9 ) ? 'three-col' : 'one-col'; parent::display_element( $element, $children_elements, $max_depth, $depth, $args, $output ); } @@ -33,7 +33,7 @@ class Glm_Theme_Top_Bar_Walker extends Walker_Nav_Menu { $item_style = ''; if ($depth == 0 && has_post_thumbnail((int)$object->object_id)) { - + $thumbnail = wp_get_attachment_image_src(get_post_thumbnail_id((int)$object->object_id), 'dropdown-image'); // $item_style .= ""; @@ -51,7 +51,7 @@ class Glm_Theme_Top_Bar_Walker extends Walker_Nav_Menu { // border: 2px solid white; // } // "; - + } else { // $item_style .= ""; } diff --git a/template-parts/search-overlay.php b/template-parts/search-overlay.php index 9197871..9dd9560 100644 --- a/template-parts/search-overlay.php +++ b/template-parts/search-overlay.php @@ -38,7 +38,7 @@ $cities = $decode_array['cities']; - + @@ -54,7 +54,7 @@ $cities = $decode_array['cities']; - + -- 2.17.1