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

app/views/attachments/file.html.erb

@@ -1,3 +1,8 @@
+<div id="wrapper">
+  <div id="wrapper2">
+    <div id="wrapper3">
+      <div id="main" class="nosidebar">
+        <div id="content_">
           <h3><%=h @attachment.filename %></h3>
 
           <div class="attachments">
@@ -24,3 +29,10 @@
           <% content_for :header_tags do -%>
               <%= stylesheet_link_tag "scm" -%>
           <% end -%>
+          <div style="clear:both;"></div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+

app/views/layouts/base_courses.html.erb

@@ -1,5 +1,5 @@
 <%# course_model %>
-<% teacher_num = teacherCount(@course) %>
+<% teacher_num = searchTeacherAndAssistant(@course).count %>
 <% student_num = studentCount(@course) %>
 <% course_file_num = visable_attachemnts_incourse(@course).count%>
 <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>

app/views/memos/edit.html.erb

@@ -28,14 +28,14 @@
 
       </div>
   <div>
-    <textarea type="text" id="memo_subject" name="memo[subject]" class="postDetailInput" placeholder="对应帖子标题"  ><%= @memo.subject%></textarea>
+    <textarea type="text" id="memo_subject" name="memo[subject]" maxlength="50" class="postDetailInput" placeholder="对应帖子标题"  ><%= @memo.subject%></textarea>
     <script>
       var ta = document.getElementById('memo_subject')
       autoTextarea(ta)
     </script>
   </div>
   <div class="mt15">
-    <textarea type="text" id="memo_content" name="memo[content]" class="postDetailInput" placeholder="对应帖子内容" ><%= @memo.content.html_safe%></textarea>
+    <textarea type="text" id="memo_content" name="memo[content]" maxlength="5000" class="postDetailInput" placeholder="对应帖子内容" ><%= @memo.content.html_safe%></textarea>
     <script>
         var ta1 = document.getElementById('memo_content')
         autoTextarea(ta1)

app/views/tags/tag_save.js.erb

@@ -20,8 +20,9 @@ $('#tags_name2').val("");
         $("#files_tag").html("<%= escape_javascript(render :partial => "files/tag_yun", :locals => {:tag_list => @tag_list,:course => @course,:tag_name => @select_tag_name}) %>");
     <%else%>
         $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty();
-        $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").html('<%= escape_javascript(render :partial => 'tags/course_attachment_tag_name',
+        $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").replaceWith('<%= escape_javascript(render :partial => 'tags/tag_new', :locals => {:obj => @obj, :object_flag => "6"}) %>');
-                     :locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @obj_flag}) %>');
+//render :partial => 'tags/course_attachment_tag_name',
+//:locals => {:obj => @obj,:non_list_all => false,:object_flag =>  @obj_flag})
     <%end%>
 
     $("#tags_name_<%=@obj.id%>").val("");

public/javascripts/project.js

@@ -362,9 +362,11 @@ $(document).ready(function () {
 });
 
     function showAndScrollTo(id, focus) {
+
         $('#' + id).show();
         if (focus !== null) {
             $('#' + focus).focus();
+            issue_journal_kind_reply.focus();
         }
         $('html, body').animate({scrollTop: $('#' + id).offset().top}, 400);
     }