Merge branch 'szzh' into develop

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
 
@@ -258,6 +274,13 @@ module Mobile
         get ":course_id/members" do
           cs = CoursesService.new
           count = cs.course_members params
+          # 我如果在学生当中，那么我将放在第一位
+           count.each do |m|
+             if m.user.id == current_user.id
+               count.delete m
+               count.unshift m
+             end
+           end
           present :data, count, with: Mobile::Entities::Member
           present :status, 0
         end
@@ -274,6 +297,20 @@ module Mobile
           present :data,homeworkscore,with: Mobile::Entities::Homeworkscore
           present :status,0
         end
+
+        desc '发布课程通知'
+        params do
+          requires :token,type:String
+          requires :course_id,type:Integer,desc:'课程id'
+          requires :title,type:String,desc:'通知标题'
+          requires :desc,type:String,desc:'通知描述'
+        end
+        post ':course_id/create_course_notice' do
+           cs = CoursesService.new
+           news = cs.create_course_notice params,current_user
+           present :data,news,with:Mobile::Entities::News
+          present :status,0
+        end
       end
     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,8 @@ 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，搜索注册用户不为该课程教师的其他用户'
+          optional :user_id,type:Integer,desc:'用户id'
         end
         get 'search/search_user' do
           us = UsersService.new

app/api/mobile/entities/user.rb

@@ -9,7 +9,7 @@ module Mobile
             u[f]
           elsif u.is_a?(::User)
             if u.respond_to?(f)
-              u.send(f)
+              u.send(f)  unless u.user_extensions.nil?
             else
               case f
                 when :img_url
@@ -17,9 +17,9 @@ module Mobile
                 when :gender
                   u.nil? || u.user_extensions.nil? || u.user_extensions.gender.nil? ? 0 : u.user_extensions.gender
                 when :work_unit
-                  get_user_work_unit u
+                  get_user_work_unit u  unless u.user_extensions.nil?
                 when :location
-                  get_user_location u
+                  get_user_location u  unless u.user_extensions.nil?
                 when :brief_introduction
                   u.nil? || u.user_extensions.nil? ? "" : u.user_extensions.brief_introduction
               end

app/controllers/account_controller.rb

@@ -315,7 +315,7 @@ class AccountController < ApplicationController
     #根据home_url生产正则表达式
     eval("code = " + "/^" + home_url.gsub(/\//,"\\\/") + "\\\/*(welcome)?\\\/*(\\\/index\\\/*.*)?\$/")
     if (code=~params[:back_url] || params[:back_url].to_s.include?('lost_password')) && last_login_on != ''
-      redirect_to user_activities_path(user,host: Setting.user_domain)
+      redirect_to user_activities_path(user,host: Setting.host_user)
     else
       if last_login_on == ''
         redirect_to my_account_url
@@ -333,7 +333,7 @@ class AccountController < ApplicationController
     token = Token.get_or_create_permanent_login_token(user)
     cookie_options = {
       :value => token.value,
-      :expires => 7.days.from_now,
+      :expires => 1.month.from_now,
       :path => (Redmine::Configuration['autologin_cookie_path'] || '/'),
       :secure => (Redmine::Configuration['autologin_cookie_secure'] ? true : false),
       :httponly => true

app/controllers/courses_controller.rb

@@ -852,7 +852,7 @@ class CoursesController < ApplicationController
   #验证是否显示课程
   def can_show_course
     @first_page = FirstPage.find_by_page_type('project')
-    if @first_page.show_course == 2
+    if @first_page.try(:show_course) == 2
        render_404
     end
   end

app/helpers/application_helper.rb

@@ -118,11 +118,11 @@ module ApplicationHelper
       end
 
       #if user.active? || (User.current.admin? && user.logged?)
-      #  link_to name, {:controller=> 'users', :action => 'show', id: user.id, host: Setting.user_domain}, :class => user.css_classes
+      #  link_to name, {:controller=> 'users', :action => 'show', id: user.id, host: Setting.host_user}, :class => user.css_classes
       #else
       #  name
       #end
-      link_to name, {:controller=> 'users', :action => 'show', id: user.id, host: Setting.user_domain}, :class => user.css_classes
+      link_to name, {:controller=> 'users', :action => 'show', id: user.id, host: Setting.host_user}, :class => user.css_classes
     else
       h(user.to_s)
     end
@@ -131,7 +131,7 @@ module ApplicationHelper
   def link_to_isuue_user(user, options={})
     if user.is_a?(User)
       name = h(user.name(options[:format]))
-      link_to name, {:controller=> 'users', :action => 'show', id: user.id, host: Setting.user_domain}, :class => "pro_info_p"
+      link_to name, {:controller=> 'users', :action => 'show', id: user.id, host: Setting.host_user}, :class => "pro_info_p"
     else
       h(user.to_s)
     end
@@ -140,7 +140,7 @@ module ApplicationHelper
   def link_to_settings_user(user, options={})
     if user.is_a?(User)
       name = h(user.name(options[:format]))
-      link_to name, {:controller=> 'users', :action => 'show', id: user.id, host: Setting.user_domain}, :class => "w90 c_orange fl"
+      link_to name, {:controller=> 'users', :action => 'show', id: user.id, host: Setting.host_user}, :class => "w90 c_orange fl"
     else
       h(user.to_s)
     end
@@ -155,7 +155,7 @@ module ApplicationHelper
       else
         name = user.login
       end
-      link_to name, {:controller=> 'users', :action => 'show', id: user.id, host: Setting.user_domain}, :class => options[:class]
+      link_to name, {:controller=> 'users', :action => 'show', id: user.id, host: Setting.host_user}, :class => options[:class]
     else
       h(user.to_s)
     end
@@ -2076,21 +2076,21 @@ module ApplicationHelper
     hidden_non_project = Setting.find_by_name("hidden_non_project")
     visiable = !(hidden_non_project && hidden_non_project.value == "0")
 
-    main_course_link = link_to l(:label_course_practice), {:controller => 'welcome', :action => 'index', :host => Setting.course_domain}
-    main_project_link = link_to l(:label_project_deposit), {:controller => 'welcome', :action => 'index', :host => Setting.project_domain}
-    main_contest_link = link_to l(:label_contest_innovate), {:controller => 'welcome', :action => 'index', :host => Setting.contest_domain}
+    main_course_link = link_to l(:label_course_practice), {:controller => 'welcome', :action => 'index', :host => Setting.host_course}
+    main_project_link = link_to l(:label_project_deposit), {:controller => 'welcome', :action => 'index', :host => Setting.host_name}
+    main_contest_link = link_to l(:label_contest_innovate), {:controller => 'welcome', :action => 'index', :host => Setting.host_contest}
 
     # course_all_course_link = link_to l(:label_course_all), {:controller => 'courses', :action => 'index'}
-    course_teacher_all_link = link_to l(:label_teacher_all), {:controller => 'users', :action => 'index', :role => 'teacher', :host => Setting.course_domain}
+    course_teacher_all_link = link_to l(:label_teacher_all), {:controller => 'users', :action => 'index', :role => 'teacher', :host => Setting.host_course}
     # courses_link = link_to l(:label_course_practice), {:controller => 'courses', :action => 'index'}
-    #users_link = link_to l(:label_software_user), {:controller => 'users', :action => 'index', :host => Setting.user_domain}
+    #users_link = link_to l(:label_software_user), {:controller => 'users', :action => 'index', :host => Setting.host_user}
     # contest_link = link_to l(:label_contest_innovate), {:controller => 'contests', :action => 'index'}
     bids_link = link_to l(:label_requirement_enterprise), {:controller => 'bids', :action => 'index'}
     forum_link = link_to l(:label_forum_all), {:controller => "forums", :action => "index"}
     stores_link = link_to l(:label_stores_index), {:controller => 'stores', :action=> 'index'}
     school_all_school_link = link_to l(:label_school_all), {:controller => 'school', :action => 'index'}
-    project_new_link = link_to l(:label_project_new), {:controller => 'projects', :action => 'new', :host => Setting.project_domain}
-    # project_mine_link = link_to l(:label_my_project), {:controller => 'users', :action => 'user_projects', :host => Setting.project_domain}
+    project_new_link = link_to l(:label_project_new), {:controller => 'projects', :action => 'new', :host => Setting.host_name}
+    # project_mine_link = link_to l(:label_my_project), {:controller => 'users', :action => 'user_projects', :host => Setting.host_name}
 
     #@nav_dispaly_project_label
     nav_list = Array.new

app/helpers/gitlab_helper.rb

@@ -11,7 +11,7 @@ module GitlabHelper
   PROJECT_PATH_CUT =  40
   # gitlab版本库所在服务器
   # 注意REPO_IP_ADDRESS必须以http://开头，暂时只支持HTTP协议，未支持SSH
-  #REPO_IP_ADDRESS = "http://" + Setting.repository_domain
+  #REPO_IP_ADDRESS = "http://" + Setting.host_repository
   REPO_IP_ADDRESS = "http://192.168.137.100"
   GITLAB_API = "/api/v3"
 

app/helpers/repositories_helper.rb

@@ -24,7 +24,7 @@ module RepositoriesHelper
     ROOT_PATH="/home/pdl/redmine-2.3.2-0/apache2/"
   end
   PROJECT_PATH_CUT =  40
-  REPO_IP_ADDRESS = Setting.repository_domain
+  REPO_IP_ADDRESS = Setting.host_repository
 
   def format_revision(revision)
     if revision.respond_to? :format_identifier

app/services/courses_service.rb

@@ -473,6 +473,47 @@ 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
+
+  def create_course_notice params ,current_user
+    n = News.new(:course_id =>params[:course_id], :author_id => current_user.id,:title =>params[:title],:description=> params[:desc])
+    n.save
+    {:id => n.id,:title => n.title,:author_name => n.author.name,:author_id => n.author.id, :description => n.description,:created_on => format_time(n.created_on),:comments_count => n.comments_count}
+  end
+
   private
   def searchmember_by_name  members, name
     #searchPeopleByRoles(project, StudentRoles)
@@ -576,4 +617,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_course.html.erb

@@ -2,26 +2,30 @@
 <% if defined?(container) && container && container.saved_attachments %>
   <% if isReply  %>
   <% container.saved_attachments.each_with_index do |attachment, i| %>
-    <span id="attachments_p<%= i %>" class="attachment">
+    <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')%>
+      <%= 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') %>
       <%= 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">
+     <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}" %>
+       <%= 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 %>
   <% end %>
@@ -56,7 +60,9 @@
         :file_count => l(:label_file_count),
         :delete_all_files => l(:text_are_you_sure_all)
       } %>
-<span id="upload_file_count<%= container.id %>" :class="c_grey"><%= l(:label_no_file_uploaded)%></span>
+  <% if container.nil? %>
+    <span id="upload_file_count" :class="c_grey"><%= l(:label_no_file_uploaded)%></span>
+ <% end %>
 (<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
 </span>
 

app/views/attachments/_form_project.html.erb

@@ -24,7 +24,7 @@
           <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') %>
+              <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), 'data-containerid'=>"#{container.id}",: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}" %>
@@ -41,7 +41,7 @@
     //        file.click();
     //    }
 </script>
-<span class="add_attachment">
+<span class="add_attachment" data-containerid="<%= container.id %>">
 <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %>
   <!--%= link_to image_tag(),"javascript:void(0)", :onclick => "_file.click()"%-->
   <%= button_tag "文件浏览", :type=>"button", :onclick=>"_file#{container.id}.click()", :class =>"sub_btn",:style => ie8? ? 'display:none' : '' %>
@@ -60,7 +60,8 @@
                              :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)
+                             :delete_all_files => l(:text_are_you_sure_all),
+                             :containerid => "#{container.id}"
                      } %>
   <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) %>)
@@ -124,7 +125,9 @@
                                  :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>
+      <% if container.nil? %>
+    <span id="upload_file_count" :class="c_grey"><%= l(:label_no_file_uploaded)%></span>
+ <% end %>
 (<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
 </span>
 

app/views/attachments/destroy.js.erb

@@ -1,8 +1,26 @@
-$('#attachments_<%= j params[:attachment_id] %>').remove();
-var count=$('#attachments_fields>span').length;
-if(count<=0){
-	$("#upload_file_count").text(<%= l(:label_no_file_uploaded)%>);
-	$(".remove_all").remove();
+var attachment_html_obj = $('#attachments_<%= j params[:attachment_id] %>');
+//modify by yutao 2015-5-14  当1个页面存在多个上传控件时此块代码存在bug  故改之  start
+var containerid=$('.remove-upload',attachment_html_obj).data('containerid');
+if(containerid==undefined){
+    $('#attachments_<%= j params[:attachment_id] %>').remove();
+    var count=$('#attachments_fields>span').length;
+    if(count<=0){
+        $("#upload_file_count").text('<%= l(:label_no_file_uploaded)%>');
+        $(".remove_all").remove();
+    }else{
+        $("#upload_file_count").html("<span id=\"count\">"+count+"</span>"+"个文件"+"已上传");
+    }
 }else{
-    $("#upload_file_count").html("已上传"+"<span id=\"count\">"+count+"</span>"+"个文件");
-}
+    $('#attachments_<%= j params[:attachment_id] %>').remove();
+    var count=$('#attachments_fields'+containerid+'>span').length;
+    if(count<=0){
+        $('#upload_file_count'+containerid).text('<%= l(:label_no_file_uploaded)%>');
+        var remove_all_html_obj = $(".remove_all").filter(function(index){
+            return $(this).data('containerid')==containerid;
+        });
+        remove_all_html_obj.remove();
+    }else{
+        $('#upload_file_count'+containerid).html("<span id=\"count\">"+count+"</span>"+"个文件"+"已上传");
+    }
+}
+//modify by yutao 2015-5-14  当1个页面存在多个上传控件时此块代码存在bug  故改之  end

app/views/boards/_course_show.html.erb

@@ -68,6 +68,7 @@
               </div>
 
 
+
               <p style="display: none" id="project_show_<%= topic.id%>">
                 <label id="expend_more_information<%= topic.id%>"  onclick="show_more_reply('#content_<%=topic.id%>','#expend_more_information<%= topic.id%>','#arrow<%=topic.id%>');"  value="show_more">[展开]</label>
                 <span class="g-arr-down">
@@ -125,7 +126,7 @@
                           <div class="Msg_txt">
                             <%= link_to_user_header message.author,false,:class => 'fl c_orange ' %>
                             <br/>
-                            <p class="fl"><%= textAreailizable message,:content,:attachments => message.attachments %></p>
+                            <p class="fl break_word"><%= textAreailizable message,:content,:attachments => message.attachments %></p>
 
                             <br/>
                             <span class=" c_grey fl"><%= format_time(message.created_on) %></span>

app/views/contests/_form_contest.html.erb

@@ -33,20 +33,21 @@
   %>
 </p>
 
-<p style="margin-left:-10px;padding-right: 20px;">
+<p>
   <%= f.text_area :description,
-                  :rows => 5,
-                  :class => 'wiki-edit',
-                  :style => "font-size:small;width:490px;margin-left:10px;",
+                  :size => 60,
+                  :rows => 4,
+                  :style => "width:490px;",
                   :maxlength => Contest::DESCRIPTION_LENGTH_LIMIT,
                   :placeholder => "#{l(:label_contest_description)}"
   %>
 </p>
 
-<p style="margin-left:-10px;">
+<p>
   <%= f.text_field :password,
                    :size => 60,
-                   :style => "width:488px;margin-left: 10px;"
+                   :rows => 4,
+                   :style => "width:490px;"
   %>
 </p>
 

app/views/contests/_new_softapplication.html.erb

@@ -187,7 +187,7 @@
 
           <!-- modified by longjun -->
           <%= link_to l(:label_create_new_projects),
-                      new_project_path(:course => 0, :project_type => 0, :host => Setting.project_domain),
+                      new_project_path(:course => 0, :project_type => 0, :host => Setting.host_name),
                       :target => '_blank'
           %>
           <!-- end longjun -->

app/views/courses/settings.html.erb

@@ -23,6 +23,7 @@
             <label><span class="c_red">*</span>&nbsp;<%= l(:label_tags_course_name)%>&nbsp;&nbsp;：</label>
             <input  type="text" name="course[name]" id="course_name" class="courses_input" maxlength="100" onkeyup="regex_course_name();" value="<%= @course.name%>">
             <span class="c_red" id="course_name_notice" style="display: none;">课程名称不能为空</span>
+            <input type="password" style="top: -100000px;position: fixed;">
           </li>
           <div class="cl"></div>
           <li  class="ml45">

app/views/forums/_show_topics.html.erb

@@ -1,5 +1,4 @@
-<!-- added by fq -->
-<!--display the board-->
+<script>$(function(){$("img").removeAttr("alt");});</script>
 <div class="borad-topic-count">共有 <%=link_to @forum.memos.count %> 个贴子</div>
 <div style="padding-top: 10px">
 <% if memos.any? %>

app/views/issues/_list.html.erb

@@ -31,5 +31,5 @@
         </div>
  <% end -%>
  <ul class="wlist">
-   <%= pagination_links_full issue_pages, issue_count, :per_page_links => false, :remote => false, :flag => true %>
+   <%= pagination_links_full issue_pages, issue_count, :per_page_links => false, :remote => true, :flag => true %>
  </ul>

app/views/issues/show.html.erb

@@ -46,59 +46,52 @@
       <!--属性-->
       <div class="pro_info_box mb10">
         <%= issue_fields_rows do |rows| %>
-            <ul class="fl">
-
-              <li><p class="label"><span class="c_red f12">*</span>&nbsp;状态&nbsp;&nbsp;:&nbsp;</p>
-
-                <p class="pro_info_p"><%= @issue.status.name %></p>
-              </li>
-              <div class="cl"></div>
-              <li><p class="label"><span class="c_red f12">*</span>&nbsp;优先级&nbsp;&nbsp;:&nbsp;</p>
-                <span class="pro_info_p"><%= @issue.priority.name %></span>
-              </li>
-              <div class="cl"></div>
+              <ul class="fl" >
+                <li><p class="label03" >&nbsp;状态&nbsp;&nbsp;:&nbsp;</p><p class="pro_info_p"><%= @issue.status.name %></p>
+                </li>
+                <div class="cl"></div>
               <% unless @issue.disabled_core_fields.include?('assigned_to_id') %>
-                  <li><p class="label">&nbsp;指派给&nbsp;&nbsp;:&nbsp;</p>
-                    <span class="pro_info_p"><%= @issue.assigned_to ? link_to_isuue_user(@issue.assigned_to) : "-" %></span>
-                  </li>
+                <li><p class="label03" >&nbsp;指派给&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p"><%= @issue.assigned_to ? link_to_isuue_user(@issue.assigned_to) : "--" %></span>
+                </li>
               <% end %>
-              <div class="cl"></div>
-              <% unless @issue.disabled_core_fields.include?('fixed_version_id') %>
-                  <li><p class="label">&nbsp;目标版本&nbsp;&nbsp;:&nbsp;</p>
-                    <span class="pro_info_p"><%= (@issue.fixed_version ? link_to_version(@issue.fixed_version, :class => "pro_info_p") : "-") %></span>
-                  </li>
+                <div class="cl"></div>
+              </ul>
+              <ul class="fl" >
+                <li><p class="label03" >&nbsp;优先级&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p" style="width:50px;"><%= @issue.priority.name %></span>
+                </li>
+                <div class="cl"></div>
+              <% unless @issue.disabled_core_fields.include?('done_ratio') %>
+                <li><p class="label03" >&nbsp;% 完成&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p" style="width:50px;"><%= @issue.done_ratio %>%</span>
+                </li>
               <% end %>
-              <div class="cl"></div>
-            </ul>
-            <ul class="fl ml90">
-              <% unless @issue.disabled_core_fields.include?('start_date') %>
-                  <li><p class="label02">&nbsp;开始日期&nbsp;&nbsp;:&nbsp;</p>
+                <div class="cl"></div>
+              </ul>
 
-                    <p class="pro_info_p"><%= format_date(@issue.start_date) %></p></li>
-              <% end %>
-              <div class="cl"></div>
-              <% unless @issue.disabled_core_fields.include?('due_date') %>
-                  <li><p class="label02">&nbsp;计划完成日期&nbsp;&nbsp;:&nbsp;</p>
-                    <span class="pro_info_p"><%= format_date(@issue.due_date) %></span>
-                  </li>
+              <ul class="fl " >
+              <% unless @issue.disabled_core_fields.include?('start_date') %>
+                <li><p class="label03" style="width:50px;" >&nbsp;开始&nbsp;&nbsp;:&nbsp;</p><p class="pro_info_p"><%= format_date(@issue.start_date) %></p>
+                </li>
               <% end %>
-              <div class="cl"></div>
+                <div class="cl"></div>
               <% unless @issue.disabled_core_fields.include?('estimated_hours') %>
-
-                  <li><p class="label02">&nbsp;预期时间&nbsp;&nbsp;:&nbsp;</p>
-                    <span class="pro_info_p"><%= l_hours(@issue.estimated_hours) %></span>
-                  </li>
-
+                <li><p class="label03" style="width:50px;">&nbsp;周期&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p"><%= l_hours(@issue.estimated_hours) %></span>
+                </li>
               <% end %>
-              <div class="cl"></div>
-              <% unless @issue.disabled_core_fields.include?('done_ratio') %>
-                  <li><p class="label02">&nbsp;% 完成&nbsp;&nbsp;:&nbsp;</p>
-                    <span class="pro_info_p"><%= @issue.done_ratio %>%</span>
-                  </li>
+                <div class="cl"></div>
+              </ul>
+              <ul class="fl " >
+                <% unless @issue.disabled_core_fields.include?('due_date') %>
+                <li><p class="label03" >&nbsp;计划完成&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p" style="width:120px;"><%= format_date(@issue.due_date)? format_date(@issue.due_date) : "--" %></span>
+                </li>
               <% end %>
-              <div class="cl"></div>
-            </ul>
-        <% end %>
+                <div class="cl"></div>
+              <% unless @issue.disabled_core_fields.include?('fixed_version_id') %>
+                <li><p class="label03" >&nbsp;目标版本&nbsp;&nbsp;:&nbsp;</p><span class="pro_info_p" style="width:120px;"><%= (@issue.fixed_version ? link_to_version(@issue.fixed_version, :class => "pro_info_p") : "--") %></span>
+                </li>
+              <% end %>
+                <div class="cl"></div>
+              </ul>
+            <% end %><!--pro_info_box end-->
         <%#= render_custom_fields_rows(@issue) %>
         <%#= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
       </div>

app/views/layouts/_base_feedback.html.erb

@@ -169,15 +169,15 @@ function cookieget(n)
             <div class="side_center">
                 <div class="custom_service">
                   <% get_memo %>
-                  <% 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 %>
+                   <% 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/layouts/_base_header.html.erb

@@ -27,13 +27,13 @@
               <% end %>
               <%= render :partial => 'layouts/user_project_list', :locals => {:hasCourse => hasCourse} %>
               <li style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-                <%=link_to l(:label_user_edit), {:controller => 'my', :action=> 'account', host: Setting.user_domain}%>
+                <%=link_to l(:label_user_edit), {:controller => 'my', :action=> 'account', host: Setting.host_user}%>
               </li>
 			</ul>
 		</li>
 		<li style="padding:0 0; margin:0 0;display:inline;border-bottom: 0;">
 			<%=link_to l(:label_my_message)+'('+User.current.count_new_jour.to_s+')',
-                       { :controller => 'users', :action => 'user_newfeedback', id: User.current.id, host: Setting.user_domain },
+                       { :controller => 'users', :action => 'user_newfeedback', id: User.current.id, host: Setting.host_user },
                        {:class => 'my-message'} if User.current.logged?%>
 		</li>
 	</ul>

app/views/layouts/_bootstrap_base_header.html.erb

@@ -67,17 +67,17 @@ end
         <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%=User.current%> <b class="caret"></b></a>
         <ul class="dropdown-menu">
         	<li>
-        		<%=link_to l(:label_my_message)+'('+User.current.count_new_jour.to_s+')', { :controller => 'users', :action => 'user_newfeedback', id: User.current.id, host: Setting.user_domain }, {:class => 'my-message'} if User.current.logged? -%>
+        		<%=link_to l(:label_my_message)+'('+User.current.count_new_jour.to_s+')', { :controller => 'users', :action => 'user_newfeedback', id: User.current.id, host: Setting.host_user }, {:class => 'my-message'} if User.current.logged? -%>
             </li>
            <li>
-             <%=link_to l(:label_my_course), {:controller => 'users', :action => 'user_courses', id: User.current.id, host: Setting.course_domain} %>
+             <%=link_to l(:label_my_course), {:controller => 'users', :action => 'user_courses', id: User.current.id, host: Setting.host_course} %>
            </li>
            <li>
-             <%=link_to l(:label_my_projects),{:controller => 'users', :action => 'user_projects', id: User.current.id, host: Setting.project_domain} %>
+             <%=link_to l(:label_my_projects),{:controller => 'users', :action => 'user_projects', id: User.current.id, host: Setting.host_name} %>
            </li>
            <li class="divider"></li>
            <li>
-             <%=link_to l(:label_user_edit), {:controller => 'my', :action=> 'account', host: Setting.user_domain}%>
+             <%=link_to l(:label_user_edit), {:controller => 'my', :action=> 'account', host: Setting.host_user}%>
            </li>
          </ul>
        </li>