diff --git a/web/app/assets/javascripts/dialog/rsvpSubmitDialog.js b/web/app/assets/javascripts/dialog/rsvpSubmitDialog.js index 9b29fcb28..d81b1de38 100644 --- a/web/app/assets/javascripts/dialog/rsvpSubmitDialog.js +++ b/web/app/assets/javascripts/dialog/rsvpSubmitDialog.js @@ -10,6 +10,7 @@ var dialogId = 'rsvp-submit-dialog'; var $btnSubmit = $("#btnSubmitRsvp"); + function beforeShow(data) { $('.error', $dialog).hide(); } @@ -56,7 +57,6 @@ $btnSubmit.unbind('click'); $btnSubmit.click(function(e) { e.preventDefault(); - var error = false; var slotIds = []; var selectedSlots = []; @@ -96,7 +96,11 @@ if (!error) { $dialog.triggerHandler(EVENTS.RSVP_SUBMITTED); - app.layout.closeDialog(dialogId); + + // Show confirmation & calendar; hide regular buttons. + $(".rsvp-options").addClass("hidden") + $(".rsvp-confirm").removeClass("hidden") + $(".buttons").addClass("hidden") } }) .fail(function(xhr, textStatus, errorMessage) { diff --git a/web/app/assets/stylesheets/dialogs/rsvpDialog.css.scss b/web/app/assets/stylesheets/dialogs/rsvpDialog.css.scss index fc5c4879c..ff7c66b83 100644 --- a/web/app/assets/stylesheets/dialogs/rsvpDialog.css.scss +++ b/web/app/assets/stylesheets/dialogs/rsvpDialog.css.scss @@ -3,6 +3,33 @@ .rsvp-dialog { min-height:initial; + height:auto; + + .rsvp-confirm { + color: white; + margin-top: 1em; + .ics-feed-caption { + font-size: 1.2em; + margin: 0em 0em 1em 0em; + } + + .ics-feed-link { + font-size: 1.1em; + margin: 0.5em 0em 1em 0em; + } + + .ics-help-link { + display: inline; + font-size: 0.8em; + padding-right: 2em; + } + + .confirm-buttons { + text-align: center; + margin: 1em 0em 0em 0em; + } + } + .session-name { margin:3px 0 0; diff --git a/web/app/views/clients/_account_sessions.html.haml b/web/app/views/clients/_account_sessions.html.haml index 2d46b75f4..6489fb7e1 100644 --- a/web/app/views/clients/_account_sessions.html.haml +++ b/web/app/views/clients/_account_sessions.html.haml @@ -23,6 +23,7 @@ %tbody .clearall .content-wrapper + .ics-feed-caption Following is a URL for your personal JamKazam .ics calendar, which tracks all sessions and events to which you have RSVP'd: =render "calendar" / end content scrolling area diff --git a/web/app/views/clients/_calendar.html.slim b/web/app/views/clients/_calendar.html.slim index 9c0817619..85c808d2f 100644 --- a/web/app/views/clients/_calendar.html.slim +++ b/web/app/views/clients/_calendar.html.slim @@ -1,9 +1,9 @@ -if current_user .account-calendar - .ics-feed-caption Following is a URL for your personal JamKazam .ics calendar, which tracks all sessions and events to which you have RSVP'd: .ics-feed-link =api_users_calendar_feed_url(current_user) - .ics-help-link - a href="" How to subscribe to your feed in Google Calendar - .ics-help-link - a href="" How to subscribe to your feed in Microsoft Outlook + .ics-help-links + .ics-help-link + a href="" How to subscribe to your calendar in Google Calendar + .ics-help-link + a href="" How to subscribe to your calendar in Microsoft Outlook diff --git a/web/app/views/dialogs/_rsvpSubmitDialog.html.haml b/web/app/views/dialogs/_rsvpSubmitDialog.html.haml index 1135fde57..8006e6106 100644 --- a/web/app/views/dialogs/_rsvpSubmitDialog.html.haml +++ b/web/app/views/dialogs/_rsvpSubmitDialog.html.haml @@ -7,16 +7,27 @@ .session-name .scheduled-start .schedule-recurrence - .part - .slot-instructions Check the box(es) next to the track(s) you want to play in the session: - .error{:style => 'display:none'} - .rsvp-instruments + .rsvp-options + .part + .slot-instructions Check the box(es) next to the track(s) you want to play in the session: + .error{:style => 'display:none'} + .rsvp-instruments + + .comment-instructions Enter a message to the other musicians in the session (optional): + %textarea.txtComment{rows: '2', placeholder: 'Enter a comment...'} + .rsvp-confirm.hidden + %p SUCCESS! + %br + %p We recommend that you subscribe to your own personal JamKazam calendar in your favorite calendar app to help you remember this session, as well as other sessions and events to which you RSVP. + %br + %p Here is the URL for your calendar: + =render "calendar" + .confirm-buttons + %a#btnClose.button-grey{'layout-action' => 'close'} CLOSE - .comment-instructions Enter a message to the other musicians in the session (optional): - %textarea.txtComment{rows: '2', placeholder: 'Enter a comment...'} .buttons .left - %a.button-grey{:href => 'http://jamkazam.desk.com', :rel => 'external', :target => '_blank'} HELP + %a#btnHelp.button-grey{:href => 'http://jamkazam.desk.com', :rel => 'external', :target => '_blank'} HELP .right - %a.button-grey{:id => 'btnCancel', 'layout-action' => 'close'} CANCEL - %a.button-orange{:id => 'btnSubmitRsvp'} SUBMIT RSVP \ No newline at end of file + %a#btnCancel.button-grey{'layout-action' => 'close'} CANCEL + %a#btnSubmitRsvp.button-orange SUBMIT RSVP \ No newline at end of file