From: Chuck Scott Date: Fri, 22 Mar 2019 19:44:45 +0000 (-0400) Subject: Updated class and class methods names to be compliant with format specifications X-Git-Tag: v1.4.1^2~2 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=16de6c389bb16a3993f80e87c58bb40a97592f7c;p=WP-Plugins%2Fglm-member-db-registrations.git Updated class and class methods names to be compliant with format specifications --- diff --git a/models/front/registrations/registration.php b/models/front/registrations/registration.php index bca56df..db8b028 100755 --- a/models/front/registrations/registration.php +++ b/models/front/registrations/registration.php @@ -59,19 +59,19 @@ * Enqueue required scripts */ // Select frontRegApp.js script to be enqueued - glmScriptRegistry::select( glmScriptType::Script, 'RegApp' ); + GlmScriptRegistry::selectScript( GlmScriptType::Script, 'RegApp' ); // If we're using Leaflet - Enqueue Leaflet scripts and styles if ( $this->config['settings']['selected_map_interface'] == 1 ) { - glmScriptRegistry::select( glmScriptType::Style, 'Leaflet' ); - glmScriptRegistry::select( glmScriptType::Script, 'Leaflet' ); - glmScriptRegistry::select( glmScriptType::Style, 'LeafletControlLoading' ); - glmScriptRegistry::select( glmScriptType::Script, 'LeafletControlLoading' ); + GlmScriptRegistry::selectScript( GlmScriptType::Style, 'Leaflet' ); + GlmScriptRegistry::selectScript( GlmScriptType::Script, 'Leaflet' ); + GlmScriptRegistry::selectScript( GlmScriptType::Style, 'LeafletControlLoading' ); + GlmScriptRegistry::selectScript( GlmScriptType::Script, 'LeafletControlLoading' ); } // If we're using Google Maps - Enqueue Google Maps script if ( $this->config['settings']['selected_map_interface'] == 2 ) { - glmScriptRegistry::select( glmScriptType::Script, 'GoogleMapsAPI' ); + GlmScriptRegistry::selectScript( GlmScriptType::Script, 'GoogleMapsAPI' ); } // Get any provided option diff --git a/setup/registerAdminScriptStyle.php b/setup/registerAdminScriptStyle.php index 26ee514..cf5243c 100644 --- a/setup/registerAdminScriptStyle.php +++ b/setup/registerAdminScriptStyle.php @@ -14,7 +14,7 @@ */ /** - * This file registers scripts and styles with the glmScriptRegistry. + * This file registers scripts and styles with the GlmScriptRegistry. * * Scripts and Styles are added to the registry to ensure consistancy and avoid duplication. * This process only lists them in the registry. A further step of calling the enqueue() @@ -28,7 +28,7 @@ * it may be the same for a matching script and style (the plugin slug and type prefix the * 'handle' provided below to make them actually unique). * - * int type Required type enumerated (see glmScriptType above) + * int type Required type enumerated (see GlmScriptType above) * string handle Required handle (name) for this script (no spaces or punctuation) * Handles must be unique for a particular type * A matching script and style may have the same handle @@ -50,9 +50,9 @@ * * Example - Please add multi-line comment above each with script src for reference * - * glmScriptRegistry::add( + * GlmScriptRegistry::addScript( * [ - * 'type' => glmScriptType::Script, + * 'type' => GlmScriptType::Script, * 'handle' => 'RegApp', * 'src' => GLM_MEMBERS_REGISTRATIONS_PLUGIN_URL . '/js/frontRegApp.js', * 'deps' => array( diff --git a/setup/registerFrontScriptStyle.php b/setup/registerFrontScriptStyle.php index b3189d9..f5b1fe1 100644 --- a/setup/registerFrontScriptStyle.php +++ b/setup/registerFrontScriptStyle.php @@ -14,7 +14,7 @@ */ /** - * This file registers scripts and styles with the glmScriptRegistry. + * This file registers scripts and styles with the GlmScriptRegistry. * * Scripts and Styles are added to the registry to ensure consistancy and avoid duplication. * This process only lists them in the registry. A further step of calling the enqueue() @@ -28,7 +28,7 @@ * it may be the same for a matching script and style (the plugin slug and type prefix the * 'handle' provided below to make them actually unique). * - * int type Required type enumerated (see glmScriptType above) + * int type Required type enumerated (see GlmScriptType above) * string handle Required handle (name) for this script (no spaces or punctuation) * Handles must be unique for a particular type * A matching script and style may have the same handle @@ -50,9 +50,9 @@ * * Example - Please add multi-line comment above each with script src for reference * - * glmScriptRegistry::add( + * GlmScriptRegistry::addScript( * [ - * 'type' => glmScriptType::Script, + * 'type' => GlmScriptType::Script, * 'handle' => 'RegApp', * 'src' => GLM_MEMBERS_REGISTRATIONS_PLUGIN_URL . '/js/frontRegApp.js', * 'deps' => array( @@ -76,9 +76,9 @@ /* * {registrations}/js/frontRegApp.js */ -glmScriptRegistry::add( +GlmScriptRegistry::addScript( [ - 'type' => glmScriptType::Script, + 'type' => GlmScriptType::Script, 'handle' => 'RegApp', 'src' => GLM_MEMBERS_REGISTRATIONS_PLUGIN_URL . '/js/frontRegApp.js', 'deps' => array( diff --git a/views/front/registrations/registration.html b/views/front/registrations/registration.html index 3179a15..e5d1c64 100755 --- a/views/front/registrations/registration.html +++ b/views/front/registrations/registration.html @@ -59,7 +59,7 @@
{if $regEvent.locations.city.name}{$regEvent.locations.city.name}{/if}, {$regEvent.locations.state.name} {$regEvent.locations.zip} {/if} - {if ($standAlone && $regEvent.contact_name) || (!$standAlone && $regEvent.lname) || $regEvent.contact_email || $regEvent.contact_phone} + {if ($standAlone && $regEvent.contact_name) || (!$standAlone && $regEvent.contact_lname) || $regEvent.contact_email || $regEvent.contact_phone}
Contact & More Info
{if $standAlone}