diff --git a/app/models/gather.rb b/app/models/gather.rb index 44b774f..c78c633 100644 --- a/app/models/gather.rb +++ b/app/models/gather.rb @@ -181,11 +181,11 @@ class Gather < ActiveRecord::Base end def can_create? cuser - cuser and cuser.admin? + return true if cuser.admin? or cuser.gather_moderator? end def can_update? cuser - cuser and cuser.admin? + return true if cuser.admin? or cuser.gather_moderator? end def self.last(name = "NS2") diff --git a/app/views/gathers/show.html.erb b/app/views/gathers/show.html.erb index 4e5e9c4..904d405 100644 --- a/app/views/gathers/show.html.erb +++ b/app/views/gathers/show.html.erb @@ -34,22 +34,23 @@ success: function(response, text, request) { if (request.getResponseHeader('Gather') == 'voting') { if (!played) { + var startTime = 110; $("#jplayer").jPlayer({ ready: function() { $(this).jPlayer("setMedia", { mp3: "https://www.ensl.org/sounds/gather-1.mp3" - }).jPlayer("play"); + }).jPlayer("play", startTime); var click = document.ontouchstart === undefined ? 'click' : 'touchstart'; var kickoff = function () { - $("#jplayer").jPlayer("play"); + $("#jplayer").jPlayer("play", startTime); document.documentElement.removeEventListener(click, kickoff, true); }; document.documentElement.addEventListener(click, kickoff, true); }, - loop: true, - volume: 0.5, + loop: false, + volume: 0.45, swfPath: "/flash" }); @@ -180,8 +181,8 @@