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

Gemfile

@@ -6,6 +6,10 @@ unless RUBY_PLATFORM =~ /w32/
   gem 'iconv'
 end
 
+source 'http://rubygems.oneapm.com' do
+    gem 'oneapm_rpm'
+end
+
 gem "mysql2", "= 0.3.18"
 gem 'redis-rails'
 gem 'rubyzip'

app/api/mobile/apis/users.rb

@@ -98,6 +98,7 @@ module Mobile
         params do
           requires :token, type: String
           requires :user_id, type: Integer,desc: '被留言的用户id'
+          requires :page,type:Integer,desc:'请求数据的页码'
         end
         get ':user_id/messages' do
           us = UsersService.new
@@ -106,7 +107,7 @@ module Mobile
           present :status,0
         end
 
-        desc "给用户留言或回复用户留言"
+        desc "回复用户留言"
         params do
           requires :token, type: String
           requires :user_id, type: Integer,desc: '被留言的用户id'
@@ -115,12 +116,23 @@ module Mobile
           requires :parent_id,type:Integer,desc:'留言父id'
           requires :ref_message_id,type:Integer,desc:'引用消息id'
         end
-        post ':user_id/leave_message' do
+        post ':user_id/reply_message' do
           us = UsersService.new
           jours = us.reply_user_messages params,current_user
           present :status,0
         end
 
+        desc "给用户留言"
+        params do
+          requires :token, type: String
+          requires :user_id, type: Integer,desc:'被留言的用户id'
+          requires :content, type: String,desc:'留言内容'
+        end
+        post ':user_id/leave_message' do
+          us = UsersService.new
+          us.leave_message params,current_user
+          present :data,0
+        end
       end
     end
   end

app/controllers/account_controller.rb

@@ -336,6 +336,7 @@ class AccountController < ApplicationController
       :expires => 1.month.from_now,
       :path => (Redmine::Configuration['autologin_cookie_path'] || '/'),
       :secure => (Redmine::Configuration['autologin_cookie_secure'] ? true : false),
+      :domain => Redmine::Configuration['cookie_domain'],
       :httponly => true
     }
     cookies[autologin_cookie_name] = cookie_options

app/controllers/application_controller.rb

@@ -199,7 +199,7 @@ class ApplicationController < ActionController::Base
   # Logs out current user
   def logout_user
     if User.current.logged?
-      cookies.delete(autologin_cookie_name)
+      cookies.delete(autologin_cookie_name, domain: :all)
       # Token.delete_all(["user_id = ? AND action = ?", User.current.id, 'autologin'])
       self.logged_user = nil
     end

app/controllers/avatar_controller.rb

@@ -24,6 +24,7 @@ class AvatarController < ApplicationController
           else
             @image_file=params[:filename]
           end      
+          @temp_file = StringIO.new(@temp_file)
         end
       end
     end
@@ -32,7 +33,7 @@ class AvatarController < ApplicationController
       if @temp_file.size > Setting.upload_avatar_max_size.to_i
         @status = 1
         @msg = l(:error_upload_avatar_to_large, :max_size => number_to_human_size(Setting.upload_avatar_max_size.to_i))
-      elsif Trustie::Utils::Image.new(@temp_file.tempfile.path).image?
+      elsif Trustie::Utils::Image.new(@temp_file).image?
         diskfile=disk_filename(@source_type,@source_id)
         @urlfile='/' << File.join("images","avatars",avatar_directory(@source_type),avatar_filename(@source_id,@image_file))
 
@@ -50,6 +51,7 @@ class AvatarController < ApplicationController
         md5 = Digest::MD5.new
         File.open(diskfile, "wb") do |f|
           if @temp_file.respond_to?(:read)
+            @temp_file.rewind
             buffer = ""
             while (buffer = @temp_file.read(8192))
               f.write(buffer)

app/controllers/bids_controller.rb

@@ -675,11 +675,12 @@ class BidsController < ApplicationController
   #删除作业
   #by xianbo
   def homework_destroy
-    @bid_to_destroy = Bid.find params[:course_id]
+    @bid_to_destroy = Bid.find params[:id]
+    course_url = course_homework_path(@bid_to_destroy.courses.first)
     (render_403; return false) unless User.current.admin?||User.current.id==@bid_to_destroy.author_id
     @bid_to_destroy.destroy
     respond_to do |format|
-      format.html { redirect_to :back }
+      format.html { redirect_to course_url }
       format.js
       #format.api { render_api_ok }
     end

app/controllers/issues_controller.rb

@@ -126,11 +126,11 @@ class IssuesController < ApplicationController
     @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
     @priorities = IssuePriority.active
     @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
-    
+
     @project_base_tag = (params[:project_id] || @issue.project) ? 'base_projects':'base'#by young
     @available_watchers = (@issue.project.users.sort + @issue.watcher_users).uniq
-    
-    respond_to do |format|
+
+    respond_to do |format|``
       format.html {
         retrieve_previous_and_next_issue_ids
         render :template => 'issues/show', :layout => @project_base_tag#by young

app/controllers/projects_controller.rb

@@ -348,7 +348,7 @@ class ProjectsController < ApplicationController
     if !params[:mail].blank? && User.find_by_mail(params[:mail].to_s).nil?
       email = params[:mail]
       Mailer.run.send_invite_in_project(email, @project, User.current)
-      @is_zhuce =false
+      @is_zhuce = false
       flash[:notice] = l(:notice_email_sent, :value => email)
     elsif !User.find_by_mail(params[:mail].to_s).nil?
       user = User.find_by_mail(params[:mail].to_s)

app/controllers/zipdown_controller.rb

@@ -9,10 +9,14 @@ class ZipdownController < ApplicationController
 
   #统一下载功能
   def download
-    begin
-      send_file "#{OUTPUT_FOLDER}/#{params[:file]}", :filename => params[:filename], :type => detect_content_type(params[:file])
-    rescue => e
-      render file: 'public/no_file_found.html'
+    if User.current.logged?
+      begin
+        send_file "#{OUTPUT_FOLDER}/#{params[:file]}", :filename => params[:filename], :type => detect_content_type(params[:file])
+      rescue => e
+        render file: 'public/no_file_found.html'
+      end
+    else
+      render_403
     end
   end
 

app/services/courses_service.rb

@@ -364,19 +364,20 @@ class CoursesService
       latest_course_dynamics = []
       latest_news = course.news.order("created_on desc").first
       unless latest_news.nil?
-        latest_course_dynamics << {:type => 1,:time => latest_news.created_on,:message => l(:label_recently_updated_notification,:locale => get_user_language(current_user))}
+        latest_course_dynamics << {:type => 1,:time => latest_news.created_on,
+                                   :message =>latest_news.author.realname<< l(:label_recently_updated_notification,:locale => get_user_language(current_user))<<"："<< latest_news.title }
       end
       latest_message = course.journals_for_messages.order("created_on desc").first
       unless latest_message.nil?
-        latest_course_dynamics << {:type => 2,:time => latest_message.created_on,:message => l(:label_recently_updated_message,:locale => get_user_language(current_user))}
+        latest_course_dynamics << {:type => 2,:time => latest_message.created_on,:message =>latest_message.user.realname << l(:label_recently_updated_message,:locale => get_user_language(current_user))<<"："<<latest_message.notes}
       end
       latest_attachment = course.attachments.order("created_on desc").first
       unless latest_attachment.nil?
-        latest_course_dynamics << {:type => 3,:time => latest_attachment.created_on,:message => l(:label_recently_updated_courseware,:locale => get_user_language(current_user))}
+        latest_course_dynamics << {:type => 3,:time => latest_attachment.created_on,:message =>latest_attachment.author.realname<< l(:label_recently_updated_courseware,:locale => get_user_language(current_user))<<"："<<latest_attachment.filename}
       end
       latest_bid = course.homeworks.order('updated_on DESC').first
       unless latest_bid.nil?
-        latest_course_dynamics << {:type => 4,:time => latest_bid.updated_on,:message => l(:label_recently_updated_homework,:locale => get_user_language(current_user))}
+        latest_course_dynamics << {:type => 4,:time => latest_bid.updated_on,:message => latest_bid.author.realname<<l(:label_recently_updated_homework,:locale => get_user_language(current_user))<<"："<<latest_bid.name}
       end
 
       # Time 2015-04-07 14:58:30
@@ -416,7 +417,7 @@ class CoursesService
       end
       latest_homework_attach = homeworks.first
       unless latest_homework_attach.nil?
-        latest_course_dynamics << {:type => 4,:time => latest_homework_attach.updated_at,:message => l(:label_recently_updated_homework,:locale => get_user_language(current_user))}
+        latest_course_dynamics << {:type => 4,:time => latest_homework_attach.updated_at,:message =>latest_homework_attach.user.realname<< l(:label_recently_updated_homework,:locale => get_user_language(current_user))<<"："<<(latest_homework_attach.name.nil? ? latest_homework_attach.description : latest_homework_attach.name)}
       end
       latest_course_dynamics.sort!{|order,newer| newer[:time] <=> order[:time]}
       latest_course_dynamic = latest_course_dynamics.first

app/services/users_service.rb

@@ -158,7 +158,7 @@ class UsersService
   # 获取某个用户的所有留言信息
   def get_all_messages params
     user = User.find(params[:user_id])
-    jours = user.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
+    jours = user.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC').page(params[:page] || 1).per(10)
     jours.update_all(:is_readed => true, :status => false)
     jours.each do |journal|
       fetch_user_leaveWord_reply(journal).update_all(:is_readed => true, :status => false)
@@ -184,7 +184,11 @@ class UsersService
     user.add_jour(nil, nil,nil,options)
   end
 
-
+  # 给用户留言
+  def leave_message params,current_user
+        obj = User.find(params[:user_id]).add_jour(current_user, params[:content], 0)
+        obj
+  end
 
 
   #关注列表

app/views/courses/homework.html.erb

@@ -21,6 +21,9 @@
         <p class="fl "><%= l(:lebel_homework_commit)%> ( <%= link_to bid.homeworks.count, course_for_bid_path(bid.id), :class => 'c_red'%> )</p>
         <% if @is_teacher%>
             <%= bid_anonymous_comment(bid)%>
+            <% if bid.homeworks.empty? %>
+            <%= link_to(l(:button_delete),bids_homework_path(:id => bid.id), :method => :delete, :confirm => l(:label_delete_confirm), :class => "fr mr10 work_edit") %>
+            <% end %>
             <%= link_to(l(:button_edit),edit_bid_path(:course_id =>@course.id, :bid_id => bid.id), :class => "fr mr10 work_edit") %>
         <% elsif @is_student%>
             <%= student_anonymous_comment bid %>
@@ -59,4 +62,4 @@
 <ul class="wlist">
   <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
 </ul>
-<div class="cl"></div>
+<div class="cl"></div>

app/views/issues/_action_menu.html.erb

@@ -1,6 +1,6 @@
 <!--added by huang-->
 <%#= watcher_link_issue(@issue, User.current) %>
-<%#= link_to l(:button_copy), project_copy_issue_path(@project, @issue), :class => 'icon icon-copy' if User.current.allowed_to?(:add_issues, @project) %>
+<%= link_to l(:button_copy), project_copy_issue_path(@project, @issue), :class => 'talk_edit fr' if User.current.allowed_to?(:add_issues, @project) %>
 <%= link_to l(:button_delete), issue_path(@issue.id), :data => {:confirm => issues_destroy_confirmation_message(@issue)}, :method => :delete, :class => 'talk_edit fr' if User.current.allowed_to?(:delete_issues, @project) %>
 <%= link_to l(:button_edit), edit_issue_path(@issue.id), :onclick => 'showAndScrollTo("all_attributes"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:edit_issues, @project)  %>
 <%= link_to l(:label_user_newfeedback), edit_issue_path(@issue.id), :onclick => 'showAndScrollTo("update", "issue_notes"); return false;', :class => 'talk_edit fr', :accesskey => accesskey(:edit) if @issue.editable? && User.current.allowed_to?(:add_issue_notes, @project)  %>

app/views/issues/_form.html.erb

@@ -5,12 +5,10 @@
         <li>
           <% if @issue.safe_attribute? 'tracker_id' %>
               <label class="label"><span class="c_red f12">*</span>&nbsp;类型&nbsp;&nbsp;:&nbsp;</label>
-              <%= f.select :tracker_id,
-                           @issue.project.trackers.collect { |t| [t.name, t.id] },
-                           {:required => true, :no_label => true},
-                           :onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')",
-                           :class => "w90"
-              %>
+              <%= f.select :tracker_id, @issue.project.trackers.collect { |t| [t.name, t.id] },
+                        {:required => true, :no_label => true},
+                         :onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')",
+                         :class => "w90" %>
           <% end %>
         </li>
         <li>
@@ -31,11 +29,10 @@
           <% if @issue.safe_attribute? 'subject' %>
               <label class="label"><span class="c_red f12">*</span>&nbsp;主题&nbsp;&nbsp;:&nbsp;</label>
               <%= f.text_field :subject,
-                               :class => "w583",
-                               :maxlength => 255,
-                               :style => "font-size:small",
-                               :no_label => true
-              %>
+                             :class => "w576",
+                             :maxlength => 255,
+                             :style => "font-size:small",
+                             :no_label => true %>
               <!--Added by young-->
               <%= javascript_tag do %>
                   observeAutocompleteField('issue_subject',
@@ -54,16 +51,17 @@
           <% if @issue.safe_attribute? 'description' %>
               <label class="label">&nbsp;描述&nbsp;&nbsp;:&nbsp;</label>
               <%= f.label_for_field :description, :required => @issue.required_attribute?('description'), :no_label => true, :class => "label" %>
-              <%= link_to_function image_tag('edit.png'), '$(this).hide(); $("#issue_description_and_toolbar").show()' unless @issue.new_record? %>
-              <%= content_tag 'span', :id => "issue_description_and_toolbar", :style => (@issue.new_record? ? nil : 'display:none') do %>
-                  <%= f.text_area :description,
-                                  :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min),
-                                  :accesskey => accesskey(:edit),
-                                  :class => "w583",
-                                  :no_label => true %>
-              <% end %>
-
-              <%= wikitoolbar_for 'issue_description' %>
+              <%#= link_to_function image_tag('edit.png'), '$(this).hide(); $("#issue_description_and_toolbar").show()' unless @issue.new_record? %>
+              <%#= content_tag 'span', :id => "issue_description_and_toolbar" do %>
+              <%= f.kindeditor :description,:editor_id => "issue_desc_editor",
+                             # :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min),
+                             # :accesskey => accesskey(:edit),
+                             # :class => "w583",
+                             :width=>'87%',
+                             :resizeType => 0,
+                             :no_label => true %>
+              <%# end %>
+              <%#= wikitoolbar_for 'issue_description' %>
           <% end %>
         </li>
         <div class="cl"></div>
@@ -96,20 +94,20 @@
     </div>
     <div class="cl"></div>
     <!--<div class="newpro_box02 ">-->
-      <!--<label class="label"> <%#= l(:label_issue_watchers) %>：</label>-->
-      <!--<input id="" name="" size="22" class="fl mb10 h26" type="text" placeholder="搜索添加跟踪者">-->
-          <!--<span class="search_for_watchers">-->
-          <%#= link_to "",
+    <!--<label class="label"> <%#= l(:label_issue_watchers) %>：</label>-->
+    <!--<input id="" name="" size="22" class="fl mb10 h26" type="text" placeholder="搜索添加跟踪者">-->
+    <!--<span class="search_for_watchers">-->
+    <%#= link_to "",
 #                       {:controller => 'watchers', :action => 'new', :project_id => @issue.project},
 #                       :remote => true,
 #                       :method => 'get',
                       :class => "pic_sch mt5 ml5" %>
-          <!--</span>-->
+    <!--</span>-->
     <%#= javascript_tag "observeSearchfield('user_search', 'users_for_watcher', '#{ escape_javascript watchers_autocomplete_for_user_path(:user => @available_watchers, :format => 'js', :flag => 'ture')  }')" %>
     <!--<div class="cl"></div>-->
-      <!--<span id="watchers_inputs">-->
-          <!--<%#= watchers_checkboxes(@issue, @available_watchers) %>-->
-      <!--</span>-->
+    <!--<span id="watchers_inputs">-->
+    <!--<%#= watchers_checkboxes(@issue, @available_watchers) %>-->
+    <!--</span>-->
     <!--<div class="cl"></div>-->
     <!--</div>-->
     <%= call_hook(:view_issues_form_details_bottom, {:issue => @issue, :form => f}) %>

app/views/issues/new.html.erb

@@ -1,3 +1,4 @@
+<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
 <div class="project_r_h" xmlns="http://www.w3.org/1999/html">
   <h2 class="project_h2"><%= l(:label_issue_new) %></h2>
 </div>
@@ -10,7 +11,7 @@
       <%= render :partial => 'issues/form', :locals => {:f => f} %>
     </div>
     <!--<%= javascript_tag "$('#issue_subject').focus();" %>-->
-    <a href="#" class="blue_btn fl ml80" onclick="$('#issue-form').submit();">
+    <a href="#" class="blue_btn fl ml80" onclick="issue_desc_editor.sync();$('#issue-form').submit();">
       <%= l(:button_create) %>
     </a>
     <%#= preview_link preview_new_issue_path(:project_id => @project), 'issue-form', 'preview', {:class => "blue_btn fl ml10"} %>

app/views/issues/show.html.erb

@@ -1,3 +1,4 @@
+<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
 <div class="project_r_h">
   <h2 class="project_h2"><%= l(:label_issue_edit) %></h2>
 </div>
@@ -32,7 +33,7 @@
       <% if @issue.description? || @issue.attachments.any? -%>
           <% if @issue.description? %>
               <%#= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'icon icon-comment' if authorize_for('issues', 'edit') %>
-              <%= textilizable @issue, :description, :attachments => @issue.attachments %>
+              <%= textAreailizable @issue, :description, :attachments => @issue.attachments %>
           <% end %>
           </div>
           <div class="pro_pic_box mb10">
@@ -102,13 +103,13 @@
       </div>
   <!--problem_main end-->
   <div style="clear: both;"></div>
+  <!--留言-->
   <% if @issue.editable? %>
       <div id="update">
         <%= render :partial => 'edit' %>
       </div>
-      <!--留言-->
       <p style="padding-top: 5px"></p>
-      <a remote="true" href="javascript:void(0)" class="blue_btn fr mr80" onclick="$('#issue-form').submit();">
+      <a remote="true" href="javascript:void(0)" class="blue_btn fr mr80" onclick="issue_desc_editor.sync();$('#issue-form').submit();">
         <%= l(:button_submit) %>
       </a>
   <% end %>
@@ -123,18 +124,12 @@
       <%= render :partial => 'changesets', :locals => {:changesets => @changesets} %>
     </div>
 <% end %>
-<!--留言-- end>
-<!--<div style="clear: both;"></div>-->
-<!--<%#= render :partial => 'action_menu' %>-->
-
-
 <div class="cl"></div>
 <% other_formats_links do |f| %>
     <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
     <%= f.link_to 'PDF' %>
 <% end %>
 
-
 <% content_for :sidebar do %>
     <%= render :partial => 'issues/sidebar' %>
     <br>

app/views/layouts/_base_feedback.html.erb

@@ -14,7 +14,7 @@
     .close_btn span { display:none;}
     .side_center .custom_service p { text-align:center; padding:6px 0; margin:0; vertical-align:middle;}
     .msgserver { margin:2px 0px 0px 4px; padding-top: 0px}
-    .msgserver a { background:url(/images/sidebar_bg.png) no-repeat -119px -115px; padding-left:22px;}
+    .msgserver a { padding-left:4px;}
     .opnionText{ width:122px; height:180px; border-color: #DFDFDF; background:#fff; color:#999; padding:3px; font-size:12px;}
     .opnionButton{ display:block; background:#15bccf; width:130px; height:23px; margin-top:5px; text-align:center; padding-top:3px;}
     .opnionButton:hover{background: #0fa9bb; }
@@ -180,7 +180,9 @@ function cookieget(n)
           <% 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>
+                    <a target="hiddentab" href="http://wpa.qq.com/msgrd?v=1&uin=1554253403&site=qq&menu=yes" style="color: #15BCCF;">
+                      <%= l(:label_technical_support) %>白&nbsp;&nbsp;&nbsp;羽</a>
+                      <iframe name="hiddentab" style="display: none"></iframe>
                 </div>
             </div>
             <div class="side_bottom"></div>

app/views/layouts/_new_feedback.html.erb

@@ -22,10 +22,9 @@
           <% end %>
         </div>
         <div class="msgserver">
-          <a href="http://user.trustie.net/users/34/user_newfeedback" target="_blank">
-            <%= l(:label_technical_support) %>
-            白&nbsp;&nbsp;&nbsp;羽
-          </a>
+          <a target="hiddentab" href="http://wpa.qq.com/msgrd?v=1&uin=1554253403&site=qq&menu=yes" style="color: #15BCCF;">
+            <%= l(:label_technical_support) %>白&nbsp;&nbsp;&nbsp;羽</a>
+            <iframe name="hiddentab" style="display: none"></iframe>
         </div>
       </div>
       <div class="side_bottom"></div>

app/views/layouts/base_projects.html.erb

@@ -18,54 +18,7 @@
   <!-- page specific tags -->
   <%= yield :header_tags -%>
 
-  <!--项目的三种类型-->
-  <script type="text/javascript">
-      function click_ok(url)
-      {
-          $('#light').css('display','none');
-          $('#fade').css('display','none');
-          //ajax处理请求
-          var project_type;
-          if($("#development_group").attr("checked") == "checked"){
-              project_type = 1;
-          }
-          else if($("#research_group").attr("checked") == "checked"){
-              project_type = 2;
 
-          }
-          else if($("#friend_organization").attr("checked") == "checked"){
-              project_type = 3;
-          }
-          $.get(
-                  url,
-                  { project_type: project_type},
-                  function (data) {
-                      if(data == 1)
-                      {
-                          $("#setting_project_type").replaceWith("<%= escape_javascript(project_type_link(l(:label_development_team), 1))%>");
-                          $("#project_memu_list").html('<%= escape_javascript(render(:partial => 'projects/development_group')) %>');
-                          $("#close_light").attr("onClick","close_window('development_group');");
-                      }
-                      else if(data == 2)
-                      {
-                          $("#setting_project_type").replaceWith("<%= escape_javascript(project_type_link(l(:label_research_group), 2))%>");
-                          $("#project_memu_list").html('<%= escape_javascript(render(:partial => 'projects/research_team')) %>');
-                          $("#close_light").attr("onClick","close_window('research_group');");
-                      }
-                      else if(data == 3)
-                      {
-                          $("#setting_project_type").replaceWith("<%= escape_javascript(project_type_link(l(:label_friend_organization), 3))%>");
-                          $("#project_memu_list").html('<%= escape_javascript(render(:partial => 'projects/friend_group')) %>');
-                          $("#close_light").attr("onClick","close_window('friend_organization');");
-                      }
-                      else
-                      {
-                          alert("服务器异常，请与管理员联系");
-                      }
-                  }
-          );
-      }
-  </script>
 </head>
 <!--add by huang-->
 <body>
@@ -83,13 +36,7 @@
       </h2>
       <p class="hidden">
         <%= l(:label_user_location) %> :
-        <%= link_to l(:field_homepage), home_path %>
-        >
-        <a href="http://<%= Setting.host_name %>">
-          <%=l(:label_project_hosting_platform) %>
-        </a>
-        >
-        <%= link_to @project.name, project_path(@project.id) %>
+        <%= link_to l(:field_homepage), home_path %> > <a href="http://<%= Setting.host_name %>"><%=l(:label_project_hosting_platform) %> </a>><%= link_to @project.name, project_path(@project.id) %>
       </p>
     </div>
     <div class="search fl">
@@ -144,10 +91,13 @@
           <%= l(:label_member) %>（<%= link_to "#{@project.members.count}", project_member_path(@project), :class => 'info_foot_num c_blue' %>）
           <span>|&nbsp;</span>
           <%= l(:label_user_watcher) %>（<%= link_to "#{@project.watcher_users.count}", {:controller=>"projects", :action=>"watcherlist", :id => @project.id}, :class => 'info_foot_num c_blue'  %>）
-          <span>|&nbsp;</span>
-          <%= l(:project_module_attachments) %>（
           <% attaments_num = @project.attachments.count+Attachment.where(["`container_type` = 'Version' and `container_id` in (?)",@project.versions.map{ |v| v.id}]).all.count  %>
-          <%= link_to "#{attaments_num}", project_files_path(@project), :class => 'info_foot_num c_blue' %></span>）
+          <% unless @project.enabled_modules.where("name = 'files'").empty? %>
+            <span>|&nbsp;</span>
+            <%= l(:project_module_attachments) %>（
+            <% attaments_num %>
+            <%= link_to "#{attaments_num}", project_files_path(@project), :class => 'info_foot_num c_blue' %></span>）
+          <% end %>
         </div>
         <div class="cl"></div>
       </div><!--参数 end-->
@@ -164,14 +114,14 @@
           </ul>
         <% end %><!--end-->
         <!--menu 左侧工具栏 -->
-        <!--project_new_type: 1为开发组；2为科研组；3为朋友圈子-->
+        <%#--project_new_type: 1为开发组；2为科研组；3为朋友圈子--%>
         <div id="project_memu_list">
           <% if @project.project_new_type == 1 || @project.project_new_type.nil? %>
-            <%= render :partial => 'projects/development_group', :locals => {:project => @project}%>
+            <%= render :partial => 'projects/development_group', :locals => {:project => @project, :attaments_num => attaments_num} %>
           <% elsif @project.project_new_type == 2 %>
-            <%= render :partial => 'projects/research_team', :locals => {:project => @project}%>
+            <%= render :partial => 'projects/research_team', :locals => {:project => @project, :attaments_num => attaments_num} %>
           <% else %>
-            <%= render :partial => 'projects/friend_group', :locals => {:project => @project}%>
+            <%= render :partial => 'projects/friend_group', :locals => {:project => @project, :attaments_num => attaments_num} %>
           <% end %>
         </div>
         <!-- end -->
@@ -230,8 +180,55 @@
       <li><input type="radio" name="project_type" <%= @project.project_new_type == 3 ? 'checked' : ''%> id="friend_organization"/><label class="f14">&nbsp;&nbsp;圈子模式：<span class="f12 ml5 c_grey">为朋友圈提供简洁的交流和分享工具。</span></label></li>
     </ul>
     <a href="javascript:void(0)" class="orange_btn" onclick="click_ok('<%= change_project_type_project_path @project%>');" >确定</a>
-
   </div>
+  <!--项目的三种类型-->
+  <script type="text/javascript">
+      function click_ok(url)
+      {
+          $('#light').css('display','none');
+          $('#fade').css('display','none');
+          //ajax处理请求
+          var project_type;
+          if($("#development_group").attr("checked") == "checked"){
+              project_type = 1;
+          }
+          else if($("#research_group").attr("checked") == "checked"){
+              project_type = 2;
+
+          }
+          else if($("#friend_organization").attr("checked") == "checked"){
+              project_type = 3;
+          }
+          $.get(
+                  url,
+                  { project_type: project_type},
+                  function (data) {
+                      if(data == 1)
+                      {
+                          $("#setting_project_type").replaceWith("<%= escape_javascript(project_type_link(l(:label_development_team), 1))%>");
+                          $("#project_memu_list").html('<%= escape_javascript(render(:partial => 'projects/development_group', :locals => {:project => @project, :attaments_num => attaments_num})) %>');
+                          $("#close_light").attr("onClick","close_window('development_group');");
+                      }
+                      else if(data == 2)
+                      {
+                          $("#setting_project_type").replaceWith("<%= escape_javascript(project_type_link(l(:label_research_group), 2))%>");
+                          $("#project_memu_list").html('<%= escape_javascript(render(:partial => 'projects/research_team', :locals => {:project => @project, :attaments_num => attaments_num})) %>');
+                          $("#close_light").attr("onClick","close_window('research_group');");
+                      }
+                      else if(data == 3)
+                      {
+                          $("#setting_project_type").replaceWith("<%= escape_javascript(project_type_link(l(:label_friend_organization), 3))%>");
+                          $("#project_memu_list").html('<%= escape_javascript(render(:partial => 'projects/friend_group', :locals => {:project => @project, :attaments_num => attaments_num})) %>');
+                          $("#close_light").attr("onClick","close_window('friend_organization');");
+                      }
+                      else
+                      {
+                          alert("服务器异常，请与管理员联系");
+                      }
+                  }
+          );
+      }
+  </script>
 </div>
 <div id="fade" class="black_overlay">123</div>
 <%= render :partial => 'layouts/new_feedback' %>

app/views/layouts/project_base.html.erb

@@ -1,47 +0,0 @@
-<% @nav_dispaly_project_label = 1
-   @nav_dispaly_forum_label = 1 %>
-<!DOCTYPE html>
-<html lang="<%= current_language %>">
-<head>
-  <meta charset="utf-8" />
-  <title><%=h html_title %></title>
-  <meta name="description" content="<%= Redmine::Info.app_name %>" />
-  <meta name="keywords" content="issue,bug,tracker" />
-  <%= csrf_meta_tag %>
-  <%= favicon %>
-  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %>
-  <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
-  <%= javascript_heads %>
-  <%= javascript_include_tag "jquery.leanModal.min" %>
-  <%= javascript_include_tag 'seems_rateable/jRating', 'seems_rateable/rateable'%>
-  <%= heads_for_theme %>
-  <%= call_hook :view_layouts_base_html_head %>
-  <!-- page specific tags -->
-  <%= yield :header_tags -%>
-</head>
-<body class="<%=h body_css_classes %>">
-<div id="wrapper">
-  <div id="wrapper2">
-    <div id="wrapper3">
-      <%=render :partial => 'layouts/base_header'%>
-      <div id="main" class="nosidebar">
-        <div id="content_">
-          <%= render_flash_messages %>
-          <%= yield %>
-          <%= call_hook :view_layouts_base_content %>
-          <div style="clear:both;"></div>
-          <%=render :partial => 'layouts/base_footer'%>
-        </div>
-
-      </div>
-    </div>
-
-    <div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
-    <div id="ajax-modal" style="display:none;"></div>
-
-
-  </div>
-</div>
-<%= call_hook :view_layouts_base_body_bottom %>
-</body>
-</html>

app/views/memos/quote.js.erb

@@ -1,4 +1,5 @@
 //ckeditor.setData("<%= raw escape_javascript(@content) %>");
 $('#message_quote').html("<%= raw escape_javascript(@temp.content.html_safe) %>");
 $('#quote').val("<%= raw escape_javascript(@content) %>");
-showAndScrollTo("new_memo", "cke_editor01");
+showAndScrollTo("new_memo", "cke_editor01");
+$("img").removeAttr("align");

app/views/memos/show.html.erb

@@ -182,4 +182,5 @@
             }
         });
     };
+        $("img").removeAttr("align");
 </script>

app/views/news/_project_form.html.erb

@@ -1,26 +1,35 @@
-<li  class="ml45">
+<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<li>
   <label><span class="c_red">*</span>&nbsp;<%= l(:field_title) %>&nbsp;&nbsp;：</label>
-  <input  type="text" name="news[title]" class="hwork_input" id="news_title" size="60" onkeyup="regexTitle();" maxlength="60" placeholder="60个字符以内" value="<%= is_new ? '' : @news.title %>">
+  <input  type="text" name="news[title]" class="hwork_input_news" id="news_title" width="576px" onkeyup="regexTitle();" maxlength="60" placeholder="60个字符以内" value="<%= is_new ? '' : @news.title %>">
   <p id="title_notice_span" class="ml55"></p>
 </li>
-<li class="ml45">
-  <label class="fl" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;&nbsp;：</label>
-  <textarea id="news_description" name="news[description]" placeholder="最多3000个汉字(或6000个英文字符)"  class="hwork_text fl" onkeyup="regexDescription();" maxlength="6000"><%= is_new ? '' : @news.description %></textarea>
-  <p id="description_notice_span" class="ml55"></p>
+<li class="mb10">
+  <% if is_new %>
+      <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+      <label class="fl" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;&nbsp;：</label>
+      <%= f.kindeditor :description,:width=>'91%',:editor_id=>'project_news_description_editor' %>
+      <p id="description_notice_span" class="ml55"></p>
+  <% else %>
+      <label class="fl" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;&nbsp;：</label>
+      <%= f.kindeditor :description,:width=>'91%', :editor_id=>'project_news_description_editor', :owner_id => @news.id, :owner_type => OwnerTypeHelper::NEWS %>
+      <p id="description_notice_span" class="ml55"></p>
+  <% end %>
+
 </li>
 <div class="cl"></div>
-<li class="ml45">
-  <label class="fl">&nbsp;&nbsp;<%= l(:label_attachment_plural) %>&nbsp;&nbsp;：</label>
+<li>
+  <label class="fl mt5">&nbsp;&nbsp;<%= l(:label_attachment_plural) %>&nbsp;&nbsp;：</label>
   <%= render :partial => 'attachments/new_form', :locals => {:container => @news} %>
   <div class="cl"></div>
 </li>
-<li class=" ml90" >
+<li class="ml40" >
   <% if is_new %>
-      <%= link_to l(:button_create), "#", :onclick => 'submitNews();', :onmouseover => 'submitFocus(this);', :class => 'blue_btn fl c_white' %>
+      <%= link_to l(:button_create), "javascript:void(0)", :onclick => 'submitNews();', :onmouseover => 'submitFocus(this);', :class => 'blue_btn fl c_white' %>
       <%= link_to l(:button_cancel), project_news_index_path(@project), :onclick => '$("#add-news").hide()', :class => 'blue_btn grey_btn fl c_white' %>
   <% else %>
-      <%= link_to l(:button_save), "#", :onclick => 'submitNews();',:onmouseover => 'this.focus()',:class => 'blue_btn fl c_white' %>
-      <%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;',:class => 'blue_btn grey_btn fl c_white' %>
+      <%= link_to l(:button_save), "javascript:void(0)", :onclick => "submitNews();",:onmouseover => 'this.focus()',:class => 'blue_btn fl c_white' %>
+      <%= link_to l(:button_cancel), news_path(@news), :class => 'blue_btn grey_btn fl c_white' %>
   <% end %>
   <div class="cl"></div>
 </li>

app/views/news/_project_news.html.erb

@@ -29,7 +29,7 @@
               <%= link_to_user_header(news.author,false,{:class=> 'problem_name c_orange fl'}) if news.respond_to?(:author) %>
               <span class="fl"> <%= l(:label_add_news) %>：</span><%= link_to h(news.title), news_path(news),:class => 'problem_tit fl fb c_dblue' %><br />
               <div class="cl mb5"></div>
-              <p  id="news_description_<%= news.id %>" class="mt5 break_word"><%= news.description %><br /> </p>
+              <p  id="news_description_<%= news.id %>" class="mt5 break_word"><%=textAreailizable news.description %><br /> </p>
               <div class="news_foot" style="display: none;" onclick="news_show_more_des(<%= news.id %>);" id="news_foot_<%= news.id %>"><%= l(:label_expend_information) %> <span class="g-arr-down"><img src="/images/jiantou.jpg" width="12" height="6" /></span></div>
               <span class="f1"><%= l(:label_create_time) %> ：<%= format_time(news.created_on) %></span>
             </div>

app/views/news/_project_show.html.erb

@@ -82,8 +82,9 @@
                     :onclick => '$("#edit-news").show(); return false;') if User.current.allowed_to?(:manage_news, @project) %>
         <%= delete_link news_path(@news),:class => 'talk_edit fr' if User.current.allowed_to?(:manage_news, @project) %>
         <div class="cl"></div>
-        <div class="mb5" style="word-break:break-all;"><%= textAreailizable(@news, :description) %><br /> <%= l(:label_create_time) %> ：  <%= format_time(@news.created_on) %></div>
-        <%= link_to_attachments_course @news %>
+        <div class="mb5" style="word-break:break-all;"><%= textAreailizable(@news, :description) %> </div>
+        <%= link_to_attachments_course @news %><br />
+        <%= l(:label_create_time) %> ：  <%= format_time(@news.created_on) %>
         <!--<a href="#" class=" link_file">附件：爱覅俄方if.zip(27.5kB)</a> -->
       </div>
       <div class="cl"></div>