diff --git a/app/views/courses/_join_private_course.html.erb b/app/views/courses/_join_private_course.html.erb index d37feeb57..873144afe 100644 --- a/app/views/courses/_join_private_course.html.erb +++ b/app/views/courses/_join_private_course.html.erb @@ -73,11 +73,18 @@
  • 身      份: - + <% if User.current.logged? && User.current.extensions && User.current.extensions.identity == 0%> + + <%else%> + + <%end%>
  • diff --git a/app/views/courses/set_course_outline.js.erb b/app/views/courses/set_course_outline.js.erb index a43a62c7d..e920005cd 100644 --- a/app/views/courses/set_course_outline.js.erb +++ b/app/views/courses/set_course_outline.js.erb @@ -3,6 +3,6 @@ hideModal(); <% else %> $("#course_outline_bar").html(' ') <%end %> -<%if @is_in_show_outline_page && @is_in_show_outline_page == 'Y'%> +<%#if @is_in_show_outline_page && @is_in_show_outline_page == 'Y'%> window.location.href='<%=syllabus_course_path(@course) %>'; -<% end %> +<%# end %> diff --git a/app/views/courses/syllabus.html.erb b/app/views/courses/syllabus.html.erb index bf6980dd2..bb3421cba 100644 --- a/app/views/courses/syllabus.html.erb +++ b/app/views/courses/syllabus.html.erb @@ -58,7 +58,7 @@ '取消大纲', {:controller => 'blog_comments',:action => 'destroy',:user_id=>BlogComment.find(@course.outline).author_id,:blog_id=>BlogComment.find(@course.outline).blog_id, :id => @course.outline,:course_id=>@course.id}, :method => :delete, - :data => {:confirm => '确定取消么'}, + :data => {:confirm => '您确定要取消么?'}, :class => 'postOptionLink' ) if User.current && User.current.id == @article.author.id %>
  • diff --git a/public/images/course/arrow_up.jpg b/public/images/course/arrow_up.jpg index bbf348fe1..7bcfa859c 100644 Binary files a/public/images/course/arrow_up.jpg and b/public/images/course/arrow_up.jpg differ diff --git a/public/images/course/arrow_up2.jpg b/public/images/course/arrow_up2.jpg new file mode 100644 index 000000000..bbf348fe1 Binary files /dev/null and b/public/images/course/arrow_up2.jpg differ diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 5914d57e6..1cff7e07a 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -33,7 +33,7 @@ a:hover.news_foot{ color:#787b7e; border:1px solid #d4d4d4;} .ctt2{clear:both; } .hworkListBanner {width:720px; height:40px; background:#eaeaea; margin-bottom:10px;} .hworkListContainer {float:left; clear:both; width:720px;} -.showHwork{ border:2px solid #269ac9; width:696px; padding:10px; color:#666666; padding-bottom:0px; } +.showHwork{ border:1px solid #eaeaea; width:696px; padding:10px; color:#666666; padding-bottom:0px; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); } .showHworkP{ width:630px; float:left;} .showHwork ul li {margin-bottom: 5px;} .hworkPingText{ float:left; border:1px solid #e4e4e4; padding:5px; width:618px; height:35px;} @@ -838,7 +838,7 @@ a:hover.icon_remove{background:url(images/icons.png) -20px -338px no-repeat;} a.hwork_center{ display:block; width:60px; text-align:center; margin-right:5px;} .show_hwork{ border:2px solid #64bdd9; width:646px; padding:10px; color:#666666; padding-bottom:0px; } .show_hwork ul li{ margin-bottom:5px;} -.show_hwork_arrow{ position:relative; top:2px; left:165px;background:url(../images/course/arrow_up.jpg) 0 0 no-repeat; width:20px; height:11px;} +.show_hwork_arrow{ position:relative; top:1px; left:165px;background:url(../images/course/arrow_up.jpg) 0 0 no-repeat; width:20px; height:11px;} .tit_fb{ font-weight:bold; width:66px; text-align:right; display:block; float:left;} .ml160{ margin-left:160px;} .show_hwork_p{ width:630px; float:left;}