From 3652a4b835bd2a2f158796904e983b814201d319 Mon Sep 17 00:00:00 2001 From: Laury GvR Date: Tue, 5 Jul 2016 14:12:51 -0400 Subject: [PATCH] Fixed some typos, clarified admin mgmt, vid styles Fixed some words like "Adming" and "Memnber", mostly comments Added video style change to add some spacing below it on the member detail page. Changed the submenu auto-creation to be friendlier toward existing submenu creation code, and to depend a bit more on functions.php of the theme. Reorganized "list" and "detail" page settings in admin side management. --- classes/data/settings/dataSettingsGeneral.php | 6 +- css/admin.css | 5 + css/front.css | 4 + setup/adminHooks.php | 51 +++-- views/admin/management/index.html | 205 ++++++++---------- views/admin/member/memberInfo.html | 1 + 6 files changed, 125 insertions(+), 147 deletions(-) diff --git a/classes/data/settings/dataSettingsGeneral.php b/classes/data/settings/dataSettingsGeneral.php index 9a62a0d9..ba16f6fe 100644 --- a/classes/data/settings/dataSettingsGeneral.php +++ b/classes/data/settings/dataSettingsGeneral.php @@ -119,14 +119,14 @@ class GlmDataSettingsGeneral extends GlmDataAbstract * Debug Options */ - // Adming Debug + // Admin Debug 'admin_debug' => array( 'field' => 'admin_debug', 'type' => 'checkbox', 'use' => 'a' ), - // Adming Debug Verbose + // Admin Debug Verbose 'admin_debug_verbose' => array( 'field' => 'admin_debug_verbose', 'type' => 'checkbox', @@ -724,7 +724,7 @@ class GlmDataSettingsGeneral extends GlmDataAbstract 'use' => 'a' ), - // Front-end Memnber Detail - Show E-Mail + // Front-end Member Detail - Show E-Mail 'detail_show_email' => array( 'field' => 'detail_show_email', 'type' => 'checkbox', diff --git a/css/admin.css b/css/admin.css index 78f986ea..5ef2f61b 100644 --- a/css/admin.css +++ b/css/admin.css @@ -160,6 +160,11 @@ .glm-admin-image-edit-table td { padding: 5px; } +#video-url-msg { + display: block; + font-size: 12px; + margin-bottom: 10px; +} td.glm-shrink { white-space: nowrap; width: 1px; diff --git a/css/front.css b/css/front.css index c8f8a654..be9b965b 100644 --- a/css/front.css +++ b/css/front.css @@ -777,6 +777,7 @@ input[type="submit"].glm-member-button { #glm-member-detail-links a { display: inline; margin-right: 15px; + text-decoration: none; } #glm-member-detail-links a { color: white; @@ -804,6 +805,9 @@ input[type="submit"].glm-member-button { padding: 5px; } } +.glm-member-detail-video-descr { + margin-top: 20px; +} #glm-locationMap-container { margin-bottom: 0px; } diff --git a/setup/adminHooks.php b/setup/adminHooks.php index ce68039c..157dd991 100644 --- a/setup/adminHooks.php +++ b/setup/adminHooks.php @@ -44,8 +44,8 @@ add_filter('glm-member-db-admin-management-hooksHelp', function($content) { 2 ); -$menuName = "Members Only"; -$menuSlug = "members-only"; +$menuName = "Members Only Menu"; +$menuSlug = "members-only-menu"; // Does the menu exist already? register_nav_menu($menuSlug, $menuName); @@ -63,19 +63,17 @@ if( !$menuExists){ 'menu-item-title' => __('Members Only'), 'menu-item-object-id' => $membersOnlyPageID, 'menu-item-parent-id' => 0, - 'menu-item-position' => 0, 'menu-item-object' => 'page', 'menu-item-type' => 'post_type', - 'menu-item-classes' => 'members-only', + 'menu-item-classes' => 'members-only-menu-item', 'menu-item-status' => 'publish')); wp_update_nav_menu_item($menu_id, 0, array( 'menu-item-title' => __('Members Only Sample Subpage'), 'menu-item-object-id' => 0, - 'menu-item-parent-id' => $membersOnlyPageID, - 'menu-item-position' => 0, + 'menu-item-parent-id' => 0, 'menu-item-object' => 'page', 'menu-item-type' => 'post_type', - 'menu-item-classes' => 'members-only', + 'menu-item-classes' => 'members-only-menu-item', 'menu-item-status' => 'publish')); } @@ -86,24 +84,25 @@ if(!empty($locations)) $locations[$menuSlug] = $menu->term_id; set_theme_mod('nav_menu_locations', $locations); } - -if ( ! function_exists( 'glm_theme_members_only_menu' ) && function_exists('Glm_Theme_Top_Bar_Walker')) { - function glm_theme_members_only_menu() { - wp_nav_menu(array( - 'container' => false, // remove nav container - 'container_class' => 'members-only', // class of container - 'menu' => '', // menu name - 'menu_class' => 'members-only', // adding custom nav class - 'theme_location' => 'members-only', // 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 - 'depth' => 2, // limit the depth of the nav - 'fallback_cb' => false, // fallback function (see below) - 'walker' => new Glm_Theme_Top_Bar_Walker() - )); - } -} +// This function below needs to be defined in the theme's functions.php +// +//if ( ! function_exists( 'glm_members_only_menu' ) && class_exists('GLM_Members_Only_Walker')) { +// function glm_members_only_menu() { +// wp_nav_menu(array( +// 'container' => false, // remove nav container +// 'container_class' => 'members-only-menu', // class of container +// 'menu' => '', // menu name +// 'menu_class' => 'members-only-menu', // adding custom nav class +// 'theme_location' => 'members-only-menu', // 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 +// 'depth' => 2, // limit the depth of the nav +// 'fallback_cb' => false, // fallback function (see below) +// 'walker' => new GLM_Members_Only_Walker() +// )); +// } +//} ?> \ No newline at end of file diff --git a/views/admin/management/index.html b/views/admin/management/index.html index ff70e93d..b255257f 100644 --- a/views/admin/management/index.html +++ b/views/admin/management/index.html @@ -136,90 +136,13 @@ - - - - - - - - - - - - - - - - - - - - - - +
Show Map: - -

Map Options:

 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Show Member Name as Link to Detail:
Map Opened by Default:
Show Logo:
Logo Size: - -
Show Description:
Show Short Description:
Show Address:
Show Street:
Show City, State, ZIP:
Show Country:
Show Region:
Show Phone:
Show Toll Free:
Show URL: - - Display URL as a link: -
Show E-mail:
Show Categories:
Show Credit Cards:
Show Amenities:
Show Packages:
Show Packages Link:
-
Show Search Form: - -

Search Form Options:

 - - - - - - - - - -
Text Search:
Category Search:
Amenities Search:
Show Alpha Index:
Filter Box Opened by Default:
Floating Search Box:
Floating Search Distance From Top:px
-
Show Member List: - -
- - -

Member List Options

 + + @@ -263,74 +186,82 @@

Member List Display Options

Show Member List:
Show Member Name as Link to Detail:
Show Member Logo:
Show Amenities:
- - - - - - - - - -

Map Options:

- +
Show Map: - -
- + + + + + + + - - - - - - - - - + + + + + + + + + + - - - - + + + + + +
Show Logo:

Member List Map Options

Show Map:
Show Member Name as Link to Detail:
Map Opened by Default:
Show Logo:
Logo Size: - + {foreach from=$genSettings.fieldData.list_map_logo_size.list item=v} {/foreach}
Show Description:
Show Short Description:
Show Address:
Show Street:
Show City, State, ZIP:
Show Country:
Show Region:
Show Phone:
Show Toll Free:
Show Description:
Show Short Description:
Show Address:
Show Street:
Show City, State, ZIP:
Show Country:
Show Region:
Show Phone:
Show Toll Free:
Show URL: - - Display URL as a link: + + Display URL as a link:
Show E-mail:
Show Categories:
Show Credit Cards:
Show Amenitiies:
Show E-mail:
Show Categories:
Show Credit Cards:
Show Amenities:
Show Packages:
Show Packages Link:
Show Directions: - + + + + + + + + + +

Member List Search Form Options

Show Search Form:
Text Search:
Category Search:
Amenities Search:
Show Alpha Index:
Filter Box Opened by Default:
Floating Search Box:
Floating Search Distance From Top:px
+ + + + -

Member Detail Options:

+ +
+ @@ -369,7 +300,45 @@

Member Detail Display Options

Show Member Logo:
Logo Size: {if $genSettings.fieldFail.detail_logo_size}

{$genSettings.fieldFail.detail_logo_size}

{/if}
Show Events:
Show Video:
- 		+ + + + + + + + + + + + + + + + + + + + + + + + + + +

Member Detail Map Options

Show Map:
Show Logo:
Logo Size: + +
Show Description:
Show Short Description:
Show Address:
Show Street:
Show City, State, ZIP:
Show Country:
Show Region:
Show Phone:
Show Toll Free:
Show URL: + + Display URL as a link: +
Show E-mail:
Show Categories:
Show Credit Cards:
Show Amenities:
Show Directions:
+
diff --git a/views/admin/member/memberInfo.html b/views/admin/member/memberInfo.html index 5f7e71c9..f6856f72 100644 --- a/views/admin/member/memberInfo.html +++ b/views/admin/member/memberInfo.html @@ -607,6 +607,7 @@ {if $memberInfo.fieldFail.video_url}

{$memberInfo.fieldFail.video_url}

{/if} + Only YouTube and Vimeo links are supported -- 2.17.1