Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/helpers/users_helper.rb

@@ -546,7 +546,7 @@ module UsersHelper
     type = []
     user.courses.select{|c| user.allowed_to?(:as_teacher,c)}.each do |course|
       option = []
-      option << course.name
+      option << course.name+"（"+course.time.to_s+course.term+"）"
       option << course.id
       type << option
     end

app/views/users/_resource_share_for_project_popup.html.erb

@@ -34,7 +34,7 @@
           <li class="fl">
             <input name="projects_ids[]" type="checkbox" value="<%= project.id %>" class="courseSendCheckbox"/>
           </li>
-          <li class="sendCourseName fl"><%= truncate( project.name,:length=>18)%></li>
+          <li class="sendCourseName fl"><%= project.name%></li>
         </ul>
         <% end %>
     </div>

app/views/users/_resource_share_popup.html.erb

@@ -34,7 +34,7 @@
               <li class="fl">
                 <input name="course_ids[]" type="checkbox" value="<%= course.id %>" class="courseSendCheckbox"/>
               </li>
-              <li class="sendCourseName fl"><%= truncate(course.name,:length=>18)%></li>
+              <li class="sendCourseName fl"><%= course.name%></li>
             </ul>
             <% end %>
           </div>

app/views/users/_user_homework_form.html.erb

@@ -74,7 +74,11 @@
 </div>
   </div>
 <div class="cl"></div>
-
+<script type="text/javascript">
+    $(function (){
+        $("#course_id").append("<option value='-1' id='option_select' hidden selected>请选择发布作业的课程</option>");
+    });
+</script>
 
 <script id="t:test-answer-list" type="text/html">
   <div class="mt10">

app/views/users/user_homeworks.html.erb

@@ -1,10 +1,11 @@
 <script type="text/javascript">
   function reset_homework(){
       $("#homework_name").val("");
-      $("#homework_end_time").val("<%= (Time.now  + 3600 * 24).strftime('%Y-%m-%d')%>");
+      $("#homework_end_time").val("");
-      $("#course_id").val("");
+      $("#course_id").val($("#option_select").val());
       $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => HomeworkCommon.new })%>");
       homework_description_editor.html("");
+      $("#homework_editor").toggle();
   }
 
   function checkAllBox(doc){