jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改学生作业列表弹出框不正确

This commit is contained in:
sw 2015-03-23 20:36:52 +08:00
parent 221276ba1f
commit 584dcabeaa
3 changed files with 190 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/controllers/bids_controller.rb
View File

@ -230,7 +230,7 @@ class BidsController < ApplicationController
case @bid.reward_type case @bid.reward_type
when 3 when 3
html_title(l(:label_question_student)) html_title(l(:label_question_student))
layout_file = 'base_courses' layout_file = 'base_homework'
when 1 when 1
layout_file = 'base_bids' layout_file = 'base_bids'
else else
@ -307,7 +307,7 @@ class BidsController < ApplicationController
respond_to do |format| respond_to do |format|
if @bid.reward_type == 3 if @bid.reward_type == 3
format.html { format.html {
render :layout => 'base_courses' render :layout => 'base_homework'
} }
elsif @bid.reward_type == 1 elsif @bid.reward_type == 1
format.html { format.html {
@ -333,7 +333,7 @@ class BidsController < ApplicationController
respond_to do |format| respond_to do |format|
if @bid.reward_type == 3 if @bid.reward_type == 3
format.html { format.html {
render :layout => 'base_courses' render :layout => 'base_homework'
} }
elsif @bid.reward_type == 1 elsif @bid.reward_type == 1
format.html { format.html {
@ -361,7 +361,7 @@ class BidsController < ApplicationController
respond_to do |format| respond_to do |format|
if @bid.reward_type == 3 if @bid.reward_type == 3
format.html { format.html {
render :layout => 'base_courses' render :layout => 'base_homework'
} }
elsif @bid.reward_type == 1 elsif @bid.reward_type == 1
format.html { format.html {
@ -439,7 +439,7 @@ class BidsController < ApplicationController
respond_to do |format| respond_to do |format|
if @bid.reward_type == 3 if @bid.reward_type == 3
format.html { format.html {
render :layout => 'base_courses' render :layout => 'base_homework'
} }
elsif @bid.reward_type == 1 elsif @bid.reward_type == 1
format.html { format.html {
@ -533,7 +533,7 @@ class BidsController < ApplicationController
if @bid.reward_type == 3 if @bid.reward_type == 3
format.html { format.html {
html_title(l(:label_homework_info)) html_title(l(:label_homework_info))
render :layout => 'base_courses' render :layout => 'base_homework'
} }
elsif @bid.reward_type == 1 elsif @bid.reward_type == 1
format.html { format.html {
@ -565,7 +565,7 @@ class BidsController < ApplicationController
respond_to do |format| respond_to do |format|
if @bid.reward_type == 3 if @bid.reward_type == 3
format.html { format.html {
render :layout => 'base_courses' render :layout => 'base_homework'
} }
elsif @bid.reward_type == 1 elsif @bid.reward_type == 1
format.html { format.html {
@ -879,7 +879,7 @@ class BidsController < ApplicationController
#render html to prepare create submit homework #render html to prepare create submit homework
find_bid find_bid
find_bid find_bid
render :layout => 'base_courses' render :layout => 'base_homework'
end end
def add_homework def add_homework
@ -942,12 +942,12 @@ class BidsController < ApplicationController
@homework_type = false @homework_type = false
end end
@user = @bid.author @user = @bid.author
render :layout => 'base_courses' render :layout => 'base_homework'
end end
def homework_respond def homework_respond
@user = @bid.author @user = @bid.author
render :layout => 'base_courses' render :layout => 'base_homework'
end end
def more def more
@ -1070,7 +1070,6 @@ class BidsController < ApplicationController
if params[:id] if params[:id]
@bid = Bid.find(params[:id], :include => [{:homeworks => :user}]) @bid = Bid.find(params[:id], :include => [{:homeworks => :user}])
@user = @bid.author @user = @bid.author
@course = @bid.courses.first
end end
rescue rescue
render_404 render_404

2
app/controllers/homework_attach_controller.rb
View File

@ -1,5 +1,5 @@
class HomeworkAttachController < ApplicationController class HomeworkAttachController < ApplicationController
layout "base_courses" layout "course_base"
include CoursesHelper include CoursesHelper
include HomeworkAttachHelper include HomeworkAttachHelper
helper :words helper :words

12
public/stylesheets/css.css
View File

@ -44,11 +44,13 @@ a:hover.tb_all{ background:#eaeaea; text-decoration:none;}
.dis ul li.wping{margin-left:12px; } .dis ul li.wping{margin-left:12px; }
.dis ul li.wping a{ margin-top:18px; margin-bottom:3px; width:43px; height:23px; background:#15bccf; color:#fff; text-align:center; padding-top:3px;} .dis ul li.wping a{ margin-top:18px; margin-bottom:3px; width:43px; height:23px; background:#15bccf; color:#fff; text-align:center; padding-top:3px;}
.dis ul li.wping a:hover{ background-color:#03a1b3;} .dis ul li.wping a:hover{ background-color:#03a1b3;}
/*ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; }*/ /****翻页***/
/*.wlist span{ border:1px solid #15bccf; padding:0 5px; margin-left:3px;}*/ ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; }
/*.wlist a{ border:1px solid #15bccf; padding:0 5px; margin-left:3px;}*/ ul.wlist li{float: left;}
/*.wlist a:hover{ background:#15bccf; color:#fff; text-decoration:none;}*/ ul.wlist li a{ border:1px solid #15bccf; padding: 1px 4px 1px 4px; margin-left:3px;}
/*.wlist_select { background-color:#64bdd9; color:#fff; padding:0 5px; margin-left:3px; border:1px solid #64bdd9;}*/ ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;}
.wlist_select { background-color:#64bdd9; color:#fff; padding: 1px 5px 0px 5px; margin-left:3px;margin-top: -2px; border:1px solid #64bdd9;}
.code_list{ float:right; font-size:12px; color:#484848; padding:5px 3px; border-bottom:2px solid #15bccf; width:687px; } .code_list{ float:right; font-size:12px; color:#484848; padding:5px 3px; border-bottom:2px solid #15bccf; width:687px; }
.code_list a{ color:#787878;} .code_list a{ color:#787878;}
.fr{ float:right;} .fr{ float:right;}