From 6b00538436c4ba0c7900d794bca654310d57ccb9 Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Sun, 13 Jul 2014 13:36:56 -0400 Subject: [PATCH] miscellaneous formatting fixes --- ruby/lib/jam_ruby/models/notification.rb | 19 ++++++++++--------- .../assets/javascripts/notificationPanel.js | 2 +- web/app/views/clients/_hoverSession.html.erb | 2 +- .../views/dialogs/_rsvpCancelDialog.html.haml | 2 +- .../music_sessions/session_info.html.haml | 1 - 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ruby/lib/jam_ruby/models/notification.rb b/ruby/lib/jam_ruby/models/notification.rb index 9f0f1fc37..f8f59807d 100644 --- a/ruby/lib/jam_ruby/models/notification.rb +++ b/ruby/lib/jam_ruby/models/notification.rb @@ -1,4 +1,5 @@ module JamRuby + class Notification < ActiveRecord::Base @@log = Logging.logger[Notification] @@ -598,7 +599,7 @@ module JamRuby source_user.photo_url, notification_msg, music_session.name, - music_session.pretty_scheduled_start(true), + music_session.pretty_scheduled_start(false), notification.id, notification.created_date ) @@ -638,7 +639,7 @@ module JamRuby source_user.id, instruments.join('|'), music_session.name, - music_session.pretty_scheduled_start(true), + music_session.pretty_scheduled_start(false), notification.id, notification.created_date ) @@ -672,7 +673,7 @@ module JamRuby music_session.id, notification_msg, music_session.name, - music_session.pretty_scheduled_start(true), + music_session.pretty_scheduled_start(false), notification.id, notification.created_date ) @@ -706,7 +707,7 @@ module JamRuby music_session.id, notification_msg, music_session.name, - music_session.pretty_scheduled_start(true), + music_session.pretty_scheduled_start(false), notification.id, notification.created_date ) @@ -741,7 +742,7 @@ module JamRuby music_session.id, notification_msg, music_session.name, - music_session.pretty_scheduled_start(true), + music_session.pretty_scheduled_start(false), notification.id, notification.created_date ) @@ -782,7 +783,7 @@ module JamRuby music_session.id, notification_msg, music_session.name, - music_session.pretty_scheduled_start(true), + music_session.pretty_scheduled_start(false), notification.id, notification.created_date ) @@ -825,7 +826,7 @@ module JamRuby music_session.id, notification_msg, music_session.name, - music_session.pretty_scheduled_start(true), + music_session.pretty_scheduled_start(false), notification.id, notification.created_date ) @@ -867,7 +868,7 @@ module JamRuby music_session.id, notification_msg, music_session.name, - music_session.pretty_scheduled_start(true), + music_session.pretty_scheduled_start(false), notification.id, notification.created_date ) @@ -913,7 +914,7 @@ module JamRuby notification_msg, comment, music_session.name, - music_session.pretty_scheduled_start(true), + music_session.pretty_scheduled_start(false), notification.id, notification.created_date ) diff --git a/web/app/assets/javascripts/notificationPanel.js b/web/app/assets/javascripts/notificationPanel.js index ba59f0945..6c43937f1 100644 --- a/web/app/assets/javascripts/notificationPanel.js +++ b/web/app/assets/javascripts/notificationPanel.js @@ -808,7 +808,7 @@ "icon_url": context.JK.resolveAvatarUrl(payload.photo_url) }, [{ id: "btn-more-info", - text: "More Info", + text: "MORE INFO", "layout-action": "close", href: JK.root_url + "/sessions/" + payload.session_id + "/details", rel: "external", diff --git a/web/app/views/clients/_hoverSession.html.erb b/web/app/views/clients/_hoverSession.html.erb index a25d0493e..c9081737f 100644 --- a/web/app/views/clients/_hoverSession.html.erb +++ b/web/app/views/clients/_hoverSession.html.erb @@ -33,7 +33,7 @@
SCHEDULE:
-
Starts at {start_time}
+
{start_time}
{recurrence}

diff --git a/web/app/views/dialogs/_rsvpCancelDialog.html.haml b/web/app/views/dialogs/_rsvpCancelDialog.html.haml index 633a30642..016a12df0 100644 --- a/web/app/views/dialogs/_rsvpCancelDialog.html.haml +++ b/web/app/views/dialogs/_rsvpCancelDialog.html.haml @@ -18,7 +18,7 @@ %textarea.txtComment{id: 'txtComment', rows: '2', placeholder: 'Enter a comment...'} .buttons .left - %a.button-orange{:href => 'TBD', :rel => 'external', :target => '_blank'} HELP + %a.button-orange{:href => 'http://jamkazam.desk.com', :rel => 'external', :target => '_blank'} HELP .right %a.button-grey{:id => 'btnCancel', 'layout-action' => 'close'} CANCEL %a.button-orange{:id => 'btnCancelRsvp'} CANCEL RSVP \ No newline at end of file diff --git a/web/app/views/music_sessions/session_info.html.haml b/web/app/views/music_sessions/session_info.html.haml index 2014afc81..85167838d 100644 --- a/web/app/views/music_sessions/session_info.html.haml +++ b/web/app/views/music_sessions/session_info.html.haml @@ -11,7 +11,6 @@ = image_tag "shared/avatar_generic.png", alt: "" .creator-name = @music_session.creator.name - %br/ %span.f12 Session Creator %br/ %br/