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

.rspec

@@ -1,2 +1,2 @@
---format documentation
 --color
+--require spec_helper

Gemfile

@@ -28,28 +28,21 @@ gem "rmagick", ">= 2.0.0"
 
 group :development do
   gem 'grape-swagger'
-  #gem 'grape-swagger-ui', git: 'https://github.com/guange2015/grape-swagger-ui.git'
-  gem 'puma' if RbConfig::CONFIG['host_os'] =~ /linux/
-  gem 'pry-rails'
-  if RUBY_VERSION >= '2.0.0'
-    gem 'pry-byebug'
-  else
-    # gem 'pry-debugger'
-  end
-  gem 'pry-stack_explorer'
   gem 'better_errors', '~> 1.1.0'
   gem 'rack-mini-profiler', '~> 0.9.3'
 end
 
-group :test do
-  gem "shoulda", "~> 3.5.0"
-  gem "mocha", "~> 1.1.0"
-  gem 'capybara', '~> 2.4.1'
-  gem 'nokogiri', '~> 1.6.3'
-  gem 'factory_girl', '~> 4.4.0'
-  gem 'selenium-webdriver', '~> 2.42.0'
+group :development, :test do 
+  unless RUBY_PLATFORM =~ /w32/
+    gem 'pry-rails'
+    if RUBY_VERSION >= '2.0.0'
+      gem 'pry-byebug'
+    end
+    gem 'pry-stack_explorer'
+  end
 
-  gem "faker"
+  gem 'rspec-rails', '~> 3.0'
+  gem 'factory_girl_rails'
 end
 
 # Gems used only for assets and not required

app/api/mobile/apis/courses.rb

@@ -170,10 +170,26 @@ module Mobile
 
         desc "设置教辅"
         params do
-
+        requires :token,type:String
+        requires :user_id,type:Integer,desc: '用户id'
+        requires :course_id,type:Integer,desc:'课程id'
+        end
+        get 'set_user_as_assitant' do
+          cs = CoursesService.new
+          cs.set_as_assitant_teacher params
+          present :status, 0
         end
-        post 'set_user_as_assitant' do
 
+        desc "删除教辅"
+        params do
+          requires :token,type:String
+          requires :user_id,type:Integer,desc: '用户id'
+          requires :course_id,type:Integer,desc:'课程id'
+        end
+        get 'del_user_as_assitant'  do
+          cs = CoursesService.new
+          cs.del_assitant_teacher params
+          present :status, 0
         end
 
         desc "返回单个课程"
@@ -187,7 +203,7 @@ module Mobile
             course = cs.show_course(params,(current_user.nil? ? User.find(2):current_user))
             #course = Course.find(params[:id])
             present :data, course, with: Mobile::Entities::Course
-            present :status, 0
+           { status: 0}
           end
         end
 

app/api/mobile/apis/homeworks.rb

@@ -96,6 +96,21 @@ module Mobile
           present :status, 0
         end
 
+        desc '创建作业'
+        params do
+          requires :token,type:String
+          requires :work_name,type:String,desc:'作业名称'
+          requires :work_desc,type:String,desc:'作业描述'
+          requires :work_deadline,type:String,desc:'截止日期'
+          requires :is_blind_appr,type:Integer,desc:'是否匿评'
+          requires :blind_appr_num,type:Integer,desc:'匿评分配数'
+          requires :course_id,type:Integer,desc: '课程id'
+        end
+        post 'create_home_work' do
+          Homeworks.get_service.create_home_work params,current_user
+          present :status, 0
+        end
+
 
       end
     end

app/api/mobile/apis/users.rb

@@ -84,6 +84,7 @@ module Mobile
           requires :name, type: String, desc: '用户名关键字'
           requires :search_by, type: String,desc: '搜索依据：0 昵称，1 用户名，2 邮箱,3 昵称和姓名'
           optional :is_search_assitant,type:Integer,desc:'是否搜索注册用户来作为助教'
+          optional :course_id,type:Integer,desc: '课程id，搜索注册用户不为该课程教师的其他用户'
         end
         get 'search/search_user' do
           us = UsersService.new

app/controllers/boards_controller.rb

@@ -80,7 +80,7 @@ class BoardsController < ApplicationController
               includes(:last_reply).
               limit(@topic_pages.per_page).
               offset(@topic_pages.offset).
-              order(sort_clause).
+              order("last_replies_messages.created_on desc").
               preload(:author, {:last_reply => :author}).
               all
         elsif @course
@@ -88,7 +88,7 @@ class BoardsController < ApplicationController
               includes(:last_reply).
               # limit(@topic_pages.per_page).
               # offset(@topic_pages.offset).
-              order(sort_clause).
+              order("last_replies_messages.created_on desc").
               preload(:author, {:last_reply => :author}).
               all : []
           @topics = paginateHelper board_topics,10

app/services/courses_service.rb

@@ -473,6 +473,41 @@ class CoursesService
     result
   end
 
+  # 设置人员为课程教辅
+  def set_as_assitant_teacher params
+    members = []
+    #找到课程
+    course = Course.find(params[:course_id])
+    #新建课程人员
+
+    member =  Member.new(:role_ids =>[7], :user_id => params[:user_id],:course_id=>params[:course_id])
+    joined = StudentsForCourse.where('student_id = ? and course_id = ?', member.user_id,course.id)
+    joined.each do |join|
+      join.delete
+    end
+    member.course_group_id = 0
+    members << member
+    course.members << members
+    #将课程人员设置为教辅
+  end
+
+  def del_assitant_teacher params
+     member =  Member.where("user_id = ? and course_id = ?",params[:user_id],params[:course_id])
+     member.each do |m|
+       m.destroy
+     end
+     user_admin = CourseInfos.where("user_id = ? and course_id = ?",params[:user_id], params[:course_id])
+     if user_admin.size > 0
+       user_admin.each do |user|
+         user.destroy
+       end
+     end
+     joined = StudentsForCourse.where('student_id = ? and course_id = ?', params[:user_id],params[:course_id])
+     joined.each do |join|
+       join.delete
+     end
+  end
+
   private
   def searchmember_by_name  members, name
     #searchPeopleByRoles(project, StudentRoles)
@@ -576,4 +611,6 @@ class CoursesService
 
 
 
+
+
 end

app/services/homework_service.rb

@@ -231,6 +231,29 @@ class HomeworkService
       anonymous_repy(jour)
     end
   end
+
+   # 发布作业
+   def create_home_work params,current_user
+     @bid = Bid.new
+     @bid.name = params[:work_name]
+     @bid.description = params[:work_desc]
+    # @bid.is_evaluation = params[:is_blind_appr]
+     @bid.evaluation_num = params[:blind_appr_num]
+     @bid.open_anonymous_evaluation = params[:is_blind_appr]
+     @bid.reward_type = 3
+     @bid.deadline = params[:work_deadline]
+     @bid.budget = 0
+     @bid.author_id = current_user.id
+     @bid.commit = 0
+     @bid.homework_type = 1
+     # @bid.
+     if @bid.save
+       HomeworkForCourse.create(:course_id => params[:course_id], :bid_id => @bid.id)
+       unless @bid.watched_by?(current_user)
+         @bid.add_watcher(current_user)
+       end
+     end
+   end
   
   # 学生匿评列表
   def student_jour_list params

app/services/users_service.rb

@@ -211,7 +211,8 @@ class UsersService
       search_by = params[:search_by] ? params[:search_by] : "0"
       scope = scope.where("id not in (?)",watcher).like(params[:name],search_by) if params[:name].present?
     else
-      scope = scope.like(params[:name],search_by) if params[:name].present?
+      teachers = searchTeacherAndAssistant(Course.find(params[:course_id]))
+      scope = scope.where("id not in (?)",teachers.map{|t| t.user_id}).like(params[:name],search_by) if params[:name].present?
     end
     scope
   end

app/views/attachments/_form.html.erb

@@ -17,6 +17,7 @@
 
       <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
     </span>
+    <div class="cl"></div>
   <% end %>
   <% container.saved_attachments.each_with_index do |attachment, i| %>
     <span id="attachments_p<%= i %>" class="attachment">
@@ -34,10 +35,12 @@
 
       <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
     </span>
+    <div class="cl"></div>
   <% end %>
 <% end %>
 </span>
   <% project = project %>
+  <div class="cl"></div>
   <span class="add_attachment" style="font-weight:normal;">
     <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
     <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->

app/views/attachments/_form_project.html.erb

@@ -1,26 +1,32 @@
-<span id="attachments_fields" xmlns="http://www.w3.org/1999/html">
+<% if defined?(container) %>
+<span id="attachments_fields<%= container.id %>" class="attachments_fields" xmlns="http://www.w3.org/1999/html">
 <% if defined?(container) && container && container.saved_attachments %>
   <% if isReply  %>
   <% container.saved_attachments.each_with_index do |attachment, i| %>
     <span id="attachments_p<%= i %>" class="sub_btn">
+
       <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
-      <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") +
-                  link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
-      <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
+      <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
       <span class="ispublic-label"><%= l(:field_is_public)%>:</span>
-      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false, :class => 'is_public')%>
-      <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
+      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false, :class => 'is_public_checkbox')%>
+
+      <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
+      <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
+     <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
     </span>
   <% end %>
   <% else %>
   <% container.attachments.each_with_index do |attachment, i| %>
     <span id="attachments_p<%= i %>" class="attachment">
+
       <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
-      <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") +
-                  link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
-      <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
-      <span class="ispublic-label"><%= l(:field_is_public)%>:</span>
-      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false, :class => 'is_public')%>
+      <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
+          <span class="ispublic-label"><%= l(:field_is_public)%>:</span>
+              <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false, :class => 'is_public_checkbox')%>
+
+              <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
+              <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
+
       <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
     </span>
   <% end %>
@@ -38,12 +44,12 @@
 <span class="add_attachment">
 <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
   <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
-  <%= button_tag "文件浏览", :type=>"button", :onclick=>"_file.click()", :class =>"sub_btn",:style => ie8? ? 'display:none' : '' %>
+  <%= button_tag "文件浏览", :type=>"button", :onclick=>"_file#{container.id}.click()", :class =>"sub_btn",:style => ie8? ? 'display:none' : '' %>
   <%= file_field_tag 'attachments[dummy][file]',
-                     :id => '_file',
+                     :id => "_file#{container.id}",
                      :class => 'file_selector',
                      :multiple => true,
-                     :onchange => 'addInputFiles(this);',
+                     :onchange => "addInputFiles_board(this, '#{container.id}');",
                      :style => 'display:none',
                      :data => {
                              :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
@@ -56,10 +62,73 @@
                              :file_count => l(:label_file_count),
                              :delete_all_files => l(:text_are_you_sure_all)
                      } %>
-  <span id="upload_file_count" :class="c_grey"><%= l(:label_no_file_uploaded)%></span>
+  <span id="upload_file_count<%=container.id %>" :class="c_grey"><%= l(:label_no_file_uploaded)%></span>
+(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
+</span>
+<% else %>
+    <span id="attachments_fields" xmlns="http://www.w3.org/1999/html">
+<% if defined?(container) && container && container.saved_attachments %>
+  <% if isReply  %>
+  <% container.saved_attachments.each_with_index do |attachment, i| %>
+    <span id="attachments_p<%= i %>" class="sub_btn">
+      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
+      <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") +
+                  link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
+      <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
+      <span class="ispublic-label"><%= l(:field_is_public)%>:</span>
+      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false, :class => 'is_public')%>
+      <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
+    </span>
+  <% end %>
+  <% else %>
+  <% container.attachments.each_with_index do |attachment, i| %>
+    <span id="attachments_p<%= i %>" class="attachment">
+      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
+      <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") +
+                  link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
+      <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
+      <span class="ispublic-label"><%= l(:field_is_public)%>:</span>
+      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false, :class => 'is_public')%>
+      <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
+    </span>
+  <% end %>
+  <% end %>
+<% end %>
+</span>
+    <script type='text/javascript'>
+        //    function CompatibleSend()
+        //    {
+        //        var obj=document.getElementById("_file");
+        //        var file= $(obj).clone();
+        //        file.click();
+        //    }
+    </script>
+    <span class="add_attachment">
+<%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
+      <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
+      <%= button_tag "文件浏览", :type=>"button", :onclick=>"_file.click()", :class =>"sub_btn",:style => ie8? ? 'display:none' : '' %>
+      <%= file_field_tag 'attachments[dummy][file]',
+                         :id => '_file',
+                         :class => 'file_selector',
+                         :multiple => true,
+                         :onchange => 'addInputFiles(this);',
+                         :style => 'display:none',
+                         :data => {
+                                 :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
+                                 :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
+                                 :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
+                                 :upload_path => uploads_path(:format => 'js'),
+                                 :description_placeholder => l(:label_optional_description),
+                                 :field_is_public => l(:field_is_public),
+                                 :are_you_sure => l(:text_are_you_sure),
+                                 :file_count => l(:label_file_count),
+                                 :delete_all_files => l(:text_are_you_sure_all)
+                         } %>
+      <span id="upload_file_count" :class="c_grey"><%= l(:label_no_file_uploaded)%></span>
 (<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
 </span>
 
+<% end %>
 <% content_for :header_tags do %>
     <%= javascript_include_tag 'attachments' %>
 <% end %>

app/views/attachments/_homework_jour_link.html.erb

@@ -13,6 +13,6 @@
                         :target => "_blank"%>
           </div>
       <% end %>
-      <br>
+      <div class="cl"></div>
   <% end %>
 </div>

app/views/attachments/upload.js.erb

@@ -3,14 +3,15 @@ var fileSpan = $('#attachments_<%= j params[:attachment_id] %>');
   fileSpan.hide();
   alert("<%= escape_javascript @attachment.errors.full_messages.join(', ') %>");
 <% else %>
-$('<input>', { type: 'hidden', name: 'attachments[<%= j params[:attachment_id] %>][token]' } ).val('<%= j @attachment.token %>').appendTo(fileSpan);
 fileSpan.find('a.remove-upload')
-  .attr({
-    "data-remote": true,
-    "data-method": 'delete',
-    "href": '<%= j attachment_path(@attachment, :attachment_id => params[:attachment_id], :format => 'js') %>'
-  })
-  .off('click');
+        .attr({
+            "data-remote": true,
+            "data-method": 'delete',
+            "href": '<%= j attachment_path(@attachment, :attachment_id => params[:attachment_id], :format => 'js') %>'
+        })
+        .off('click');
+$('<input>', { type: 'hidden', name: 'attachments[<%= j params[:attachment_id] %>][token]' } ).val('<%= j @attachment.token %>').appendTo(fileSpan);
+
 //var divattach = fileSpan.find('div.div_attachments');
 //divattach.html('<%= j(render :partial => 'tags/tagEx', :locals => {:obj => @attachment, :object_flag => "6"})%>');
 <% end %>

app/views/boards/_course_show.html.erb

@@ -100,7 +100,8 @@
                   <%= form_for reply, :as => :reply, :url => {:controller=>'messages',:action => 'reply', :id => topic.id, :board_id => topic.board_id, :is_board => 'true'}, :html => {:multipart => true, :id => 'message_form' + topic.id.to_s} do |f| %>
 
                       <%= render :partial => 'form_project', :locals => {:f => f, :replying => true} %>
-                      <a href="#" onclick="$('#message_form<%= topic.id%>').submit();" class="talk_btn fr c_white" style=""><%= l(:label_memo_create)%></a>
+                      <%= toggle_link l(:button_cancel), "reply" + topic.id.to_s, :focus => 'message_content',:class => 'grey_btn fr ml10' %>
+                      <a href="#" onclick="$('#message_form<%= topic.id%>').submit();" class="blue_btn fr " style=""><%= l(:label_memo_create)%></a>
                   <% end %>
                   <div class="cl"></div>
                 </div>

app/views/boards/_edit.html.erb

@@ -32,9 +32,9 @@
               <%= render :partial => 'form_course',
                          :locals => {:f => f, :replying => !topic.parent.nil?, :topic => topic} %>
               <a href="javascript:void(0)" onclick="submitProjectsBoard('<%= topic.id%>');"class="blue_btn fl c_white"><%= l(:button_submit)%></a>
-              <%= link_to l(:button_cancel), board_message_url(topic.board,topic.root, :r => (topic.parent_id &&topic.id)), :class => "blue_btn grey_btn fl c_white"  %>
+              <a href="javascript:void(0)"  onclick="show_newtalk1('#about_newtalk<%= topic.id%>');" class="blue_btn grey_btn fl c_white"><%= l(:button_cancel) %></a>
 
-          <% end %>
+        <% end %>
         </ul>
       </div>
 <% end %>

app/views/boards/_project_new_topic.html.erb

@@ -4,7 +4,7 @@
     <li>
       <a href="javascript:void(0)"  onclick="show_newtalk();" class="grey_btn fr ml10"><%= l(:button_cancel) %></a>
 
-      <a href="#" onclick="$('#message-form').submit();" class="blue_btn fr " style="margin-left: 55px"><%= l(:button_submit)%></a>
+      <a href="#" onclick="submitProjectsBoard('<%= @message.id %>')" class="blue_btn fr " style="margin-left: 55px"><%= l(:button_submit)%></a>
       <div class="cl"></div>
     </li>
 <% end %>

app/views/courses/show.html.erb

@@ -15,7 +15,7 @@
                 <span class="fl"> &nbsp;</span>
                 <span class="fl"> <%= l(:label_new_activity) %>：</span>
                 <%= link_to "#{eventToLanguageCourse(e.event_type, @course)} "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Course)) ? course_files_path(e.container) :
-                        (e.event_type.eql?("bid") ? homework_course_path(@course) : (e.event_type.eql?("message") ?  course_boards_path(@course,:topic_id => e.id) : e.event_url)),:class => "problem_tit c_dblue fl fb"%>
+                        (e.event_type.eql?("bid") ? homework_course_path(@course) : (e.event_type.eql?("message") || e.event_type.eql?("reply")  ?  course_boards_path(@course,:topic_id => e.id) : e.event_url)),:class => "problem_tit c_dblue fl fb"%>
                 <br />
                 <p class="mt5 break_word"><%= e.event_description.html_safe %>
                   <br />

app/views/forums/_forum_list.html.erb

@@ -48,8 +48,8 @@
             </table>
         </div>
 	</div>	
-	<% end %>	
-	<div class="pagination">
+	<% end %>
+	<div class="pagination" style="margin-top: 10px;">
       <%= pagination_links_full @forums_pages, @forums_count %>
     </div>
 <% else %>

app/views/homework_attach/_addjour.html.erb

@@ -59,7 +59,7 @@
             <strong style="float: left;">
               文件：
             </strong>
-            <div id="homework_attach_jour_attachment">
+            <div id="homework_attach_jour_attachment" style="padding-left: 40px;">
               <%= render :partial => 'attachments/form' %>
             </div>
             <div class="cl"></div>

app/views/homework_attach/_show.html.erb

@@ -12,13 +12,13 @@
         $("#stars_value").val(num);
     }
 
-    function ChoseZero()
-    {
-        if(confirm('是否确定评分为0分?'))
-        {
-            ChoseStars(0);
-        }
-    }
+//    function ChoseZero()
+//    {
+//        if(confirm('是否确定评分为0分?'))
+//        {
+//            ChoseStars(0);
+//        }
+//    }
   </script>
 <div id="popbox">
   <div class="ping_con">

app/views/homework_attach/_show_star.html.erb

@@ -1,4 +1,4 @@
-<a style="float: right;padding-left: 10px;font-weight: normal;cursor: pointer;color: red;" onclick="ChoseZero();">零分</a>
+<a style="float: right;padding-left: 10px;font-weight: normal;cursor: pointer;color: red;" onclick="ChoseStars(0);">零分</a>
 <span><a href="javascript:" id="star05" onclick="ChoseStars(5)" style="background-position:<%= start_score>=5 ? '-24px 0px;':'-2px 0'%>"></a></span>
 <span><a href="javascript:" id="star04" onclick="ChoseStars(4)" style="background-position:<%= start_score>=4 ? '-24px 0px;':'-2px 0'%>"></a></span>
 <span><a href="javascript:" id="star03" onclick="ChoseStars(3)" style="background-position:<%= start_score>=3 ? '-24px 0px;':'-2px 0'%>"></a></span>

app/views/homework_attach/edit.html.erb

@@ -75,16 +75,32 @@
             <%= f.text_area :description, :rows => 8, :name => "homework_description", :class => "w620",
                             :maxlength => 3000, :placeholder => "最多3000个汉字"  %>
           </p>
-          <p>
-            <label style="float: left;">
+            <!--<div class="cl"></div>-->
+          <!--<p>-->
+            <!--<label style="float: left;">-->
+              <!--&nbsp;&nbsp;&nbsp;添加附件&nbsp;&nbsp;&nbsp;&nbsp;：-->
+            <!--</label>-->
+            <!--<div style="float: left;padding-bottom: 15px;">-->
+              <!--<%#= render :partial => 'attachments/form', :locals => {:container => @homework}%>-->
+            <!--</div>-->
+          <!--</p>-->
+            <!--<div class="cl"></div>-->
+
+
+            <div class="cl"></div>
+            <label style="float: left;padding-left: 15px;">
               &nbsp;&nbsp;&nbsp;添加附件&nbsp;&nbsp;&nbsp;&nbsp;：
             </label>
-            <div style="float: left;padding-bottom: 15px;">
-              <%= render :partial => 'attachments/form', :locals => {:container => @homework}%>
+            <!--<div style="float: left;margin-left: 5px;">-->
+              <!--<%#= render :partial => 'attachments/form',locals: {:container => @homework}%>-->
+            <!--</div>-->
+
+            <div style="float: left;">
+              <%= render :partial => 'attachments/form', :locals => {:container => @homework} %>
             </div>
-          </p>
             <div class="cl"></div>
-          <p>
+
+          <p style="padding-top: 10px;">
               <label>&nbsp;&nbsp;&nbsp;开发项目
                 <img src="/images/bid/pic_question.png" width="16" height="16"
                      title="项目是一种由用户创建的基于网络的协作空间，能够为个人或小组提供分布式的协同交流和资料管理等方面的支持。
@@ -101,7 +117,7 @@
             <span style="float: left;">
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
             </span>
-            <a href="javascript:" class="tijiao" onclick="submit_homework_form();">
+            <a href="javascript:void(0)" class="tijiao" onclick="submit_homework_form();">
               <%= l(:label_button_ok)  %>
             </a>
             <a href="javascript:history.back()" class="tijiao">取&nbsp;&nbsp;消</a>

app/views/layouts/_base_feedback.html.erb

@@ -168,16 +168,16 @@ function cookieget(n)
             <div class="side_title"><a title="<%= l(:label_feedback) %>" class="close_btn"><span><%= l(:label_feedback) %></span></a></div>
             <div class="side_center">
                 <div class="custom_service">
-                   <% if @public_forum %>
                   <% get_memo %>
-				  <%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f|  %>
-                      <%= f.text_area :subject,:id=>"subject", :class => "opnionText", :placeholder => l(:label_feedback_tips) %>
-                      <%= f.hidden_field :content,:id => 'hidden', :required => true , :value => l(:label_feedback_value) %>
-		  			 <%#= f.submit :value => l(:label_memo_create), :class => "opnionButton", :id => "button1" %>
-                      <label class="c_grey">您还能输入<span id="textCount" class="c_orange">50</span>个字符</label>
-                      <a href="javascript:void(0);" class="opnionButton" style=" color:#fff;" id="" onclick="f_submit();"><%= l(:label_submit)%></a>
-				  <% end %>
-          <% end %>
+                  <% if @public_forum %>
+                      <%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f|  %>
+                          <%= f.text_area :subject,:id=>"subject", :class => "opnionText", :placeholder => l(:label_feedback_tips) %>
+                          <%= f.hidden_field :content,:id => 'hidden', :required => true , :value => l(:label_feedback_value) %>
+                         <%#= f.submit :value => l(:label_memo_create), :class => "opnionButton", :id => "button1" %>
+                          <label class="c_grey">您还能输入<span id="textCount" class="c_orange">50</span>个字符</label>
+                          <a href="javascript:void(0);" class="opnionButton" style=" color:#fff;" id="" onclick="f_submit();"><%= l(:label_submit)%></a>
+                      <% end %>
+                  <% end %>
                 </div>
                 <div class="msgserver">
                     <a href="http://user.trustie.net/users/34/user_newfeedback" style="color: #15BCCF;"><%= l(:label_technical_support) %>白&nbsp;&nbsp;&nbsp;羽</a>

app/views/memos/_topic_form.html.erb

@@ -2,15 +2,15 @@
 
   <div class="actions" style="max-width:680px;">
     <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
-    <p><%= f.text_field :subject, :required => true, :size => 95 %></p>
+    <p><%= f.text_field :subject, :required => true, :size => 95, :style => 'width:98%' %></p>
     <p style="max-width:680px"><%= f.kindeditor :content,:width=>'99%', :required => true %></p>
     <!--<script type="text/javascript">var ckeditor=CKEDITOR.replace('editor01');</script> -->
-    <br/>
+    <div class="cl"></div>
 
-    <p style="margin-right: 10px;" class="fl">
-       <%= l(:label_attachment_plural) %><br />
-       <%= render :partial => 'attachments/form', :locals => {:container => @memo} %>
-     </p>
+    <label class="fl" style="margin-left: -80px;margin-top: 10px;"><%= l(:label_attachment_plural) %></label>
+    <div style="margin-left: 110px;margin-top: 10px;margin-bottom: 10px;" class="fl">
+      <%= render :partial => 'attachments/form', :locals => {:container => @memo} %>
+    </div>
    <%= f.submit :value => l(:label_memo_create), :style => "margin-left: 100px;"%> <%= link_to l(:button_back), forum_path(@forum) %>
   </div>
 <% end %>

app/views/memos/new.html.erb

@@ -5,22 +5,22 @@
 <% @nav_dispaly_forum_label = 1%>
 <!-- <h1>New memo</h1> -->
 <%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
-						<div class="top-content">
-							<table>
-								<tr>
-									<td class="info_font" style="width: 240px; color: #15bccf"><%= l(:label_projects_community)%></td>
-									<td style="width: 430px; color: #15bccf"><strong><%= l(:label_user_location) %> : </strong></td>
-									<td rowspan="2" width="250px">
-										<div class="top-content-search">
-										</div>
-									</td>
-								</tr>
-								<tr>
-									<td style="padding-left: 8px"><%= link_to request.host()+"/forums", forums_path %></td>
-									<td><p class="top-content-list"><%=link_to l(:label_home),home_path %> > <%=link_to l(:label_forum), :controller => 'forums', :action => 'index' %> > <%=link_to @forum.name  %></p></td>
-								</tr>
-							</table>
-						</div>
+    <div class="top-content">
+        <table>
+            <tr>
+                <td class="info_font" style="width: 240px; color: #15bccf"><%= l(:label_projects_community)%></td>
+                <td style="width: 430px; color: #15bccf"><strong><%= l(:label_user_location) %> : </strong></td>
+                <td rowspan="2" width="250px">
+                    <div class="top-content-search">
+                    </div>
+                </td>
+            </tr>
+            <tr>
+                <td style="padding-left: 8px"><%= link_to request.host()+"/forums", forums_path %></td>
+                <td><p class="top-content-list"><%=link_to l(:label_home),home_path %> > <%=link_to l(:label_forum), :controller => 'forums', :action => 'index' %> > <%=link_to @forum.name  %></p></td>
+            </tr>
+        </table>
+    </div>
 <h3><%=l(:label_memo_new)%></h3>
 <div class="box tabular">
 <div style="width:780px">