seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

This commit is contained in:
Seth Call 2014-07-13 13:20:40 -05:00
parent 0ea1ef49b8 6b00538436
commit cc7fb9e0ac
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ruby/lib/jam_ruby/models/notification.rb
View File

@ -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
)

2
web/app/assets/javascripts/notificationPanel.js
View File

@ -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",

2
web/app/views/clients/_hoverSession.html.erb
View File

@ -33,7 +33,7 @@
</table>
<br />
SCHEDULE:<br />
<div class="f11 mt5 mb5">Starts at {start_time}</div>
<div class="f11 mt5 mb5">{start_time}</div>
<div class="f11 mt5 mb5">{recurrence}</div>
<br />
<div align="center">

2
web/app/views/dialogs/_rsvpCancelDialog.html.haml
View File

@ -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

1
web/app/views/music_sessions/session_info.html.haml
View File

@ -11,7 +11,6 @@
= image_tag "shared/avatar_generic.png", alt: ""
.creator-name
= @music_session.creator.name
%br/
%span.f12 Session Creator
%br/
%br/