Description:
assigns users to a unique contest, small styling on contest title
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
Jittat Fakcharoenphol
-
r281:ddf493b045db - - 4 files changed: 22 inserted, 12 deleted
| @@ -184,7 +184,7 | |||
|
|
184 | 184 | |
|
|
185 | 185 | operation = params[:operation] |
|
|
186 | 186 | |
|
|
187 | - if operation!='add' and operation!='remove' | |
|
|
187 | + if not ['add','remove','assign'].include? operation | |
|
|
188 | 188 | flash[:notice] = 'You did not choose the operation to perform.' |
|
|
189 | 189 | redirect_to :action => 'contest_management' and return |
|
|
190 | 190 | end |
| @@ -203,8 +203,10 | |||
|
|
203 | 203 | if user |
|
|
204 | 204 | if operation=='add' |
|
|
205 | 205 | user.contests << contest |
|
|
206 | + elsif operation=='remove' | |
|
|
207 | + user.contests.delete(contest) | |
|
|
206 | 208 | else |
|
|
207 |
- user.contests |
|
|
|
209 | + user.contests = [contest] | |
|
|
208 | 210 | end |
|
|
209 | 211 | note << user.login |
|
|
210 | 212 | end |
| @@ -6,7 +6,7 | |||
|
|
6 | 6 | = text_area_tag 'login_list', nil, :rows => 25, :cols => 80 |
|
|
7 | 7 | %br/ |
|
|
8 | 8 | You want to |
|
|
9 | - = select(nil,"operation",[['add users to','add'],['remove users from','remove']]) | |
|
|
9 | + = select(nil,"operation",[['assign users to','assign'],['add users to','add'],['remove users from','remove']]) | |
|
|
10 | 10 | contest |
|
|
11 | 11 | = select("contest","id",Contest.all.collect {|c| [c.title, c.id]}) |
|
|
12 | 12 | |
| @@ -160,16 +160,17 | |||
|
|
160 | 160 | padding-left: 20px; |
|
|
161 | 161 | background: #feeefe; } |
|
|
162 | 162 | |
|
|
163 |
- |
|
|
|
163 | + .announcementbox { | |
|
|
164 | 164 | margin: 10px 0px; |
|
|
165 | 165 | background: #bbddee; |
|
|
166 | 166 | padding: 1px; } |
|
|
167 |
- |
|
|
|
167 | + .announcementbox span.title { | |
|
|
168 | 168 | font-weight: bold; |
|
|
169 | 169 | color: #224455; |
|
|
170 | 170 | padding-left: 10px; |
|
|
171 | 171 | line-height: 1.6em; } |
|
|
172 | - div.announcement { | |
|
|
172 | + | |
|
|
173 | + .announcement { | |
|
|
173 | 174 | margin: 2px; |
|
|
174 | 175 | background: white; |
|
|
175 | 176 | padding: 1px; |
| @@ -182,11 +183,11 | |||
|
|
182 | 183 | font-size: 12px; |
|
|
183 | 184 | margin: 2px; } |
|
|
184 | 185 | |
|
|
185 |
- |
|
|
|
186 | + .pub-info { | |
|
|
186 | 187 | text-align: right; |
|
|
187 | 188 | font-style: italic; |
|
|
188 | 189 | font-size: 9px; } |
|
|
189 |
- |
|
|
|
190 | + .pub-info p { | |
|
|
190 | 191 | text-align: right; |
|
|
191 | 192 | font-style: italic; |
|
|
192 | 193 | font-size: 9px; } |
| @@ -235,3 +236,7 | |||
|
|
235 | 236 | margin: 10px 0; |
|
|
236 | 237 | font-size: 12px; |
|
|
237 | 238 | line-height: 1.5em; } |
|
|
239 | + | |
|
|
240 | + h2.contest-title { | |
|
|
241 | + margin-top: 5px; | |
|
|
242 | + margin-bottom: 5px; } | |
| @@ -194,8 +194,7 | |||
|
|
194 | 194 | background: #feeefe |
|
|
195 | 195 | |
|
|
196 | 196 | |
|
|
197 | - div | |
|
|
198 | - &.announcementbox | |
|
|
197 | + .announcementbox | |
|
|
199 | 198 |
|
|
|
200 | 199 |
|
|
|
201 | 200 |
|
| @@ -206,7 +205,7 | |||
|
|
206 | 205 |
|
|
|
207 | 206 |
|
|
|
208 | 207 | |
|
|
209 |
- |
|
|
|
208 | + .announcement | |
|
|
210 | 209 |
|
|
|
211 | 210 |
|
|
|
212 | 211 |
|
| @@ -221,7 +220,7 | |||
|
|
221 | 220 | margin: 2px |
|
|
222 | 221 | |
|
|
223 | 222 | |
|
|
224 |
- |
|
|
|
223 | + .pub-info | |
|
|
225 | 224 | text-align: right |
|
|
226 | 225 | font-style: italic |
|
|
227 | 226 | font-size: 9px |
| @@ -288,3 +287,7 | |||
|
|
288 | 287 | margin: 10px 0 |
|
|
289 | 288 | font-size: 12px |
|
|
290 | 289 | line-height: 1.5em |
|
|
290 | + | |
|
|
291 | + h2.contest-title | |
|
|
292 | + margin-top: 5px | |
|
|
293 | + margin-bottom: 5px No newline at end of file | |
You need to be logged in to leave comments.
Login now