Merge branch 'develop' into szzh

app/controllers/files_controller.rb

@@ -23,7 +23,7 @@ class FilesController < ApplicationController
   before_filter :auth_login1, :only => [:index]
   before_filter :logged_user_by_apptoken,:only => [:index]
   before_filter :find_project_by_project_id#, :except => [:getattachtype]
-  before_filter :authorize, :except => [:getattachtype,:quote_resource_show,:search,:search_project,:quote_resource_show_project]
+  before_filter :authorize, :except => [:getattachtype,:quote_resource_show,:search,:search_project,:quote_resource_show_project,:search_tag_attachment]
 
   helper :sort
   include SortHelper
@@ -51,6 +51,7 @@ class FilesController < ApplicationController
     @sort = ""
     @order = ""
     @is_remote = true
+    @q = params[:name].strip
     if params[:sort]
       order_by = params[:sort].split(":")
       @sort = order_by[0]
@@ -60,19 +61,26 @@ class FilesController < ApplicationController
       sort = "#{@sort} #{@order}"
     end
 
+    # show_attachments [@course]
+
     begin
       q = "%#{params[:name].strip}%"
       #(redirect_to stores_url, :notice => l(:label_sumbit_empty);return) if params[:name].blank?
       if params[:insite]
-        @result = find_public_attache q,sort
-        @result = visable_attachemnts_insite @result,@course
-        @searched_attach = paginateHelper @result,10
+        if q == "%%"
+          @result = []
+          @searched_attach = paginateHelper @result,10
+        else
+          @result = find_public_attache q,sort
+          @result = visable_attachemnts_insite @result,@course
+          @searched_attach = paginateHelper @result,10
+        end
       else
         @result = find_course_attache q,@course,sort
         @result = visable_attachemnts @result
         @searched_attach = paginateHelper @result,10
+        @tag_list = attachment_tag_list @result
       end
-
     #rescue Exception => e
     #  #render 'stores'
     #  redirect_to search_course_files_url
@@ -273,6 +281,8 @@ class FilesController < ApplicationController
 
       show_attachments @containers
 
+      @tag_list = attachment_tag_list @all_attachments
+
       render :layout => 'base_courses'
     end
 
@@ -346,6 +356,27 @@ class FilesController < ApplicationController
          Mailer.run.attachments_added(attachments[:files])
        end
 
+       if params[:course_attachment_type] && params[:course_attachment_type] != "5"
+         case params[:course_attachment_type]
+         when "1"
+           tag_name = l(:label_courseware)
+         when "2"
+           tag_name = l(:label_software)
+         when "3"
+           tag_name = l(:label_media)
+         when "4"
+           tag_name = l(:label_code)
+         else
+           tag_name = ""
+         end
+         if !attachments.empty? && attachments[:files] && tag_name != ""
+           attachments[:files].each do |attachment|
+             attachment.tag_list.add(tag_name)
+             attachment.save
+           end
+         end
+       end
+
        # TODO: 临时用 nyan
        sort_init 'created_on', 'desc'
        sort_update 'created_on' => "#{Attachment.table_name}.created_on",
@@ -489,8 +520,31 @@ class FilesController < ApplicationController
         format.html
      end
    end
+  end
 
+    #查找指定TAG的按条件过滤的资源列表
+  def search_tag_attachment
+    @q,@tag_name,@order = params[:q],params[:tag_name]
+    @is_remote = true
+    if params[:sort]
+      order_by = params[:sort].split(":")
+      @sort = order_by[0]
+      if order_by.count > 1
+        @order = order_by[1]
+      end
+      sort = "#{@sort} #{@order}"
+    end
 
+    q = "%#{@q.strip}%"
+    @result = find_course_attache q,@course,sort
+    @result = visable_attachemnts @result
+    @result = @result.select{|attachment| attachment.tag_list.include?(@tag_name)}
+    @searched_attach = paginateHelper @result,10
+    @tag_list = attachment_tag_list @result
 
+    respond_to do |format|
+      format.js
+      # format.html
+    end
   end
 end

app/helpers/files_helper.rb

@@ -120,6 +120,20 @@ module FilesHelper
     result
   end
 
+  def attachment_tag_list attachments
+    tag_list = Hash.new
+    attachments.each do |attachment|
+      attachment.tag_list.map{|tag| tag_list.has_key?(tag) ? tag_list[tag] = tag_list[tag] + 1 : tag_list[tag] = 1}
+    end
+    tag_list.sort {|a,b| b[1]<=>a[1]}
+  end
+
+  def get_attachments_by_tag attachments,tag
+    attachments.each do |attachment|
+      attachment.tag_list.include?(tag)
+    end
+  end
+
   def visable_attachemnts_insite attachments,obj
     result = []
     if obj.is_a?(Course)

app/views/bids/_homework_list.html.erb

@@ -70,7 +70,7 @@
   <div class="upload_box_" >
     <h2 class="upload_box_tit">下载文件包太大，分成多个下载包</h2>
     <ul class="upload_box_ul" >
-      <li><span class="upload_box_span" >1.</span> <a href="#">前20名学生的作业</a><span class="c_grey">&nbsp;&nbsp;（共200M）</span> </li>
+      <li><span class="upload_box_span" >1.</span> <a href="javascript:void(0)">前20名学生的作业</a><span class="c_grey">&nbsp;&nbsp;（共200M）</span> </li>
     </ul>
     <div class="cl"></div>
   </div>

app/views/bids/_new_homework_form.html.erb

@@ -44,7 +44,7 @@
       <div class="cl"></div>
     </li>
     <li class=" ml90" >
-      <a class="blue_btn fl c_white" onclick="submit_new_bid('<%= bid_id%>');" href="#"><%= l(:button_create)%></a>
+      <a class="blue_btn fl c_white" onclick="submit_new_bid('<%= bid_id%>');" href="javascript:void(0)"><%= l(:button_create)%></a>
       <%= link_to l(:button_cancel), homework_course_path(@course), :class => "blue_btn grey_btn fl c_white"%>
       <div class="cl"></div>
     </li>

app/views/courses/_course_teacher.html.erb

@@ -1,6 +1,6 @@
 <div class="st_list">
   <div class="st_box">
-    <a href="#" class="fr fb  mb5" >加入时间</a>
+    <a href="javascript:void(0)" class="fr fb  mb5" >加入时间</a>
     <div class="cl"></div><!--st_box_top end-->
 
     <% members.each do |member| %>

app/views/courses/_member_list.html.erb

@@ -26,9 +26,9 @@
             <li class="ml358">
               <%= 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' %>
-              <a id="pic" href="#" class= "st_down"></a>
+              <a id="pic" href="javascript:void(0)" class= "st_down"></a>
             <% else %>
-                  <a id="pic" href="#" class= "st_up"></a>
+                  <a id="pic" href="javascript:void(0)" class= "st_up"></a>
             <% end %>
                   </li>
             <li class="ml50">

app/views/courses/_member_list_detail.html.erb

@@ -4,7 +4,7 @@
     <div class="st_boxlist">
       <% next if member.new_record?  %>
 
-      <a href="#" class="st_img" style="float:left;"> <%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :width => 40, :height => 40))  %></a>
+      <a href="javascript:void(0)" class="st_img" style="float:left;"> <%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :width => 40, :height => 40))  %></a>
       <ul style="margin-left: 15px">
         <% if @canShowCode %>
             <% if member.user.show_name == '' && member.user.user_extensions.student_id == '' %>

app/views/courses/_new_member_list.html.erb

@@ -32,7 +32,7 @@
               <a id="pic" href="javascript:" class= "st_up"></a>
           <% end %>
         </li>
-        <li class="ml50"><a href="#" >加入时间</a></li>
+        <li class="ml50"><a href="javascript:void(0)" >加入时间</a></li>
       </ul>
       <div class="cl"></div><!--st_box_top end-->
 

app/views/files/_course_file.html.erb

@@ -1,7 +1,23 @@
 <script>
-    function show_upload()
+    function show_upload(obj)
     {
-        $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_show',:locals => {:course => @course}) %>');
+        switch(obj)
+        {
+            case 1:
+                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_show',:locals => {:course => @course,:course_attachment_type => 1}) %>');
+                break;
+            case 2:
+                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_show',:locals => {:course => @course,:course_attachment_type => 2}) %>');
+                break;
+            case 3:
+                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_show',:locals => {:course => @course,:course_attachment_type => 3}) %>');
+                break;
+            case 4:
+                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_show',:locals => {:course => @course,:course_attachment_type => 4}) %>');
+                break;
+            default:
+                $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_show',:locals => {:course => @course,:course_attachment_type => 5}) %>');
+        }
         showModal('ajax-modal', '513px');
         $('#ajax-modal').siblings().remove();
         $('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'><a href='javascript:void(0)' onclick='closeModal()'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
@@ -32,7 +48,6 @@
         $('#incourse').attr("class", "re_schbtn b_lblue");
         $('#insite').attr("class", "re_schbtn b_lblue");
     }
-
 </script>
 
 <div class="container">
@@ -44,7 +59,15 @@
           <%= submit_tag "全站搜索", :class => "re_schbtn b_lblue",:name => "insite",:id => "insite",:onmouseover => "presscss('insite')",:onmouseout =>"buttoncss()" %>
       <% end %>
       <% if is_course_teacher(User.current,@course) %>  <!-- show_window('light','fade','20%','35%')-->
-          <a href="javascript:void(0)" class="re_fabu f_r b_lblue" onclick="show_upload();">上传资源</a>
+          <!--<a href="javascript:void(0)" class="re_fabu f_r b_lblue" onclick="show_upload();">上传资源</a>-->
+          <p class="c_grey fr mt10 mr5">
+            上传：
+            <a href="javascript:void(0);" class=" c_dblue" onclick="show_upload(1);">课件</a>&nbsp;|&nbsp;
+            <a href="javascript:void(0);" class=" c_dblue" onclick="show_upload(2);">软件</a>&nbsp;|&nbsp;
+            <a href="javascript:void(0);" class=" c_dblue" onclick="show_upload(3);">媒体</a>&nbsp;|&nbsp;
+            <a href="javascript:void(0);" class=" c_dblue" onclick="show_upload(4);">代码</a>&nbsp;|&nbsp;
+            <a href="javascript:void(0);" class=" c_dblue" onclick="show_upload(5);">其他</a>
+          </p>
       <% end %>
     </div><!---re_top end-->
     <div class="cl"></div>

app/views/files/_course_list.html.erb

@@ -14,6 +14,16 @@
   </p>
 </div>
 <div class="cl"></div>
+
+<div class="files_tag">
+  <% unless @tag_list.nil?%>
+    <% @tag_list.each do |k,v|%>
+          <a href="javascript:void(0);" class="files_tag_icon" onclick="search_tag_attachment('<%= search_tag_attachment_course_files_path(@course)%>','<%= k%>','<%= @q%>','<%= course.id%>');"><%= k%>（<span class="c_red"><%= v%></span>）</a>
+    <% end%>
+  <% end%>
+</div>
+<div class="cl"></div>
+
 <div class="for_img_thumbnails">
 <% curse_attachments.each do |file| %>
   <% if file.is_public? || User.current.member_of_course?(course) %>

app/views/files/_upload_show.html.erb

@@ -7,7 +7,7 @@
       <div id="network_issue" style="color: red; display: none;"><%= l(:label_file_upload_error_messages)%></div>
 
       <%= form_tag(course_files_path(course), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %>
-          <!-- <label style="margin-top:3px;"><#%= l(:label_file_upload)%></label>   -->
+          <input type="hidden" name="course_attachment_type" value="<%= course_attachment_type%>">
           <%= render :partial => 'attachement_list',:locals => {:course => course} %>
           <div class="cl"></div>
           <a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="closeModal();"><%= l(:button_cancel)%></a>

app/views/files/search_tag_attachment.js.erb

@@ -0,0 +1 @@
+$("#course_list").html("<%= escape_javascript(render :partial => 'course_list',:locals => {course: @course,all_attachments: @result,sort:@sort,order:@order,curse_attachments:@searched_attach})%>");

app/views/files/upload_file_show.js.erb

@@ -1,10 +1,10 @@
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_show',:locals => {}) %>');
-showModal('ajax-modal', '513px');
-$('#ajax-modal').css('height','569px');
-$('#ajax-modal').siblings().remove();
-//$('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'>" +
-//        "<a href='#' onclick='hidden_homework_atert_form("+
- //       <#%= @cur_page%> + "," + <#%= @cur_type%> +
-//        ");'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-$('#ajax-modal').parent().css("top","").css("left","");
-$('#ajax-modal').parent().addClass("alert_box");
+//$('#ajax-modal').html('<%#= escape_javascript(render :partial => 'upload_show',:locals => {}) %>');
+//showModal('ajax-modal', '513px');
+//$('#ajax-modal').css('height','569px');
+//$('#ajax-modal').siblings().remove();
+////$('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'>" +
+////        "<a href='#' onclick='hidden_homework_atert_form("+
+// //       <#%= @cur_page%> + "," + <#%= @cur_type%> +
+////        ");'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+//$('#ajax-modal').parent().css("top","").css("left","");
+//$('#ajax-modal').parent().addClass("alert_box");

app/views/homework_attach/_history.erb

@@ -5,7 +5,7 @@
     <% if journals.size > 0 %>
         <% for journal in journals %>
             <div class="ping_C" id='word_li_<%= journal.id.to_s %>'>
-              <div class="ping_dispic"><a target="_blank" href="#"><%= image_tag(url_to_avatar(journal.user))  %></a></div>
+              <div class="ping_dispic"><a target="_blank" href="javascript:void(0)"><%= image_tag(url_to_avatar(journal.user))  %></a></div>
               <div class="ping_discon" style="width: 85%;">
                 <div class="ping_distop">
                   <!-- <a style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;" target="_blank" href="#">gugu01</a> -->

app/views/layouts/base_courses.html.erb

@@ -49,7 +49,7 @@
     <div class="search fl">
       <%= 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)}');" %>
-          <a href="#" onclick="submitSerch('<%= l(:label_search_conditions_not_null) %>');" class="search_btn fl f14 c_white" >
+          <a href="javascript:void(0)" onclick="submitSerch('<%= l(:label_search_conditions_not_null) %>');" class="search_btn fl f14 c_white" >
             <%= l(:label_search)%>
           </a>
           <br />

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 %>
-                                        <a href="#" style="background:#8e8e8e;">匿评结束</a>
+                                        <a href="javascript:void(0)" style="background:#8e8e8e;">匿评结束</a>
                                       <% end %>
                                  </span>
                                <%end%>

app/views/messages/_course_new.html.erb

@@ -6,7 +6,7 @@
   <ul>
     <%= form_for @message, :url => {:action => 'new'}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
       <%= render :partial => 'form_course', :locals => {:f => f,:is_new => true} %>
-        <a href="#" onclick="submitCoursesBoard();"class="blue_btn fl c_white"><%= l(:button_submit)%></a>
+        <a href="javascript:void(0)" onclick="submitCoursesBoard();"class="blue_btn fl c_white"><%= l(:button_submit)%></a>
         <%#= 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 %>

app/views/messages/_form_course.html.erb

@@ -56,8 +56,8 @@
 </li>
 <div class="cl"></div>
 <li>
-  <label class="fl">&nbsp;&nbsp;<%= l(:label_attachment_plural) %>&nbsp;&nbsp;：</label>
-  <div  class="fl">
+  <label class="fl mt10">&nbsp;&nbsp;<%= l(:label_attachment_plural) %>&nbsp;&nbsp;：</label>
+  <div  class="fl mt10">
     <%= render :partial => 'attachments/form_course', :locals => {:container => @message,:isReply => @isReply} %>
   </div>
 </li>

app/views/messages/edit.html.erb

@@ -15,7 +15,7 @@
                            } do |f| %>
           <%= render :partial => 'form',
                      :locals => {:f => f, :replying => !@message.parent.nil?} %>
-          <a href="#" onclick="$('#message-form').submit();" class="ButtonColor m3p10">
+          <a href="javascript:void(0)" onclick="$('#message-form').submit();" class="ButtonColor m3p10">
             <%= l(:button_save) %>
           </a>
           <%= 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?} %>
-              <a href="#" onclick="submitCoursesBoard();"class="blue_btn fl c_white"><%= l(:button_submit)%></a>
+              <a href="javascript:void(0)" onclick="submitCoursesBoard();"class="blue_btn fl c_white"><%= l(:button_submit)%></a>
               <%= 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 %>

config/locales/zh.yml

@@ -1974,3 +1974,8 @@ zh:
   label_show_non_project: 显示非项目信息
   label_hidden_non_project: 隐藏非项目信息
 
+  label_courseware: 课件
+  label_software: 软件
+  label_media: 媒体
+  label_code: 代码
+

config/routes.rb

@@ -709,6 +709,7 @@ RedmineApp::Application.routes.draw do
       collection do
         match "getattachtype", :via =>  [:get, :post]
         match "search",:via => [:post,:get]
+        match "search_tag_attachment", :via => [:post,:get]
       end
       member do
         match "quote_resource_show", :via => [:get]

public/javascripts/course.js

@@ -449,3 +449,19 @@ $(function(){
         }
     )
 });
+
+//查找TAG资源
+function search_tag_attachment(url,tag_name,q,course_id,sort)
+{
+    $.get(
+        url,
+        {
+            tag_name: tag_name,
+            q: q,
+            course_id:course_id
+        },
+        function (data) {
+
+        }
+    );
+}

public/stylesheets/application.css

@@ -59,7 +59,7 @@ a:hover.info_foot_num{  color:#2390b2;}
 /*左侧导航*/
 .subNavBox{width:222px; background:#fff;margin:10px 10px 0 0;}
 .subNav{border-bottom:solid 1px #e5e3da;cursor:pointer;font-weight:bold;font-size:14px;color:#3ca5c6;line-height:28px;padding-left:10px;background-color:#fff;}
-.subNav_jiantou{background:url(/images/jiantou1.jpg) no-repeat;background-position:95% 50%; background-color:#fff;}
+.subNav_jiantou{background:url(../images/jiantou1.jpg) no-repeat;background-position:95% 50%; background-color:#fff;}
 .subNav_jiantou:hover{color:#0781b4;  }
 .currentDd{color:#0781b4; }
 .currentDt{background-color:#fff; }
@@ -96,10 +96,10 @@ a.more{ float:right; font-size:12px; font-weight:normal; color:#a9a9a9; margin-t
 a:hover.more{ color:#64bdd9;}
 .project_box_ul{ padding:0 10px;}
 .project_box_list{ padding:10px 0; border-bottom:1px dashed #e2e1e1; padding-left:30px; color:#6f6c6c;}
-.img_problem{ background:url(../images/img_project.png) 0 -20px no-repeat;}
-.img_talk{ background:url(../images/img_project.png) 0 -62px no-repeat;}
-.img_ziyuan{ background:url(../images/img_project.png) 0 -115px no-repeat;}
-.img_edition{ background:url(../images/img_project.png) 0 -167px no-repeat;}
+.img_problem{ background:url(../images/new_project/img_project.png) 0 -20px no-repeat;}
+.img_talk{ background:url(../images/new_project/img_project.png) 0 -62px no-repeat;}
+.img_ziyuan{ background:url(../images/new_project/img_project.png) 0 -115px no-repeat;}
+.img_edition{ background:url(../images/new_project/img_project.png) 0 -167px no-repeat;}
 .project_name{ color:#058c42;}
 .project_name:hover{ color:#016f33;}
 .project_txt{ color:#0781b4; width:445px; display:block; float:left;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
@@ -225,7 +225,7 @@ a:hover.upload_btn_grey{background:#8a8a8a;}
 .upload_btn{width:80px; height:26px;}
 .upload_check{ margin-top:4px;}
 /****其他未更新页面***/
-.setting{ background:url(../images/setting.jpg) 0 0 no-repeat; width:670px; height:443px;}
+.setting{ /*background:url(../images/setting.jpg) 0 0 no-repeat;*/ width:670px; height:443px;}
 .newproblem{}
 
 
@@ -640,8 +640,8 @@ span.forums-avatar-right{
 
 /*added by bai*/
 .user_underlinescore{
-	margin:1;
-	padding:1;
+	margin: 1px;
+	padding: 1px;
 	width:700px;
 	height:1px;
 	background-color:#15bccf;
@@ -889,7 +889,7 @@ ul.tool li{list-style-type:none;
 	font-size: 16px;		
 	color: #5c5c5c; 
 	text-align: justify;
-	text-justify: inter-ideograph;	
+	/*text-justify: inter-ideograph;	*/
 }
 
 .inf_user_image{	
@@ -915,7 +915,7 @@ ul.tool li{list-style-type:none;
 	font-size: 20px;		
 	color: #FF0000; 
 	text-align: justify;
-    text-justify: inter-ideograph;	
+    /*text-justify: inter-ideograph;	*/
 }
 
 
@@ -1105,8 +1105,8 @@ ul.user_course_sort li{list-style-type:none;
 	background-color:#adb6c5;
 }
 .user_underline{
-	margin:1;
-	padding:1;
+	margin:1px;
+	padding:1px;
 	width:240px;
 	height:1px;
 	background-color:#15bccf;
@@ -1116,8 +1116,8 @@ ul.user_course_sort li{list-style-type:none;
 
 
 .user_enterprise_underline{
-	margin:1;
-	padding:1;
+	margin:1px;
+	padding:1px;
 	width:240px;
 	height:1px;
 	background-color:#ac344f;
@@ -1125,16 +1125,16 @@ ul.user_course_sort li{list-style-type:none;
 }
 
 .user_underline2{
-	margin:1;
-	padding:1;
+	margin:1px;
+	padding:1px;
 	width:240px;
 	height:1px;
 	background-color:#c6e9fe;
 	overflow:hidden	
 }
 .user_underline3{
-	margin:1;
-	padding:1;
+	margin: 1px;
+	padding:1px;
 	width:120px;
 	height:1px;
 	background-color:#c6e9fe;
@@ -1142,8 +1142,8 @@ ul.user_course_sort li{list-style-type:none;
 	margin-top: 10px;
 }
 .homepage_underline{
-	margin:1;
-	padding:1;
+	margin:1px;
+	padding:1px;
 	width:240px;
 	height:1px;
 	background-color:#c6e9fe;
@@ -1742,7 +1742,7 @@ margin-left:-10px;
 
 .table_font{font-size:20px;color:#DD0000}
 .registerd_box{padding-left: 600px;}
-.project_table{margin:0,0,0,0;margin-bottom:10px;background-color:#0ee;height:50px;}
+.project_table{margin:0;margin-bottom:10px;background-color:#0ee;height:50px;}
 .project_header_tag{float:right; color:#000000;}
 
 .project_right_tag{margin-top:44%;}
@@ -2347,7 +2347,7 @@ p.progress-info {clear: left; font-size: 80%; margin-top:-4px; color:#777;}
 #roadmap table.progress td { height: 1.2em; }
 /***** Tabs *****/
 #content .tabs {height: 2.6em; margin-bottom:1.2em; position:relative; overflow:hidden;}
-#content .tabs ul {margin:0; position:absolute; bottom:0; padding-left:0.5em; font-family: 14px; width:2000px; border-bottom: 1px solid #15BCCF;}
+#content .tabs ul {margin:0; position:absolute; bottom:0; padding-left:0.5em;  width:2000px; border-bottom: 1px solid #15BCCF;}
 #content .tabs ul li {  
   float:left;
   list-style-type:none;
@@ -3062,8 +3062,8 @@ div.repos_explain{
 
 /* new linchun compitition */
 .contest_underline{
-	margin:1;
-	padding:1;
+	margin:1px;
+	padding:1px;
 	width:900px;
 	height:0.5px;
 	background-color:#aaa;

public/stylesheets/courses.css

@@ -123,8 +123,7 @@ a.re_open{display:block; width:46px; height:19px; border:1px solid #64bdd9; colo
 a:hover.re_open{ background:#64bdd9; color:#fff; text-decoration:none;}
 a.re_de{ color:#6883b6; margin-left:15px;}
 .re_con_box{ border-bottom:1px dashed #dadada; padding-bottom:10px; margin-bottom:10px;}
-/****资源库***/
-/*.setting{ background:url(../images/setting.jpg) 0 0 no-repeat; width:670px; height:443px;}*/
+
 
 /* 作业列表 */
 .ttl{ }
@@ -178,8 +177,6 @@ a.wzan_visited{background:url(images/pic_zan.png) 0 0 no-repeat;}
 .msg_box{ width:670px; height:205px; border-bottom:1px dashed #CCC; padding-top:10px;}
 .msg_box h4{ }
 .msg_box textarea{width:658px;height:90px;padding:5px;overflow:hidden;background-color: #ffffff; border:1px solid #CCC; margin:5px 0px; color:#666;  font-size:12px; }
-/*.msg_box a{ float:right; display:block; width:50px; height:22px; background:#15bccf; padding-top:3px; color:#fff; margin-left:10px; text-align:center; margin-top:5px;  }*/
-/*.msg_box a:hover{ background-color:#03a1b3; text-decoration:none;}*/
 
 
 /****评分弹框****/
@@ -242,7 +239,6 @@ a:hover.tijiao{ background:#0f99a9;}
 .members_left ul li{ height:30px; border-bottom:1px solid #E4E4E4;  width:410px; padding-top:10px; }
 .members_left ul li a{ float:left; text-align:center;}
 .members_left ul li span{ float:left; text-align:center; color:#484747;}
-
 .w150{ text-align:center; width:150px;min-height: 10px;}
 .f_b{ font-weight: bold;}
 .members_right label{ margin-left:15px;}
@@ -251,7 +247,7 @@ a:hover.tijiao{ background:#0f99a9;}
 .hwork_new{  color:#4c4c4c;}
 .c_red{ color:#F00;}
 .hwork_input{ border:1px solid #64bdd9; height:22px; width:555px; background:#fff; margin-bottom:10px; padding:5px;}
-.hwork_input02{ border:1px solid #64bdd9; height:15px; width:120px; background:#fff; margin-bottom:10px; padding:5px;}
+.hwork_input02{ border:1px solid #64bdd9; height:15px; width:140px; background:#fff; margin-bottom:10px; padding:5px;}
 .hwork_text{ border:1px solid #64bdd9; height:100px;width:555px; background:#fff; margin-left:5px; padding:5px; margin-bottom:10px;}
 .hwork_new ul li{ }
 .ml21{ margin-left:21px;}
@@ -263,6 +259,7 @@ a:hover.tijiao{ background:#0f99a9;}
 .hwork_tb_ li{float:left;height: 24px;width: auto; padding:0 10px;cursor:pointer;}
 .hwork_normaltab   {  color:#15bccf ; border-bottom:3px solid #e4e4e4; }
 .hwork_hovertab    {   color:#656767; font-weight:bold; border-bottom:3px solid #15bccf; }
+
 .hwork_dis{display:block; }
 .hwork_undis{display:none;}
 .project_none{ display:none;}
@@ -471,6 +468,50 @@ blockquote {
     background: url('../images/requirements/reference.jpg');
 }
 
+a.link_file{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; color:#64bdd9; }
+a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
+.r_txt_tit{width:510px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#09658c; font-size:14px;}
+
+.label{ width:80px; text-align:right; font-size:14px;    display:block; float:left;}
+.label02{ width:110px; text-align:right; font-size:14px;    display:block; float:left;}
+
+/*作业批次下拉*/
+div#menu_r {height:41px; font-size:14px; font-weight:bold; margin-bottom:10px;}
+div#menu_r ul {float: left;}
+div#menu_r ul.menu_r { background: #64bdd9; padding:0 10px; height:40px; }
+div#menu_r li {position: relative; z-index: 9; margin: 0; display: block; float: left; }
+div#menu_r li:hover>ul { left: -2px;}
+div#menu_r a {position: relative;z-index: 10; height: 41px; display: block; float: left;line-height: 41px; text-decoration: none; font-size:14px; }
+div#menu_r  {display: block; cursor: pointer; background-repeat: no-repeat;background-position: 95% 0;padding-right: 15px; _padding-right: 20px;}
+div#menu_r ul  a.parent  {background: url(../images/item.png) -20px -30px no-repeat;  width:60px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+div#menu_r ul  a.parent:hover  {background: url(../images/item.png) -20px -60px no-repeat;}
+div#menu_r ul ul a.parent  {background: url(../images/item.png) -20px 6px no-repeat;}
+div#menu_r ul ul a.parent:hover  {background: url(../images/item.png) -20px -11px no-repeat;}
+/* menu::level1 */
+div#menu_r a { padding: 5px 12px 0 10px;line-height: 30px; color: #fff;}
+/*div#menu_r li { background: url(images/main-delimiter.png) 98% 4px no-repeat; }*/
+div#menu_r li.last { background: none; }
+/* menu::level2 */
+div#menu_r ul ul li { background: none; }
+div#menu_r ul ul { position: absolute;top: 38px; left: -999em; width: 90px; padding: 5px 0 0 0; background:#fff; border:1px solid #15bccf; margin-top:1px;}
+div#menu_r ul ul a {padding: 0 0 0 15px; height: auto; float: none;display: block; line-height: 24px; font-size:12px; font-weight:normal;color:#15bccf;}
+div#menu_r ul ul a:hover { background:#64bdd9; color:#fff;}
+div#menu_r ul ul li.last { margin-left:15px; }
+div#menu_r ul ul li {width: 100%;}
+
+/* 20150414*/
+a.wzan_img{background:url(../images/new_project/public_icon.png) 0px -457px no-repeat;  display:block; height:31px; width:30px; color:#fff; }
+a.wzan_visited{background:url(../images/new_project/public_icon.png) 0px -503px no-repeat;}
+.dis ul li.wname_st a{ width:260px; font-size:14px; color:#595959; padding:10px 0 0 0px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;}
+.dis ul li.wname_st a:hover{ color:#41a8c8;}
+.no_zan{color:#999999;}
+.vi_zan{color:#28be6c;}
+.newwork_btn a{background:#64bdd9;color:#fff;font-size:14px; font-weight:normal; padding:2px 10px; display:block; text-align:center; float:right;}
+.newwork_btn a:hover{ background:#329cbd;}
+a.files_tag_icon{ background:#dcdcdc; color:#fff; border:1px solid #c8c8c8; padding:1px 10px; float:left; margin-right:10px; margin-bottom:10px;}
+a:hover.files_tag_icon{ background:#64bdd9; color:#fff; border:1px solid #54aeca; }
+
+