diff --git a/app/controllers/user_admin_controller.rb b/app/controllers/user_admin_controller.rb --- a/app/controllers/user_admin_controller.rb +++ b/app/controllers/user_admin_controller.rb @@ -184,7 +184,7 @@ operation = params[:operation] - if operation!='add' and operation!='remove' + if not ['add','remove','assign'].include? operation flash[:notice] = 'You did not choose the operation to perform.' redirect_to :action => 'contest_management' and return end @@ -203,8 +203,10 @@ if user if operation=='add' user.contests << contest + elsif operation=='remove' + user.contests.delete(contest) else - user.contests.delete(contest) + user.contests = [contest] end note << user.login end diff --git a/app/views/user_admin/contest_management.html.haml b/app/views/user_admin/contest_management.html.haml --- a/app/views/user_admin/contest_management.html.haml +++ b/app/views/user_admin/contest_management.html.haml @@ -6,7 +6,7 @@ = text_area_tag 'login_list', nil, :rows => 25, :cols => 80 %br/ You want to - = select(nil,"operation",[['add users to','add'],['remove users from','remove']]) + = select(nil,"operation",[['assign users to','assign'],['add users to','add'],['remove users from','remove']]) contest = select("contest","id",Contest.all.collect {|c| [c.title, c.id]})      diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -160,16 +160,17 @@ padding-left: 20px; background: #feeefe; } -div.announcementbox { +.announcementbox { margin: 10px 0px; background: #bbddee; padding: 1px; } - div.announcementbox span.title { + .announcementbox span.title { font-weight: bold; color: #224455; padding-left: 10px; line-height: 1.6em; } -div.announcement { + +.announcement { margin: 2px; background: white; padding: 1px; @@ -182,11 +183,11 @@ font-size: 12px; margin: 2px; } -div.pub-info { +.pub-info { text-align: right; font-style: italic; font-size: 9px; } - div.pub-info p { + .pub-info p { text-align: right; font-style: italic; font-size: 9px; } @@ -235,3 +236,7 @@ margin: 10px 0; font-size: 12px; line-height: 1.5em; } + +h2.contest-title { + margin-top: 5px; + margin-bottom: 5px; } diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -194,26 +194,25 @@ background: #feeefe -div - &.announcementbox - margin: 10px 0px - background: #bbddee - padding: 1px +.announcementbox + margin: 10px 0px + background: #bbddee + padding: 1px - span.title - font-weight: bold - color: #224455 - padding-left: 10px - line-height: 1.6em + span.title + font-weight: bold + color: #224455 + padding-left: 10px + line-height: 1.6em - &.announcement - margin: 2px - background: white - padding: 1px - padding-left: 10px - padding-right: 10px - padding-top: 5px - padding-bottom: 5px +.announcement + margin: 2px + background: white + padding: 1px + padding-left: 10px + padding-right: 10px + padding-top: 5px + padding-bottom: 5px .announcement p @@ -221,7 +220,7 @@ margin: 2px -div.pub-info +.pub-info text-align: right font-style: italic font-size: 9px @@ -288,3 +287,7 @@ margin: 10px 0 font-size: 12px line-height: 1.5em + +h2.contest-title + margin-top: 5px + margin-bottom: 5px \ No newline at end of file