cafe-grader-web Commit - r281:ddf493b045db

cafe-grader-web

Commit `r281:ddf493b045db` public

parent | child

Description:

assigns users to a unique contest, small styling on contest title

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r281:ddf493b045db - Thu, 04 Mar 2010 16:01:57 - 4 files changed: 22 inserted, 12 deleted

app/controllers/user_admin_controller.rb ¶ +4 -2

                   redirect_to :action => 'list'
                 end
                 def remove_from_contest
                   user = User.find(params[:id])
                   contest = Contest.find(params[:contest_id])
                   if user and contest
                     user.contests.delete(contest)
                   end
                   redirect_to :action => 'list'
                 end
                 def contest_management
                 end
                 def manage_contest
                   contest = Contest.find(params[:contest][:id])
                   if !contest
                     flash[:notice] = 'You did not choose the contest.'
                     redirect_to :action => 'contest_management' and return
                   end
                   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
                   lines = params[:login_list]
                   if !lines or lines.blank?
                     flash[:notice] = 'You entered an empty list.'
                     redirect_to :action => 'contest_management' and return
                   end
                   note = []
                   lines.split("\n").each do |line|
                     puts line
                     user = User.find_by_login(line.chomp)
                     puts user
                     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
                   end
                   flash[:notice] = 'User(s) ' + note.join(', ') +
                     ' were successfully modified.  '
                   redirect_to :action => 'contest_management'
                 end
                 # admin management
                 def admin
                   @admins = User.find(:all).find_all {|user| user.admin? }
                 end
                 def grant_admin
                   login = params[:login]
                   user = User.find_by_login(login)
                   if user!=nil
                     admin_role = Role.find_by_name('admin')
                     user.roles << admin_role
                   else
                     flash[:notice] = 'Unknown user'
                   end

app/views/user_admin/contest_management.html.haml ¶ +1 -1

               %h1 Bulk edit users in contests
               - form_tag :action => 'manage_contest' do
                 List users' login below; one per line.
                 %br/
                 = 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]})
                 &nbsp;&nbsp;&nbsp;&nbsp;
                 = submit_tag "Perform action", :confirm => 'Are you sure?'
               %hr/
               = link_to '[go back to index]', :action => 'index'

public/stylesheets/application.css ¶ +10 -5

                 border: 2px solid #dddddd;
                 border-collapse: collapse;
                 margin: 10px auto;
                 width: 90%;
                 font-size: 13px; }
                 table.taskdesc p {
                   font-size: 13px; }
                 table.taskdesc tr.name {
                   border: 2px solid #dddddd;
                   background: #dddddd;
                   color: #333333;
                   font-weight: bold;
                   font-size: 14px;
                   line-height: 1.5em;
                   text-align: center; }
                 table.taskdesc td.desc-odd {
                   padding: 5px;
                   padding-left: 20px;
                   background: #fefeee; }
                 table.taskdesc td.desc-even {
                   padding: 5px;
                   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;
                 padding-left: 10px;
                 padding-right: 10px;
                 padding-top: 5px;
                 padding-bottom: 5px; }
               .announcement p {
                 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; }
               .announcement .toggles {
                 font-weight: normal;
                 float: right;
                 font-size: 80%; }
               .announcement .announcement-title {
                 font-weight: bold; }
               div.message {
                 margin: 10px 0 0; }
                 div.message div.message {
                   margin: 0 0 0 30px; }
                 div.message div.body {
                   border: 2px solid #dddddd;
                   background: #fff8f8;
                   padding-left: 5px; }
                 div.message div.reply-body {
                   border: 2px solid #bbbbbb;
                   background: #fffff8;
                   padding-left: 5px; }
                 div.message div.stat {
                   font-size: 10px;
                   line-height: 1.75em;
                   padding: 0 5px;
                   color: #333333;
                   background: #dddddd;
                   font-weight: bold; }
                 div.message div.message div.stat {
                   font-size: 10px;
                   line-height: 1.75em;
                   padding: 0 5px;
                   color: #444444;
                   background: #bbbbbb;
                   font-weight: bold; }
               div.contest-title {
                 color: white;
                 text-align: center;
                 line-height: 2em; }
               div.registration-desc, div.test-desc {
                 border: 1px dotted gray;
                 background: #f5f5f5;
                 padding: 5px;
                 margin: 10px 0;
                 font-size: 12px;
                 line-height: 1.5em; }
+            +
+            + h2.contest-title {
+            +   margin-top: 5px;
+            +   margin-bottom: 5px; }

public/stylesheets/sass/application.sass ¶ +7 -4

                 p
                   font-size: 13px
                 tr.name
                   border: 2px solid #dddddd
                   background: #dddddd
                   color: #333333
                   font-weight: bold
                   font-size: 14px
                   line-height: 1.5em
                   text-align: center
                 td
                   &.desc-odd
                     padding: 5px
                     padding-left: 20px
                     background: #fefeee
                   &.desc-even
                     padding: 5px
                     padding-left: 20px
                     background: #feeefe
-            - div
+            + .announcementbox
-            -   &.announcementbox
                 margin: 10px 0px
                 background: #bbddee
                 padding: 1px
                 span.title
                   font-weight: bold
                   color: #224455
                   padding-left: 10px
                   line-height: 1.6em
-            -   &.announcement
+            + .announcement
                 margin: 2px
                 background: white
                 padding: 1px
                 padding-left: 10px
                 padding-right: 10px
                 padding-top: 5px
                 padding-bottom: 5px
               .announcement p
                 font-size: 12px
                 margin: 2px
-            - div.pub-info
+            + .pub-info
                 text-align: right
                 font-style: italic
                 font-size: 9px
                 p
                   text-align: right
                   font-style: italic
                   font-size: 9px
               .announcement
                 .toggles
                   font-weight: normal
                   float: right
                   font-size: 80%
                 .announcement-title
                   font-weight: bold
               div
                 &.message
                   margin: 10px 0 0
                       color: #333333
                       background: #dddddd
                       font-weight: bold
                     &.message div.stat
                       font-size: 10px
                       line-height: 1.75em
                       padding: 0 5px
                       color: #444444
                       background: #bbbbbb
                       font-weight: bold
                 &.contest-title
                   color: white
                   text-align: center
                   line-height: 2em
                 &.registration-desc, &.test-desc
                   border: 1px dotted gray
                   background: #f5f5f5
                   padding: 5px
                   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

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r281:ddf493b045db - Thu, 04 Mar 2010 16:01:57 - 4 files changed: 22 inserted, 12 deleted

Sign in to your account

Commit r281:ddf493b045db public

Author

r281:ddf493b045db - Thu, 04 Mar 2010 16:01:57 - 4 files changed: 22 inserted, 12 deleted

Commit `r281:ddf493b045db` public