From: Chuck Scott Date: Fri, 22 Apr 2016 17:46:46 +0000 (-0400) Subject: Now using member terms X-Git-Tag: v2.0.0^2~31 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=e457803544be42f672dd18253a76b7bd8aad4e25;p=WP-Plugins%2Fglm-member-db.git Now using member terms --- diff --git a/controllers/admin.php b/controllers/admin.php index fab3f2c4..fd8fb2d8 100644 --- a/controllers/admin.php +++ b/controllers/admin.php @@ -561,7 +561,7 @@ class glmMembersAdmin extends GlmPluginSupport wp_add_dashboard_widget( 'glm_members_admin_dashboard_widget', - 'Member DB Summary', + 'GLM Associate', function() {$this->controller('dashboardWidget'); } ); diff --git a/lib/GlmDataAbstract/DataAbstract.php b/lib/GlmDataAbstract/DataAbstract.php index d2486e8e..58b7e419 100755 --- a/lib/GlmDataAbstract/DataAbstract.php +++ b/lib/GlmDataAbstract/DataAbstract.php @@ -1843,42 +1843,46 @@ abstract class GlmDataAbstract } function timeOutput($f, $d) { + // Default values if no time returned + $hour = 12; + $min = 00; + $ampm = 'AM'; + // Build picklists for time input $time_list = $this->buildTimeFieldLists(); // Get current time value $t = explode(':', $d); if (count($t) != 3) { - // No current time value set + + // No valid time value returned from database $time = ''; - } else { - // Assemble Text time - $ampm = 'AM'; - $hour = ($t[0] - 0); - if ($hour > 11) { - $ampm = 'PM'; - $time_list['ampm']['P']['default'] = true; - } else { - $time_list['ampm']['A']['default'] = true; - } - if ($hour > 12) { - $hour -= 12; - } + } else { - $min = $t[1]; - $time_list['hour'][$hour]['default'] = true; - $time_list['min'][$min]['default'] = true; + $t = strtotime($d); - $time = sprintf('%2d:%02d %s', $hour, $min, $ampm); + // Get hour & min without leading 0's and AM/PM in caps + $hour = date('g', $t); + $min = (date('i', $t)-0); + $ampm = date('A', $t); } + // Set time picklist active values + $time_list['hour'][$hour]['default'] = true; + $time_list['min'][$min]['default'] = true; + $time_list['ampm'][$ampm[0]]['default'] = true; + + // Create text time + $time = sprintf('%2d:%02d %s', $hour, $min, $ampm); + // If a time format is specified, use that. See PHP date() for format specification if (isset($f['time_format'])) { $time = date( $f['time_format'], strtotime($time)); } + // Assemble output array with text time and picklists data $r = array( 'time' => $time, 'time_list' => $time_list @@ -1891,7 +1895,7 @@ abstract class GlmDataAbstract $this->inputFieldStatus = true; $hour = 12; $min = 00; - $ampm = 'PM'; + $ampm = 'AM'; // Build picklists for time input $time_list = $this->buildTimeFieldLists(); @@ -1899,32 +1903,20 @@ abstract class GlmDataAbstract // If this is setup for a new entry, then just return default value if ($op == 'n') { - $time = ''; - - // Get default - Needs to be in format "00:00:00" 24 hour time + // Get default - Needs to be in format "12:00 AM" 12 hour time if (isset($f['default'])) { - $def = explode(':', $f['default']); - $ampm = 'AM'; - if (isset($def[0])) { - if ($def[0] >= 12) { - $ampm = 'PM'; - } - if ($def[0] > 12) { - $hour = $def[0] -12; - } else { - $hour = $def[0]; - } - } - if (isset($def[1])) { - $min = $def[1]; - } else { - $min = 00; - } + + $t = explode(':', $f['default']); + $t2 = explode(' ', $t[1]); + + $hour = $t[0]; + $min = $t2[0]; + $ampm = $t2[1]; } - // Otherwise we should be getting input from the user - } else { + // Otherwise we should be getting input from the user + } else { $this->inputErrorReason = false; @@ -1933,29 +1925,53 @@ abstract class GlmDataAbstract if (isset($_REQUEST[$as.'_hour'])) { // Validate hour input - $hour = ($_REQUEST[$as.'_hour'] - 0); - $min = ($_REQUEST[$as.'_min'] - 0); + $hour = sprintf("%02d",($_REQUEST[$as.'_hour'] - 0)); + $min = sprintf("%02d",($_REQUEST[$as.'_min'] - 0)); $ampm = ($_REQUEST[$as.'_ampm'] == 'P' ? 'PM' : 'AM'); } elseif (isset($_REQUEST[$as])) { - // Looks like it's a plain text input + // Looks like it's a plain text input so we need to sort that out + // Note: we can't trust PHP strtotime() to do this in odd cases $t = explode(':', $_REQUEST[$as]); if (count($t) >= 2) { - $ampm = 'AM'; - $hour = ($t[0] - 0); + // Clear up hours and minutes + $hour = sprintf("%02d",($t[0] - 0)); + $min = sprintf("%02d",($t[1] - 0)); + + // Check if 24h time (no am/pm) + if (!preg_match("/[aApP]/", $t[1])) { + + // If after noon + if ($hour >= 12) { + $ampm = 'PM'; + + // If 1PM or later + if ($hour >= 13) { + $hour = sprintf("%02d", ($hour-12)); + } + + } elseif ($hour == 0) { + $hour = 12; + } + + + // Otherwise it's 12h format + } else { + + // Convert 0 hours to 12 + if ($hour == '00') { + $hour == 12; + } + + // Check for PM + if (preg_match("/[pP]/", $t[1])) { + $ampm = 'PM'; + } - // Check PM - $isAM = stripos($t[1], 'a'); - if ($hour > 11 || $isAM === false) { - $ampm = 'PM'; - } - if ($hour > 12) { - $hour -= 12; } - $min = ($t[1] - 0); } } @@ -1972,7 +1988,8 @@ abstract class GlmDataAbstract $time_list['hour'][$hour]['default'] = true; $time_list['min'][$min]['default'] = true; - if ($ampm == 'PM') { + // Check for AM/PM + if (preg_match("/[pP]/", $ampm)) { $time_list['ampm']['P']['default'] = true; } else { $time_list['ampm']['A']['default'] = true; @@ -1991,7 +2008,10 @@ abstract class GlmDataAbstract if ($hour < 12 && $ampm == 'PM') { $store_hour += 12; } - $time_store = sprintf('%02d:%02d:00', $store_hour, $min); + if ($hour == 12 && $ampm == 'AM') { + $store_hour = 00; + } + $time_store = sprintf('%02d:%02d', $store_hour, $min); $r = array( 'time' => $time, @@ -2003,7 +2023,6 @@ abstract class GlmDataAbstract } function timeStore($in, $f) { - return "'".$in['time_store']."'"; } diff --git a/lib/GlmDataAbstract/documentation.odt b/lib/GlmDataAbstract/documentation.odt index 033ff2c4..383a0b09 100644 Binary files a/lib/GlmDataAbstract/documentation.odt and b/lib/GlmDataAbstract/documentation.odt differ diff --git a/models/admin/dashboardWidget/index.php b/models/admin/dashboardWidget/index.php index 5a17e713..1b99b3e5 100644 --- a/models/admin/dashboardWidget/index.php +++ b/models/admin/dashboardWidget/index.php @@ -165,8 +165,8 @@ class GlmMembersAdmin_dashboardWidget_index extends GlmDataMembers 'haveAmenities' => $haveAmenities, 'haveRegions' => $haveRegions, 'haveCities' => $haveCities, - 'pendingList' => $pendingList, - 'addOns' => $this->config['addOns'] + 'pendingList' => $pendingList +// 'addOns' => $this->config['addOns'] ); // Return status, suggested view, and data to controller diff --git a/setup/adminMenus.php b/setup/adminMenus.php index 570852af..4385537b 100644 --- a/setup/adminMenus.php +++ b/setup/adminMenus.php @@ -30,14 +30,13 @@ * */ - // If user can manage all members, then show "Members" menu item if (apply_filters('glm_members_menu_members', true)) { $mainMenuSlug = 'glm-members-admin-menu-members'; add_menu_page( - 'Members', + $this->config['terms']['term_admin_menu_members'], 'GLM Associate', 'glm_members_main_menu', 'glm-members-admin-menu-members', @@ -49,8 +48,8 @@ if (apply_filters('glm_members_menu_members', true)) { // Add a sub-submenu for the "Member" "List" page add_submenu_page( 'glm-members-admin-menu-members', - 'Members List', - 'Members', + $this->config['terms']['term_admin_menu_member_list'], + $this->config['terms']['term_admin_menu_members'], 'glm_members_main_menu', 'glm-members-admin-menu-members', function() {$this->controller('members', 'index');} @@ -59,7 +58,7 @@ if (apply_filters('glm_members_menu_members', true)) { // Add a sub-submenu for the "Member" "List" page add_submenu_page( 'glm-members-admin-menu-members', - 'Members List', + $this->config['terms']['term_admin_menu_member_list'], '    List', 'glm_members_main_menu', 'glm-members-admin-menu-members-list', @@ -70,8 +69,8 @@ if (apply_filters('glm_members_menu_members', true)) { if (apply_filters('glm_members_menu_member', true)) { add_submenu_page( $mainMenuSlug, - 'Member Dashboard', - 'Member', + $this->config['terms']['term_admin_menu_member'].' Dashboard', + $this->config['terms']['term_admin_menu_member'], 'glm_members_member', 'glm-members-admin-menu-member', function() {$this->controller('member');} @@ -84,8 +83,8 @@ if (apply_filters('glm_members_menu_members', true)) { $mainMenuSlug = 'glm-members-admin-menu-member'; add_menu_page( - 'Member', - 'Member', + $this->config['terms']['term_admin_menu_member'], + $this->config['terms']['term_admin_menu_member'], 'glm_members_main_menu', 'glm-members-admin-menu-member', function() {$this->controller('member');}, diff --git a/views/admin/dashboardWidget/index.html b/views/admin/dashboardWidget/index.html index 883d3461..f888b5c9 100644 --- a/views/admin/dashboardWidget/index.html +++ b/views/admin/dashboardWidget/index.html @@ -2,60 +2,60 @@ {if apply_filters('glm_members_permit_admin_widget_members', true)} {if $membersList} + Number of {$terms.term_member_plur_cap} Listed: List Members{$numbMembers} - Member Search: + {$terms.term_member_cap} Search: + - {/if} - {/if} {if apply_filters('glm_members_permit_admin_widget_warnings', true)} {if !$haveMemberTypes} - No Member Types + No {$terms.term_member_cap} Types Add {/if} {if !$haveCategories} - No Member Categories + No {$terms.term_member_cap} Categories Add {/if} @@ -79,40 +79,41 @@ {/if} {if $numbMembers == 0} - No Members - Add a Member + No {$terms.term_member_plur_cap} + Add a {$terms.term_member_cap} {/if} - Number of Members Listed: List Members{$numbMembers} - - {if $haveBadLatLon} -
-

Records with Bad Map Locations

- - - - {assign var="i" value="0"} - {foreach $badLatLonList as $p} - {if $i++ is odd by 1} - - {else} - - {/if} - - - {/foreach} - -
- {$p.member}: {$p.reference_name} -
+ + +

Records with Bad Map Locations

+ + + + {assign var="i" value="0"} + {foreach $badLatLonList as $p} + {if $i++ is odd by 1} + + {else} + + {/if} + + + {/foreach} + +
+ {$p.member}: {$p.reference_name} +
+ + {/if} {/if} + {if apply_filters('glm_members_permit_admin_widget_pending_info', true)} {if $membersPending}
-

Pending Member Information

+

Pending {$terms.term_member_cap} Information

@@ -135,5 +136,3 @@
{/if} {/if} - - \ No newline at end of file diff --git a/views/admin/member/header.html b/views/admin/member/header.html index f556daf1..cfcdb418 100644 --- a/views/admin/member/header.html +++ b/views/admin/member/header.html @@ -10,14 +10,14 @@

{if $haveMember} - Member: {$memberName} + {$terms.term_member_cap}: {$memberName} {else} - New Member + New {$terms.term_member_cap} {/if}

- Member Dashboard + {$terms.term_member_cap} Dashboard {if $memberID} {foreach $addOnTabs as $a} {$a.text} diff --git a/views/admin/member/index.html b/views/admin/member/index.html index 908cb392..1d356f9e 100644 --- a/views/admin/member/index.html +++ b/views/admin/member/index.html @@ -5,7 +5,7 @@ {if $memberUpdated} -

Member Updated

+

{$terms.term_member_cap} Updated

{/if} {if $haveMember} @@ -15,7 +15,7 @@ - + @@ -24,22 +24,22 @@
Member Slug:{$terms.term_member_cap} Slug: {$member.fieldData.member_slug}
Date created:{$member.fieldData.created.date}
- + - +
Member Display & Access:{$terms.term_member_cap} Display & Access: {$member.fieldData.access.name}
Member Type:{$terms.term_member_cap} Type: {$member.fieldData.member_type.name}
- Edit Member Name and Status + Edit {$terms.term_member_cap} Name and Status
{else} -

No member information available.

+

No {$terms.term_member} information available.

{/if}

 

@@ -51,11 +51,11 @@ {/if}

-

Member Profile Versions

+

{$terms.term_member_cap} Profile Versions

Show archived information   - Add New Member Information Version + Add New {$terms.term_member_cap} Information Version

@@ -101,7 +101,7 @@ {/if} {/foreach} {else} - Click here to start entering information for this member. + Click here to start entering information for this {$terms.term_member}. {/if} @@ -109,12 +109,12 @@ {/if} {else} -

You do not have any Member Types setup.

-

You must have at least one Member Type to add a new member.

- Click here to add Member Types. +

You do not have any {$terms.term_member_cap} Types setup.

+

You must have at least one {$terms.term_member_cap} Type to add a new {$terms.term_member}.

+ Click here to add {$terms.term_member_cap} Types. {/if} {else} -

No member currently selected.

+

No {$terms.term_member} currently selected.

{/if} diff --git a/views/admin/member/memberEdit.html b/views/admin/member/memberEdit.html index 7b6affee..d4c0b011 100644 --- a/views/admin/member/memberEdit.html +++ b/views/admin/member/memberEdit.html @@ -6,12 +6,12 @@

{if $addingMember} - Add New Member + Add New {$terms.term_member_cap} {else} - Edit Member Name and Status + Edit {$terms.term_member_cap} Name and Status {/if} - {if $memberUpdated}Member Updated{/if} - {if $memberUpdateError}Member Update Error{/if} + {if $memberUpdated}{$terms.term_member_cap} Updated{/if} + {if $memberUpdateError}{$terms.term_member_cap} Update Error{/if}

@@ -32,7 +32,7 @@ - + - + - +
Member Name:{$terms.term_member_cap} Name: {if $member.fieldFail.name}

{$member.fieldFail.name}

{/if} @@ -49,7 +49,7 @@ {/if}
Member Display & Access:{$terms.term_member_cap} Display & Access:
Member Type:{$terms.term_member_cap} Type: {if $member.fieldFail.notes}

{$member.fieldFail.notes}

{/if}
This "Notes" field is not displayed anywhere else. It is strictly for making and keeping - notes related to this member profile. + notes related to this {$terms.term_member} profile.

* Required

{if $addingMember} - + {else} {/if} @@ -94,22 +94,22 @@ {if $haveMember} - + - + - + @@ -161,17 +161,17 @@
Member Name:{$terms.term_member_cap} Name: {$member.fieldData.name}
Member Display & Access:{$terms.term_member_cap} Display & Access: {$member.fieldData.access.name}
Member Type:{$terms.term_member_cap} Type: {$member.fieldData.member_type.name}
Date created:{$member.fieldData.created.date}
  -

Member Address

+

{$terms.term_member_cap} Address

The map below will display the likely location as you enter or edit the address.
Notes:{$member.fieldData.notes}
{else} -

No member information available.

+

No {$terms.term_member} information available.

{/if} {/if} {else} -

You do not have any Member Types setup.

-

You must have at least one Member Type to add a new member.

- Click here to add Member Types. +

You do not have any {$terms.term_member_cap} Types setup.

+

You must have at least one {$terms.term_member_cap} Type to add a new member.

+ Click here to add {$terms.term_member_cap} Types. {/if} {else} -

No member currently selected.

+

No {$terms.term_member} currently selected.

{/if} diff --git a/views/admin/member/memberInfo.html b/views/admin/member/memberInfo.html index 651a68e2..aeadb429 100644 --- a/views/admin/member/memberInfo.html +++ b/views/admin/member/memberInfo.html @@ -12,33 +12,33 @@ {if $memberInfoID && $memberInfo} -
Delete this Member Profile Version
-
+
Delete this {$terms.term_member_cap} Profile Version
+
{if $memberInfo.fieldData.status.value == 10}

Cancel

- NOTE: This member profile is the currently active version! You may not delete an active profile version. + NOTE: This {$terms.term_member} profile is the currently active version! You may not delete an active profile version. To delete this version, please select another version to be active or change the "Profile Status" on this page to something other than "Active".

If you change this version to something other than "Active" without selecting another version as active, there will be no active - profile for this member. Members without an active profile will not be displayed on the front-end of this Web site. + profile for this {$terms.term_member}. {$terms.term_member_cap} without an active profile will not be displayed on the front-end of this Web site.

- Click the "Member Dashboard" tab above to see all profile versions for this member and optionally to select another version to + Click the "{$terms.term_member_cap} Dashboard" tab above to see all profile versions for this {$terms.term_member} and optionally to select another version to be active.

{else}

Cancel

-

+

WARNING:

- Clicking the "Delete this Member Profile Version" button above will - delete all of the data and images displayed on this page and any other information in the tabs that may show to the right of the "Member Profile" + Clicking the "Delete this {$terms.term_member_cap} Profile Version" button above will + delete all of the data and images displayed on this page and any other information in the tabs that may show to the right of the "{$terms.term_member_cap} Profile" tab above.

@@ -46,24 +46,24 @@

- This member may also have other member profile records. Click the "Member Dashboard" Tab above to view a list of all profile version - records for this member. + This {$terms.term_member} may also have other {$terms.term_member} profile records. Click the "{$terms.term_member_cap} Dashboard" Tab above to view a list of all profile version + records for this {$terms.term_member}.

- Only this member profile version will be deleted. Other member profile versions listed under the "Member Dashboard" tab + Only this {$terms.term_member} profile version will be deleted. Other {$terms.term_member} profile versions listed under the "{$terms.term_member_cap} Dashboard" tab above will not be deleted.

- There may also be "Archived" versions that will not normally show up in the "Member Dashboard". Click the + There may also be "Archived" versions that will not normally show up in the "{$terms.term_member_cap} Dashboard". Click the "Show Archiived Profile Versions" checkbox at the top right of the versions list on that page to include archived versions.

{/if}
-

Edit Member Profile

+

Edit {$terms.term_member_cap} Profile

{else} -

Add New Member Profile

+

Add New {$terms.term_member_cap} Profile

{/if}
@@ -80,7 +80,7 @@ - + {if $memberInfoID && $memberInfo} @@ -98,8 +98,8 @@ Categories & AmenitiesImagesCredit Cards - {if $memberUpdated}Member Profile Updated{/if} - {if $memberUpdateError}Member Profile Update Error{/if} + {if $memberUpdated}{$terms.term_member_cap} Profile Updated{/if} + {if $memberUpdateError}{$terms.term_member_cap} Profile Update Error{/if} @@ -108,9 +108,9 @@ @@ -145,7 +145,7 @@ @@ -158,7 +158,7 @@

{$memberInfo.fieldFail.notes}

{/if}
This "Notes" field is not displayed anywhere else. It is strictly for making and keeping notes related to this - member profile. + {$terms.term_member} profile.
Member Name:{$terms.term_member_cap} Name: {$member.name}
Profile Name: - + {if $memberInfo.fieldFail.reference_name}

{$memberInfo.fieldFail.reference_name}

{/if}
- The "Profile Name" field is used to help identify this particular member profile. Members may have multiple profiles, + The "Profile Name" field is used to help identify this particular {$terms.term_member} profile. {$terms.term_member_plur_cap} may have multiple profiles, only one of which can be active at a time. Multiple profiles make it easy to manage separate sets of information that may be used at different times, for example seasons of the year or for special events (i.e. "Winter Profile").
Short Description: - + {if $memberInfo.fieldFail.short_descr}

{$memberInfo.fieldFail.short_descr}

{/if}
@@ -262,7 +262,7 @@
Map Location Using Above Address

- MAP USE: Drag the pointer to the desired location for this member. + MAP USE: Drag the pointer to the desired location for this {$terms.term_member}. Use + and - buttons or the mouse wheel to zoom in or out. Click and drag anywhere else on the map to move to another area.

@@ -554,9 +554,9 @@ {/if} {else} - Note: Images may only be added to member profile records that have been created. + Note: Images may only be added to {$terms.term_member} profile records that have been created. You are editing information to create a new record. -
After you click "Add new member" below, you may come back here to add images to the gallery. +
After you click "Add new {$terms.term_member}" below, you may come back here to add images to the gallery. {/if} @@ -577,7 +577,7 @@

* Required

- +
@@ -586,12 +586,12 @@ - - + + - + diff --git a/views/admin/members/header.html b/views/admin/members/header.html index 4e3963e0..c70bcd42 100644 --- a/views/admin/members/header.html +++ b/views/admin/members/header.html @@ -1,8 +1,8 @@
-

All Members

+

All {$terms.term_member_plur_cap}

Dashboard - Members List + {$terms.term_member_plur_cap} List {foreach $addOnTabs as $a} {$a.text} {/foreach} diff --git a/views/admin/members/index.html b/views/admin/members/index.html index 2df82d35..0b8609d8 100644 --- a/views/admin/members/index.html +++ b/views/admin/members/index.html @@ -1,7 +1,7 @@ {include file='admin/members/header.html'} {if apply_filters('glm_members_permit_admin_members_index_add_member', true)} - Add A New Member + Add A New {$terms.term_member_cap} {/if}

Main Dashboard

@@ -9,21 +9,21 @@
{if apply_filters('glm_members_permit_admin_members_index_member_config_warning', true)} {if !$haveMemberTypes} - - + + {/if} {if !$haveCategories} - - + + {/if} {if !$haveAmenities} @@ -49,23 +49,23 @@ {if $numbMembers == 0} - - + + {/if}
Member Name:{$member.name}
Member Type:{$member.member_type.name}
{$terms.term_member_cap} Name:{$member.name}
{$terms.term_member_cap} Type:{$member.member_type.name}
Access:{$member.access.name}
Created:{$memberInfo.fieldData.create_time.datetime}
Last Updated:{$memberInfo.fieldData.modify_time.datetime}
Member Info Status:{$memberInfo.fieldData.status.name}
{$terms.term_member_cap} Info Status:{$memberInfo.fieldData.status.name}
Reference Name:{$memberInfo.fieldData.reference_name}
 
- Member Search: + {$terms.term_member_cap} Search:
You do not have any Member Types setup.Click here to add Member Types.You do not have any {$terms.term_member_cap} Types setup.Click here to add {$terms.term_member_cap} Types.
You do not have any Member Categories setup.Click here to add Member Categories.You do not have any {$terms.term_member_cap} Categories setup.Click here to add {$terms.term_member_cap} Categories.
 
You do not have any members listed.Click here to create your first member. You do not have any {$terms.term_member_plur} listed.Click here to create your first {$terms.term_member}.
- +
Number of Members Listed: {$numbMembers}
Number of {$terms.term_member_plur_cap} Listed: {$numbMembers}
{if $haveBadLatLon} -

 
Member Profile with Bad Map Location Information

+

 
{$terms.term_member_cap} Profile with Bad Map Location Information

- + @@ -96,12 +96,12 @@ {/if} {if $membersPending} -

 
Pending Member Profile

+

 
Pending {$terms.term_member_cap} Profile

Member Name{$terms.term_member_cap} Name Created
- + diff --git a/views/admin/members/list.html b/views/admin/members/list.html index c4abd3ca..861fe670 100644 --- a/views/admin/members/list.html +++ b/views/admin/members/list.html @@ -7,7 +7,7 @@

- + Categories: Text Search:

-

List of Members

+

List of {$terms.term_member_plur_cap}


{if $paging} - {if $prevStart}{/if} - {if $nextStart}{/if} + {if $prevStart}{/if} + {if $nextStart}{/if} {/if}
Member Name{$terms.term_member_cap} Name Last Updated Reference Name
- + - + @@ -63,14 +63,14 @@ {/foreach} {else} - + {/if}
IDMember Name{$terms.term_member_cap} Name AccessMember Type{$terms.term_member_cap} Type
(no members listed)
(no {$terms.term_member_plur} listed)
{if $paging} - {if $prevStart}{/if} - {if $nextStart}{/if} + {if $prevStart}{/if} + {if $nextStart}{/if} {/if} diff --git a/views/admin/settings/header.html b/views/admin/settings/header.html index a69ee22e..88b56402 100644 --- a/views/admin/settings/header.html +++ b/views/admin/settings/header.html @@ -3,8 +3,8 @@

{$glmPluginName} Settings

- Member Types - Member Categories + {$terms.term_member_cap} Types + {$terms.term_member_cap} Categories Amenities Cities Regions diff --git a/views/admin/settings/index.html b/views/admin/settings/index.html index 0ea75916..e43dc6c5 100644 --- a/views/admin/settings/index.html +++ b/views/admin/settings/index.html @@ -1,15 +1,15 @@ {include file='admin/settings/header.html'} -
Add a Member Type
-
+
Add a {$terms.term_member_cap} Type
+
- + @@ -23,28 +23,28 @@
Member Type Name:{$terms.term_member_cap} Type Name:

* Required

Cancel - +
-
+

Are you sure you want to delete this member type?

-

Yes, delete this member type

+

Yes, delete this {$terms.term_member} type

Cancel

-
+
- + @@ -58,23 +58,23 @@
Member Type Name:{$terms.term_member_cap} Type Name:

* Required

Cancel - +
-

Member Types

+

{$terms.term_member_cap} Types

{if $couldNotDelete}

- Member Type could not be deleted. Type is in use by at least one member. - Click here to see the members list. + {$terms.term_member_cap} Type could not be deleted. Type is in use by at least one {$terms.term_member}. + Click here to see the {$terms.term_member_plur} list.

{/if} - + @@ -100,7 +100,7 @@ {/foreach} {else} - + {/if}
Member Type{$terms.term_member_cap} Type Description  
(no member types listed)
(no {$terms.term_member} types listed)
diff --git a/views/admin/shortcodes/index.html b/views/admin/shortcodes/index.html index afed993f..b9cfc4e8 100644 --- a/views/admin/shortcodes/index.html +++ b/views/admin/shortcodes/index.html @@ -4,7 +4,7 @@

Listed below are the shortcodes that may be used in this Web site to display - member lists, member detail information, maps of members, and other related + {$terms.term_member} lists, {$terms.term_member} detail information, maps of {$terms.term_member_plur}, and other related information. Simply paste these codes into a the text content editor for a page in this Web site. You may also include other text along with the shortcode. Some shortcodes allow for additional "attributes" you can use to more specifically