From e5dd3eb730264a29ede916e2dd591910422f46e1 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Tue, 22 Aug 2017 09:03:28 -0400 Subject: [PATCH] Redo how the backbone model will be done. Starting the page out with the smarty template rendering the view so they page load will happen fast. --- data/event_setup.php | 4 +-- js/eventRegApp.js | 8 +++--- js/views/eventReg.js | 8 +----- models/front/registrations/registration.php | 11 ++++----- views/front/registrations/registration.html | 27 +++++++++++++-------- 5 files changed, 28 insertions(+), 30 deletions(-) diff --git a/data/event_setup.php b/data/event_setup.php index 8f70ea1..3cc3ab6 100644 --- a/data/event_setup.php +++ b/data/event_setup.php @@ -8,7 +8,7 @@ $regEventSample = array( // reg_event base data - Base info on this registration event - from reg_event table 'reg_event' => array ( - 'id' => 1000, + 'id' => 1000, 'event_name' => 'GLM Sample Event', 'event_code' => 'glm-sample-event', 'notify_email' => '', @@ -62,7 +62,7 @@ $regEventSample = array( 'id' => 1200, 'reg_event' => 1000, 'name' => 'Standard', - 'descr' => 'Standard registration for this event. Provides all standard attendee priviledges.', + 'descr' => 'Standard registration for this event. Provides all standard attendee privileges.', 'reg_rate' => array ( 1 => array diff --git a/js/eventRegApp.js b/js/eventRegApp.js index 0861517..6bbc324 100644 --- a/js/eventRegApp.js +++ b/js/eventRegApp.js @@ -1,10 +1,8 @@ jQuery(document).ready(function($){ // Use the registration object to build new EventReg - var event1 = new EventReg({ 'event_name': registration.event_name, 'descr': registration.descr }); - - var eventList = new EventRegList( [ event1 ] ); - - var eventRegView = new EventListView({ collection: eventList }); + // var event1 = new EventReg({ 'event_name': registration.event_name, 'descr': registration.descr }); + // var eventList = new EventRegList( [ event1 ] ); + // var eventRegView = new EventListView({ collection: eventList }); }); diff --git a/js/views/eventReg.js b/js/views/eventReg.js index 85092be..d5e0791 100644 --- a/js/views/eventReg.js +++ b/js/views/eventReg.js @@ -6,13 +6,7 @@ var EventRegView = Backbone.View.extend({ className: 'glm-reg-event-item clearfix', - eventRegTpl: _.template( - '

<%= event_name %>

' + - '
' + - '' + - '
' + - '

<%= descr %>

' - ), + eventRegTpl: _.template( $('#eventReg-template').html() ), // Called when the view is first created initialize: function(){ diff --git a/models/front/registrations/registration.php b/models/front/registrations/registration.php index cf8ae17..12fabc1 100644 --- a/models/front/registrations/registration.php +++ b/models/front/registrations/registration.php @@ -98,16 +98,15 @@ // including test data for now include GLM_MEMBERS_REGISTRATIONS_PLUGIN_PATH . '/data/event_setup.php'; - if ( isset( $eventData[$eventRegID] ) ) { - $regEvent[] = $eventData[$eventRegID]; - } else { - $regEvent = array(); - } + // if ( isset( $eventData[$eventRegID] ) ) { + // $regEvent[] = $eventData[$eventRegID]; + // } else { + // $regEvent = array(); + // } // Compile template data $templateData = array( 'entry' => $regEventSample, - 'events' => array(), 'thisJsUrl' => GLM_MEMBERS_REGISTRATIONS_PLUGIN_URL . '/js' ); // Return status, any suggested view, and any data to controller diff --git a/views/front/registrations/registration.html b/views/front/registrations/registration.html index 91ec65b..5e77056 100644 --- a/views/front/registrations/registration.html +++ b/views/front/registrations/registration.html @@ -1,25 +1,33 @@
-