From afbcc3f8d3f10fe8ccdb98ea298dd547cfaf4ce8 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Mon, 29 Dec 2014 10:42:48 +0800 Subject: [PATCH] =?UTF-8?q?1.#1742=20=E9=A6=96=E6=AC=A1=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=AE=9E=E8=B7=B5=E5=B9=B3=E5=8F=B0=E4=B8=BB?= =?UTF-8?q?=E9=A1=B5=E6=97=B6=EF=BC=8C=E7=82=B9=E5=87=BB=E2=80=9C=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E8=AF=BE=E7=A8=8B=E2=80=9D=E5=BF=AB=E6=8D=B7=E9=80=9A?= =?UTF-8?q?=E9=81=93=EF=BC=8C=E8=AF=BE=E7=A8=8BID=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E6=98=AF=E5=BD=93=E5=89=8D=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=90=8D=EF=BC=8C=E5=8F=A3=E4=BB=A4=E9=BB=98=E8=AE=A4=E4=B8=BA?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7=E5=AF=86?= =?UTF-8?q?=E7=A0=81=202.=E4=BF=AE=E6=94=B9=E5=8A=A0=E5=85=A5=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=E5=BC=B9=E5=87=BA=E6=A1=86=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/_join_private_course.html.erb | 18 +++++++++++---- app/views/courses/join_private_courses.js.erb | 8 ++++++- app/views/welcome/course.html.erb | 22 ++++++++++++++----- 3 files changed, 38 insertions(+), 10 deletions(-) diff --git a/app/views/courses/_join_private_course.html.erb b/app/views/courses/_join_private_course.html.erb index e3e75b9d7..343e7252a 100644 --- a/app/views/courses/_join_private_course.html.erb +++ b/app/views/courses/_join_private_course.html.erb @@ -13,7 +13,7 @@ a{ text-decoration:none; } a:hover{ } - + .alert_box {width:488px;height:550px;position:fixed;z-index:1002;left:50%;top:40%;margin:-215px 0 0 -300px; background:#fff; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; box-shadow:0px 0px 8px #194a81; padding:5px; overflow:auto; } #popbox{width:488px;height:308px;} .alert .C{width:476px;height:296px;position:absolute;left:5px;top:5px; } .C_top{ margin-top:20px; width:368px; height:100px; background:#e9e9e9; padding:0px 60px; } @@ -21,7 +21,7 @@ .C_top p{ color:#a9aaaa; line-height:22px;} .C_form{ margin:20px 0 0 60px;} .C_form ul li{ font-size:14px; color:#3f3a39; line-height:30px; } - .C_form ul li input{ margin-left:30px; border:0px; border:1px solid #e1e1e1; color:#898989; padding-left:5px; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; } + .C_form ul li input{ margin-left:20px; border:0px; border:1px solid #e1e1e1; color:#898989; padding-left:5px; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; padding: 0 !important; } .C_form ul li.mB5{ color:#898989; font-size:12px; padding-left:90px;} .width190{ width:190px; height:26px; border-color:#e1e1e1;} .C_form a{ font-size:12px; color:#15bccf; float:left; display:block; height:40px; width:200px; margin-top:25px;} @@ -35,6 +35,11 @@ hideModal(obj); $("#new-watcher-form").submit(); } + + function hidden_join_course_form() + { + hideModal($("#popbox")); + } @@ -55,6 +60,7 @@
  • 课 程 ID： +
  • 课程ID是所在课程网址中显示的序号
  • @@ -62,8 +68,12 @@
  • - <%= l(:label_new_join) %> - <%= l(:button_cancel)%> + + <%= l(:label_new_join) %> + + + <%= l(:button_cancel)%> +
    • <% end%> diff --git a/app/views/courses/join_private_courses.js.erb b/app/views/courses/join_private_courses.js.erb index 0cf723f6b..254311ce7 100644 --- a/app/views/courses/join_private_courses.js.erb +++ b/app/views/courses/join_private_courses.js.erb @@ -1,3 +1,9 @@ $('#ajax-modal').html('<%= escape_javascript(render :partial => 'join_private_course') %>'); showModal('ajax-modal', '510px'); -$('#ajax-modal').css('height','330px'); \ No newline at end of file +$('#ajax-modal').css('height','330px'); +$('#ajax-modal').siblings().remove(); +$('#ajax-modal').before("" + + ""); +$('#ajax-modal').parent().removeClass("alert_praise"); +$('#ajax-modal').parent().css("top","").css("left",""); +$('#ajax-modal').parent().addClass("alert_box"); diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb index 5886f0525..47433b30d 100644 --- a/app/views/welcome/course.html.erb +++ b/app/views/welcome/course.html.erb @@ -55,13 +55,19 @@ <% end %> <% unless @course_page.nil? %> - <%= @course_page.title %> + + <%= @course_page.title %> + <% if @school_id.nil? and (User.current.user_extensions.nil? || User.current.user_extensions.school.nil?) %> - , <%= @course_page.description %> + , + <%= @course_page.description %> + <% else %> <% if @school_id == "0" %> - , <%= @course_page.description %> + , + <%= @course_page.description %> + <% end %> <% end %> <% end %> @@ -77,7 +83,11 @@
    -

    <%= l(:lable_hot_course)%>

    +

    + + <%= l(:lable_hot_course)%> + +

    <% month_now = Time.now.strftime("%m").to_i %> <% year_now = Time.new.strftime("%Y") %> @@ -86,7 +96,9 @@ <% @school_id.nil? ? cur_school_course = [] : cur_school_course = find_miracle_course(10,7,@school_id, year_now, course_term) %> <% if cur_school_course.count == 0 %> - <%= render :partial => 'more_course', :locals => {:school_id => nil}%> + + <%= render :partial => 'more_course', :locals => {:school_id => nil}%> +