From 1dc8190aa0741636713c4b241d37b869173fdba2 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 15 Apr 2015 14:53:07 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E6=97=A0=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E7=9A=84href=E9=93=BE=E6=8E=A5=E4=B8=BAjavascript:voi?= =?UTF-8?q?d(0)=202=E3=80=81=E5=A2=9E=E5=8A=A0=E8=AF=BE=E7=A8=8B=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E5=BA=93=E7=9A=84=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/bids/_homework_list.html.erb | 2 +- app/views/bids/_new_homework_form.html.erb | 2 +- app/views/courses/_course_teacher.html.erb | 2 +- app/views/courses/_member_list.html.erb | 4 ++-- app/views/courses/_member_list_detail.html.erb | 2 +- app/views/courses/_new_member_list.html.erb | 2 +- app/views/files/_course_file.html.erb | 12 +++++++++++- app/views/files/_course_list.html.erb | 7 +++++++ app/views/homework_attach/_history.erb | 2 +- app/views/layouts/base_courses.html.erb | 2 +- app/views/layouts/base_homework.html.erb | 2 +- app/views/messages/_course_new.html.erb | 2 +- app/views/messages/edit.html.erb | 4 ++-- 13 files changed, 31 insertions(+), 14 deletions(-) diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb index 577cd280f..a7e337a60 100644 --- a/app/views/bids/_homework_list.html.erb +++ b/app/views/bids/_homework_list.html.erb @@ -70,7 +70,7 @@

下载文件包太大，分成多个下载包

diff --git a/app/views/bids/_new_homework_form.html.erb b/app/views/bids/_new_homework_form.html.erb index 129bcec5e..aeb9a5c41 100644 --- a/app/views/bids/_new_homework_form.html.erb +++ b/app/views/bids/_new_homework_form.html.erb @@ -44,7 +44,7 @@
  • - <%= l(:button_create)%> + <%= l(:button_create)%> <%= link_to l(:button_cancel), homework_course_path(@course), :class => "blue_btn grey_btn fl c_white"%>
    • diff --git a/app/views/courses/_course_teacher.html.erb b/app/views/courses/_course_teacher.html.erb index 89a3eea7e..587d9d2da 100644 --- a/app/views/courses/_course_teacher.html.erb +++ b/app/views/courses/_course_teacher.html.erb @@ -1,6 +1,6 @@
    - 加入时间 + 加入时间
    <% members.each do |member| %> diff --git a/app/views/courses/_member_list.html.erb b/app/views/courses/_member_list.html.erb index 60c10dff6..a773b6147 100644 --- a/app/views/courses/_member_list.html.erb +++ b/app/views/courses/_member_list.html.erb @@ -26,9 +26,9 @@
  • <%= link_to '作业积分', member_score_sort_course_path(:sort_by => (@score_sort_by == "desc" ? "asc" : "desc"), :group_id => (@group ? @group.id : 0),:search_name => (@search_name ? @search_name : nil)) ,:result => members,method: 'get', remote: true%> <% if @score_sort_by == 'desc' %> - + <% else %> - + <% end %>
  • diff --git a/app/views/courses/_member_list_detail.html.erb b/app/views/courses/_member_list_detail.html.erb index bc6cbd242..1067f709d 100644 --- a/app/views/courses/_member_list_detail.html.erb +++ b/app/views/courses/_member_list_detail.html.erb @@ -4,7 +4,7 @@
    <% next if member.new_record? %> - <%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :width => 40, :height => 40)) %> + <%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :width => 40, :height => 40)) %>
      <% if @canShowCode %> <% if member.user.show_name == '' && member.user.user_extensions.student_id == '' %> diff --git a/app/views/courses/_new_member_list.html.erb b/app/views/courses/_new_member_list.html.erb index e7d282256..30b77ee50 100644 --- a/app/views/courses/_new_member_list.html.erb +++ b/app/views/courses/_new_member_list.html.erb @@ -32,7 +32,7 @@ <% end %> -
    • 加入时间
      • +
    • 加入时间
    diff --git a/app/views/files/_course_file.html.erb b/app/views/files/_course_file.html.erb index 44dd50c5e..73828f2fe 100644 --- a/app/views/files/_course_file.html.erb +++ b/app/views/files/_course_file.html.erb @@ -44,11 +44,21 @@ <%= submit_tag "全站搜索", :class => "re_schbtn b_lblue",:name => "insite",:id => "insite",:onmouseover => "presscss('insite')",:onmouseout =>"buttoncss()" %> <% end %> <% if is_course_teacher(User.current,@course) %> - 上传资源 + + +

    + 上传： + 课件 |  + 软件 |  + 媒体 |  + 代码 |  + 其他 +

    <% end %>
    +
    <%= render :partial => 'course_list',:locals => {course: @course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments} %>
    diff --git a/app/views/files/_course_list.html.erb b/app/views/files/_course_list.html.erb index 3946b1da1..d33d58b77 100644 --- a/app/views/files/_course_list.html.erb +++ b/app/views/files/_course_list.html.erb @@ -14,6 +14,13 @@

    • + +
    + 实验（20） + 软件工程（20） +
    +
    +
    <% curse_attachments.each do |file| %> <% if file.is_public? || User.current.member_of_course?(course) %> diff --git a/app/views/homework_attach/_history.erb b/app/views/homework_attach/_history.erb index 686cdffd2..e99160f22 100644 --- a/app/views/homework_attach/_history.erb +++ b/app/views/homework_attach/_history.erb @@ -5,7 +5,7 @@ <% if journals.size > 0 %> <% for journal in journals %>
    -
    <%= image_tag(url_to_avatar(journal.user)) %>
    +
    <%= image_tag(url_to_avatar(journal.user)) %>
    diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index f277cbaa6..dec4a5f4d 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -49,7 +49,7 @@
    <%= form_tag({:controller => 'courses', :action => 'search'},:id => "course_search_form", :method => :get, :class => "search_form") do %> <%= text_field_tag 'name', params[:name], :placeholder => l(:label_course_name), :class => "search_text fl", :onkeyup => "regexName('#{l(:label_search_conditions_not_null)}');" %> - + <%= l(:label_search)%>
    diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb index 96671cc6d..3de539ab0 100644 --- a/app/views/layouts/base_homework.html.erb +++ b/app/views/layouts/base_homework.html.erb @@ -136,7 +136,7 @@ <% when 1 %> <%= link_to '关闭匿评', alert_anonymous_comment_bid_path(@bid), id: "#{@bid.id}_stop_anonymous_comment", remote: true %> <% when 2 %> - 匿评结束 + 匿评结束 <% end %> <%end%> diff --git a/app/views/messages/_course_new.html.erb b/app/views/messages/_course_new.html.erb index ad2db8281..168548682 100644 --- a/app/views/messages/_course_new.html.erb +++ b/app/views/messages/_course_new.html.erb @@ -6,7 +6,7 @@
      <%= form_for @message, :url => {:action => 'new'}, :html => {:multipart => true, :id => 'message-form'} do |f| %> <%= render :partial => 'form_course', :locals => {:f => f,:is_new => true} %> - <%= l(:button_submit)%> + <%= l(:button_submit)%> <%#= preview_link({:controller => 'messages', :action => 'preview', :board_id => @board}, 'message-form' ,target='preview',{:class => 'blue_btn grey_btn fl c_white'} )%> <%= link_to l(:button_cancel), course_boards_path(@course), :class => "blue_btn grey_btn fl c_white"%> <% end %> diff --git a/app/views/messages/edit.html.erb b/app/views/messages/edit.html.erb index 9a9ab3640..f5e143130 100644 --- a/app/views/messages/edit.html.erb +++ b/app/views/messages/edit.html.erb @@ -15,7 +15,7 @@ } do |f| %> <%= render :partial => 'form', :locals => {:f => f, :replying => !@message.parent.nil?} %> - + <%= l(:button_save) %> <%= link_to l(:button_cancel), board_message_url(@message.board, @message.root, :r => (@message.parent_id && @message.id)), :class => "ButtonColor m3p10" %> @@ -33,7 +33,7 @@ } do |f| %> <%= render :partial => 'form_course', :locals => {:f => f, :replying => !@message.parent.nil?} %> - <%= l(:button_submit)%> + <%= l(:button_submit)%> <%= link_to l(:button_cancel), board_message_url(@message.board, @message.root, :r => (@message.parent_id && @message.id)), :class => "blue_btn grey_btn fl c_white" %> <% end %>