Merge remote-tracking branch 'origin/szzh' into szzh

app/controllers/applied_project_controller.rb

@@ -4,7 +4,11 @@ class AppliedProjectController < ApplicationController
   def applied_join_project
     @user_id = params[:user_id]
     @project = Project.find(params[:project_id])
-    AppliedProject.create(:user_id => params[:user_id], :project_id => params[:project_id])
+    @applieds = AppliedProject.where("user_id = ? and project_id = ?", params[:user_id],params[:project_id])
+    if  @applieds.count == 0
+      AppliedProject.create(:user_id => params[:user_id], :project_id => params[:project_id])
+    end
+
     #redirect_to project_path(params[:project_id])
     #redirect_to_referer_or {render :text => ( 'applied success.'), :layout => true}
     respond_to do |format|
@@ -16,10 +20,11 @@ class AppliedProjectController < ApplicationController
   #取消申请
   def unapplied_join_project
     @project = Project.find(params[:project_id])
-    @applied = AppliedProject.find(params[:id])
-    @applied.destroy
-    #redirect_to project_path(params[:project_id])
-    #redirect_to_referer_or {render :text => ( 'unsubscribe success.'), :layout => true}
+    #@applied = AppliedProject.find(params[:id])
+    #@applied.destroy
+
+    AppliedProject.deleteappiled(params[:user_id], params[:project_id])
+
     respond_to do |format|
       format.html { redirect_to_referer_or {render :text => (watching ? 'Watcher added.' : 'Watcher removed.'), :layout => true}}
       format.js { render :partial => 'set_applied' }

app/controllers/members_controller.rb

@@ -46,42 +46,58 @@ class MembersController < ApplicationController
   end
 
   def create
-    members = []
-    project_info = []
-    user_grades = []
-    if params[:membership]
-      if params[:membership][:user_ids]
-        attrs = params[:membership].dup
-        user_ids = attrs.delete(:user_ids)
-        user_ids.each do |user_id|
-          members << Member.new(:role_ids => params[:membership][:role_ids], :user_id => user_id)
-          user_grades << UserGrade.new(:user_id => user_id, :project_id => @project.id)
-          ## added by nie
-          if(params[:membership][:role_ids] && params[:membership][:role_ids][0] == "3")
-            project_info << ProjectInfo.new(:user_id => user_id, :project_id => @project.id)
-          # ProjectInfo.create(:name => "test", :user_id => 123)
+    if params[:refusal_button]
+      members = []
+      applied_members = true
+      if params[:membership]
+        if params[:membership][:user_ids]
+          attrs = params[:membership].dup
+          user_ids = attrs.delete(:user_ids)
+          user_ids.each do |user_id|
+            AppliedProject.deleteappiled(user_id, @project.id)
           end
-        ## end
         end
-      else
-        members << Member.new(:role_ids => params[:membership][:role_ids], :user_id => params[:membership][:user_id])
-        user_grades << UserGrade.new(:user_id => params[:membership][:user_id], :project_id => @project.id)
-        ## added by nie
-        if(params[:membership][:role_ids] && params[:membership][:role_ids][0] == "3")
-          project_info << ProjectInfo.new(:project_id => @project.id, :user_id => params[:membership][:user_id])
+      end
+    else
+      applied_members = false
+      members = []
+      project_info = []
+      user_grades = []
+      if params[:membership]
+        if params[:membership][:user_ids]
+          attrs = params[:membership].dup
+          user_ids = attrs.delete(:user_ids)
+          user_ids.each do |user_id|
+            members << Member.new(:role_ids => params[:membership][:role_ids], :user_id => user_id)
+            user_grades << UserGrade.new(:user_id => user_id, :project_id => @project.id)
+            ## added by nie
+            if (params[:membership][:role_ids] && params[:membership][:role_ids][0] == "3")
+              project_info << ProjectInfo.new(:user_id => user_id, :project_id => @project.id)
+              # ProjectInfo.create(:name => "test", :user_id => 123)
+            end
+            ## end
+            AppliedProject.deleteappiled(user_id, @project.id)
+          end
+        else
+          members << Member.new(:role_ids => params[:membership][:role_ids], :user_id => params[:membership][:user_id])
+          user_grades << UserGrade.new(:user_id => params[:membership][:user_id], :project_id => @project.id)
+          ## added by nie
+          if (params[:membership][:role_ids] && params[:membership][:role_ids][0] == "3")
+            project_info << ProjectInfo.new(:project_id => @project.id, :user_id => params[:membership][:user_id])
+          end
+          ## end
         end
-      ## end
+        @project.members << members
+        # added by nie
+        @project.project_infos << project_info
+        @project.user_grades << user_grades
+        # end
       end
-    @project.members << members
-    # added by nie
-    @project.project_infos << project_info
-    @project.user_grades << user_grades
-    # end
     end
 
     respond_to do |format|
       format.html { redirect_to_settings_in_projects }
-      format.js { @members = members }
+      format.js { @members = members;@applied_members = applied_members; }
       format.api {
         @member = members.first
         if @member.valid?

app/controllers/open_source_projects_controller.rb

@@ -57,7 +57,7 @@ class OpenSourceProjectsController < ApplicationController
 
     @memo = RelativeMemo.new(:open_source_project => @open_source_project)
     @topic_count = @open_source_project.topics.count
-    @topic_pages = Paginator.new @topic_count, per_page_option, params['page']
+    @topic_pages = Paginator.new @topic_count, 10, params['page']
     @memos = @open_source_project.topics.
                     reorder("#{RelativeMemo.table_name}.sticky DESC").
                     includes(:last_reply).
@@ -73,11 +73,40 @@ class OpenSourceProjectsController < ApplicationController
       format.json { render json: @open_source_project }
     end
   end
-  
-  def search
+
+
+def search
     
   end
 
+
+# added by yiang  暴力添加,请绕道
+def showmemo
+  @open_source_project = OpenSourceProject.find(params[:id])
+
+  sort_init 'updated_at', 'desc'
+  sort_update 'created_at' => "#{RelativeMemo.table_name}.created_at",
+              'replies' => "#{RelativeMemo.table_name}.replies_count",
+              'updated_at' => "COALESCE (last_replies_relative_memos.created_at, #{RelativeMemo.table_name}.created_at)"
+
+  @memo = RelativeMemo.new(:open_source_project => @open_source_project)
+  @topic_count = @open_source_project.topics.count
+  @topic_pages = Paginator.new @topic_count, per_page_option, params['page']
+  @memos = @open_source_project.topics.
+      reorder("#{RelativeMemo.table_name}.sticky DESC").
+      includes(:last_reply).
+      limit(@topic_pages.per_page).
+      offset(@topic_pages.offset).
+      order(sort_clause).
+      all
+
+  respond_to do |format|
+    format.html {
+      render :layout => "base_opensource_p"
+    }
+    format.json { render json: @open_source_project }
+  end
+end
   # GET /open_source_projects/new
   # GET /open_source_projects/new.json
   def new

app/controllers/projects_controller.rb

@@ -767,6 +767,7 @@ class ProjectsController < ApplicationController
       @subPage_title = l :label_member_list
       @members = @project.member_principals.includes(:roles, :principal).all
       @members = sort_project_members(@project, @members)
+      @applied_members = appied_project_members(@project, @members)
     end
     @members = paginateHelper @members
     render :layout => 'base_courses' if @project.project_type == 1
@@ -797,7 +798,20 @@ class ProjectsController < ApplicationController
     end
     memberlist
   end
-  
+
+  def appied_project_members (project, members)
+    users = AppliedProject.where(:project_id => project.id).
+    memberlist = []
+    users.each do |user|
+      members.each do |member|
+        if member[:user_id] == user[:user_id]
+          memberlist << member
+        end
+      end
+    end
+    memberlist
+  end
+
   def file
   end
 

app/controllers/relative_memos_controller.rb

@@ -37,7 +37,7 @@ class RelativeMemosController < ApplicationController
   def show
     pre_count = REPLIES_PER_PAGE
 
-    @memo = @memo.root # 取出楼主，防止输入帖子id让回复作为主贴显示
+    # @memo = @memo.root # 取出楼主，防止输入帖子id让回复作为主贴显示
     @memo.update_column(:viewed_count_local, (@memo.viewed_count_local.to_i + 1))
 
     page = params[:page]
@@ -92,13 +92,14 @@ class RelativeMemosController < ApplicationController
   def create
     @memo = RelativeMemo.new(params[:relative_memo])
     # @memo.url = "http://forge.trustie.net/open_source_projects"
-    @memo.osp_id = params[:open_source_project_id]
+    # @memo.osp_id = params[:open_source_project_id]
     @memo.author_id = User.current.id
 
     @memo.save_attachments(params[:attachments] || (params[:relative_memo] && params[:relative_memo][:uploads]))
 
     respond_to do |format|
       if @memo.save
+        RelativeMemoToOpenSourceProject.create(:osp_id => params[:open_source_project_id], :relative_memo_id => @memo.id)
         format.html { redirect_to back_memo_url, notice: "#{l :label_memo_create_succ}" }
         format.json { render json: @memo, status: :created, location: @memo }
       else
@@ -142,7 +143,7 @@ class RelativeMemosController < ApplicationController
 
   def find_memo
     return unless find_osp
-    @memo = @open_source_project.relative_memos.find(params[:id])
+    @memo = @open_source_project.topics.find(RelativeMemo.find(params[:id]).root.id)
   rescue ActiveRecord::RecordNotFound
     render_404
     nil

app/helpers/application_helper.rb

@@ -28,7 +28,6 @@ module ApplicationHelper
   include AvatarHelper
   ## added by william
   include PraiseTreadHelper
-  # add by nyan
   include CoursesHelper
 
   extend Forwardable
@@ -472,6 +471,14 @@ module ApplicationHelper
   def added_time(created)
     l(:label_added_time, :age => time_tag(created)).html_safe
   end
+  
+  def user_url_and_time(user_name, user_url, created)
+    unless user_name.nil?
+      l(:label_added_time_by, :author => link_to(user_name, user_url), :age => time_tag(created)).html_safe
+    else
+      l(:label_added_time, :age => time_tag(created)).html_safe
+    end
+  end
 
   #huang
   def betweentime(enddate)
@@ -1320,6 +1327,15 @@ module ApplicationHelper
     tags
   end
 
+  def hubspot_head
+    tags = javascript_include_tag('hubspot/messenger.min', 'hubspot/messenger-theme-future')
+    tags << stylesheet_link_tag('hubspot/messenger', 'hubspot/messenger-theme-future', 'hubspot/messenger-theme-flat')
+    unless User.current.pref.warn_on_leaving_unsaved == '0'
+      tags << "\n".html_safe + javascript_tag("$(window).load(function(){ warnLeavingUnsaved('#{escape_javascript l(:text_warn_on_leaving_unsaved)}'); });")
+    end
+    tags
+  end
+
   def favicon
     "<link rel='shortcut icon' href='#{image_path('/favicon.ico')}' />".html_safe
   end

app/helpers/members_helper.rb

@@ -32,4 +32,21 @@ module MembersHelper
 
     s + content_tag('div', content_tag('ul', links), :class => 'pagination_new')
   end
+
+  # 当前申请加入的成员名单
+  def render_principals_for_applied_members(project)
+    scope = Principal.active.sorted.applied_members(project).like(params[:q])
+     principal_count = scope.count
+    principal_pages = Redmine::Pagination::Paginator.new principal_count, 10, params['page']
+    principals = scope.offset(principal_pages.offset).limit(principal_pages.per_page).all
+
+    s = content_tag('div', principals_check_box_tags_ex('membership[user_ids][]', principals), :id => 'principals')
+
+    links = pagination_links_full(principal_pages, principal_count, :per_page_links => false) {|text, parameters, options|
+      link_to text, appliedproject_project_memberships_path(project, parameters.merge(:q => params[:q], :format => 'js')), :remote => true
+    }
+
+    s + content_tag('div', content_tag('ul', links), :class => 'applied_new')
+  end
+
 end

app/models/applied_project.rb

@@ -2,5 +2,14 @@ class AppliedProject < ActiveRecord::Base
   attr_accessible :project_id, :user_id
 
    belongs_to :user
-  belongs_to :project
+   belongs_to :project
+
+  #删除用户申请
+  def self.deleteappiled(userid, projectid)
+    @applieds = AppliedProject.where("user_id = ? and project_id = ?", userid, projectid)
+    @applieds.each do |applied|
+      applied.destroy
+    end
+  end
+
 end

app/models/open_source_project.rb

@@ -3,8 +3,10 @@ class OpenSourceProject < ActiveRecord::Base
 
   include Redmine::SafeAttributes
   has_many :applies, :class_name => "ApplyProjectMaster", :as => :apply, :dependent => :delete_all
-  has_many :topics, :class_name => 'RelativeMemo', :foreign_key => 'osp_id', :conditions => "#{RelativeMemo.table_name}.parent_id IS NULL", :order => "#{RelativeMemo.table_name}.created_at DESC", :dependent => :destroy
-  has_many :relative_memos, :class_name => 'RelativeMemo', :foreign_key => 'osp_id', :dependent => :destroy
+  has_many :relation_topics, :class_name => 'RelativeMemoToOpenSourceProject', :foreign_key => 'osp_id', :order => "#{RelativeMemo.table_name}.created_at DESC", :dependent => :destroy
+  # has_many :topics, :class_name => 'RelativeMemo', :foreign_key => 'osp_id', :conditions => "#{RelativeMemo.table_name}.parent_id IS NULL", :order => "#{RelativeMemo.table_name}.created_at DESC", :dependent => :destroy
+  has_many :topics, :through => :relation_topics, :class_name => 'RelativeMemo'
+  # has_many :relative_memos, :class_name => 'RelativeMemo', :foreign_key => 'osp_id', :dependent => :destroy
   has_many :tags, :through => :project_tags, :class_name => 'Tag'
   has_many :project_tags, :class_name => 'ProjectTags'
   has_many :masters, :class_name => 'ApplyProjectMaster', :as => :apply, :dependent => :delete_all, :conditions => "#{ApplyProjectMaster.table_name}.status = 2"
@@ -126,9 +128,14 @@ class OpenSourceProject < ActiveRecord::Base
 
   def self.reset_counters!(id)
     osp_id = id.to_i
-    update_all("topic_count = (SELECT COUNT(*) FROM #{RelativeMemo.table_name} WHERE osp_id=#{osp_id} AND parent_id IS NULL)," +
-     " memo_count = (SELECT COUNT(*) FROM #{RelativeMemo.table_name} WHERE osp_id=#{osp_id} AND parent_id IS NOT NULL)," +
-     " last_memo_id = (SELECT MAX(id) FROM #{RelativeMemo.table_name} WHERE osp_id=#{osp_id})",
+    # update_all("topic_count = (SELECT COUNT(*) FROM #{RelativeMemo.table_name} WHERE osp_id=#{osp_id} AND parent_id IS NULL)," +
+     # " memo_count = (SELECT COUNT(*) FROM #{RelativeMemo.table_name} WHERE osp_id=#{osp_id} AND parent_id IS NOT NULL)," +
+     # " last_memo_id = (SELECT MAX(id) FROM #{RelativeMemo.table_name} WHERE osp_id=#{osp_id})",
+     # ["id = ?", osp_id])
+     update_all("topic_count = (SELECT COUNT(*) FROM #{RelativeMemoToOpenSourceProject.table_name} WHERE osp_id=#{osp_id})", 
+     # +
+     # " memo_count = (SELECT COUNT(*) FROM #{RelativeMemo.table_name} WHERE osp_id=#{osp_id} AND parent_id IS NOT NULL)," +
+     # " last_memo_id = (SELECT MAX(id) FROM #{RelativeMemo.table_name} WHERE osp_id=#{osp_id})",
      ["id = ?", osp_id])
   end
 end

app/models/principal.rb

@@ -72,6 +72,12 @@ class Principal < ActiveRecord::Base
   }
   scope :sorted, lambda { order(*Principal.fields_for_order_statement)}
 
+  scope :applied_members, lambda {|project|
+    id = project.id
+    ids1 = project.applied_projects.map(&:user_id)
+    where("#{Principal.table_name}.id IN (SELECT DISTINCT user_id FROM #{Member.table_name} WHERE user_id in (?))", ids1)
+  }
+
   before_create :set_default_empty_values
 
   def name(formatter = nil)

app/models/project.rb

@@ -66,6 +66,7 @@ class Project < ActiveRecord::Base
   has_one :course_extra, :class_name => 'Course', :foreign_key => :extra,:primary_key => :identifier, :dependent => :destroy
   has_many :applied_projects
 
+
   # end
   #ADDED BY NIE
   has_many :project_infos, :dependent => :destroy 
@@ -121,7 +122,8 @@ class Project < ActiveRecord::Base
 
   after_save :update_position_under_parent, :if => Proc.new {|project| project.name_changed?}
   after_save :update_inherited_members, :if => Proc.new {|project| project.inherit_members_changed?}
-  after_save :create_board_sync #nyan
+  # 创建project之后默认创建一个board，之后的board去掉了board的概念
+  after_save :create_board_sync
   before_destroy :delete_all_members
   def remove_references_before_destroy
     return if self.id.nil?

app/models/relative_memo.rb

@@ -7,12 +7,13 @@ class RelativeMemo < ActiveRecord::Base
   has_many :tags, :through => :project_tags, :class_name => 'Tag'
   has_many :project_tags, :class_name => 'ProjectTags'
   
+  has_many :relation_topics, :class_name => 'RelativeMemoToOpenSourceProject'
+  
   has_many :no_uses, :as => :no_use, :dependent => :delete_all
   
   acts_as_taggable 
-  acts_as_attachable
 
-  validates_presence_of :osp_id, :subject
+  validates_presence_of :subject
   #validates :content, presence: true
   # validates_length_of :subject, maximum: 50
   #validates_length_of :content, maximum: 3072
@@ -80,6 +81,11 @@ class RelativeMemo < ActiveRecord::Base
               { :include => :no_uses,
                 :conditions => ["#{NoUse.table_name}.user_id = ?", user_id] }
             }
+  
+  # 获取帖子的回复          
+  def replies
+    memos = RelativeMemo.where("parent_id = ?", id)
+  end
     
   def no_use_for?(user)
     self.no_uses.each do |no_use|

app/models/relative_memo_to_open_source_project.rb

@@ -0,0 +1,14 @@
+class RelativeMemoToOpenSourceProject < ActiveRecord::Base
+  # attr_accessible :title, :body
+  belongs_to :open_source_project, :foreign_key => "osp_id"
+  belongs_to :topic, :class_name => 'RelativeMemo', :foreign_key => 'relative_memo_id'
+  
+  has_many :no_uses, :as => :no_use, :dependent => :delete_all
+
+  validates_presence_of :osp_id, :relative_memo_id
+
+  scope :no_use_for, lambda { |user_id|
+    {:include => :no_uses,
+     :conditions => ["#{NoUse.table_name}.user_id = ?", user_id] }
+  }
+end

app/views/applied_project/_set_applied.js.erb

@@ -1,4 +1,13 @@
 <% selector = ".#{applied_css(@project)}" %>
 $("<%= selector %>").each(function(){$(this).replaceWith("<%= escape_javascript applied_link(@project, User.current) %>")});
-
-
+if (window.Messenger) {
+  Messenger.options = {
+      extraClasses: 'messenger-fixed messenger-on-bottom messenger-on-right',
+      theme: 'flat'
+  }
+  Messenger().post({
+    id: "label_apply_project_waiting",
+    message: "<%= l(:label_apply_project_waiting) %>",
+    showCloseButton: true,
+  });
+};

app/views/bids/_homework_list.html.erb

@@ -4,7 +4,12 @@
 <div class="project-search-block">
 	<table width="100%" valign="center">
 		<tr>
-			<td ><span style="margin-left:0px"><%= l(:label_task_plural)%>(<%= @homework_list.count%>)</span></td>
+			<td ><span style="margin-left:0px"><%= l(:label_task_plural)%>(<%= @homework_list.count%>)</span>
+        <%= link_to "作业打包下载", zipdown_assort_path(obj_class: @bid.class, obj_id: @bid), remote: false, class: "button_submit button_submit_font_white", style: "margin: 5px 10px;line-height: 20px;height: 20px;display: inline-block;" if(
+          User.current.admin? || 
+          !(User.current.roles_for_project(@bid.courses.first).map(&:id) & ([7,9])).empty? ) || 
+          (Rails.env.development?) %>
+      </td>
             <td align="right">
 			<div class="project-search">
                 <% if is_teacher %>
@@ -17,10 +22,6 @@
 </div>
 <% end %>
 <% display_id = im_watching_student_id? @bid%>
-<%= link_to "作业打包下载", zipdown_assort_path(obj_class: @bid.class, obj_id: @bid), remote: false, class: "button_submit button_submit_font_white", style: "margin: 5px 10px;display: inline-block;" if(
-			User.current.admin? || 
-			!(User.current.roles_for_project(@bid.courses.first).map(&:id) & ([7,9])).empty? ) || 
-			(Rails.env.development?) %>
 <% @homework_list.each do |homework|%>
 	<% if homework.attachments.any?%>
 	<table width="660px" border="0" align="center">

app/views/bids/show_project.html.erb

@@ -1,110 +1,71 @@
-<!-- fq -->
-
 <% if @bid.homework_type == Bid::HomeworkFile %>
-	<%= render :partial => 'homework' %>
- 
+    <%= render :partial => 'homework' %>
+
 <% else %>
-<style>
-	input[type="submit"].bid_btn {
-		vertical-align: middle;
-		width: 60px;
-		height: 30px;
-		line-height: 18px;
-		font-size: 14px;
-		color: rgb(0, 0, 0);
-		background: url("/images/button/bg103.jpg") no-repeat scroll left top transparent;
-		padding: 0px 0px 4px 0px;
-		border-radius: 2px;
-		border: 1px solid rgb(148, 148, 148);
-		box-shadow: none;
-		text-shadow: none;
-		margin-top: -10px;
-		/*margin-right: -4px;*/
-	}
-	input[type="button"].bid_btn {
-		width: 60px;
-		height: 30px;
-		line-height: 18px;
-		font-size: 14px;
-		color: rgb(0, 0, 0);
-		background: url("/images/button/bg103.jpg") no-repeat scroll left top transparent;
-		padding: 0px 0px 4px 0px;
-		border-radius: 2px;
-		border: 1px solid rgb(148, 148, 148);
-		box-shadow: none;
-		text-shadow: none;
-		margin-top: -10px;
-		margin-right: -2px;
-	}
-	textarea:focus {
-		border: #d5dee9 1px solid;
-	}
-</style>
 
-<script type="text/javascript" language="javascript">
-	function clearInfo(id,content) {
-		var text = $('#' + id);
-		if (text.val() == content) {
-			$('#' + id).val('');
-		}
-	}
+    <script type="text/javascript" language="javascript">
+        function clearInfo(id, content) {
+            var text = $('#' + id);
+            if (text.val() == content) {
+                $('#' + id).val('');
+            }
+        }
+
+        function showInfo(id, content) {
+            var text = $('#' + id);
+            if (text.val() == '') {
+                $('#' + id).val(content);
+            }
+        }
 
-	function showInfo(id,content) {
-		var text = $('#' + id);
-		if (text.val() == '') {
-			$('#' + id).val(content);
-		}
-	}
+        function cancel() {
+            $("#put-bid-form").hide();
+        }
+    </script>
+    <% if User.current.logged? %>
+        <!--我要竞标弹出框-->
+        <div id='flash' style="float:left; width: 100%; display: none"></div>
+        <div id="put-bid-form" style="display: none">
+          <%= form_for "bid_for_save", :remote => true, :url => {:controller => 'bids', :action => 'add'},
+                       :update => "bidding_project_list",
+                       :complete => '$("#put-bid-form").hide();' do |f| %>
+              <table id="bidding_table" border="0" width="100%" style="margin-left: 40px;">
+                <tr>
+                  <td><%= select_tag 'bid', options_for_select(select_option_helper(@option)), :name => 'bid', :class => 'grayline' %></td>
+                  <div id="prompt_create_pro">
+                    <td>
 
-	function cancel() {
-		$("#put-bid-form").hide();
-	}
-</script>
-	<% if User.current.logged? %>
-<!--我要竞标弹出框-->
-	<div id = 'flash' style="float:left; width: 100%; display: none" ></div>
-	<div id="put-bid-form" style="display: none">
-		<%= form_for "bid_for_save", :remote=>true, :url => {:controller => 'bids', :action => 'add'},
-		:update => "bidding_project_list",
-		:complete => '$("#put-bid-form").hide();' do |f| %>
-		<table id="bidding_table" border="0" width="100%" style="margin-left: 40px;">
-			<tr>
-				<td><%= select_tag 'bid', options_for_select(select_option_helper(@option)), :name => 'bid', :class => 'grayline' %></td>
-		<div id="prompt_create_pro"><!-- nyan -->
-			<td>
-				<p>
-					<div class="font_lighter" style="font-size: 13px;">
-					<%= link_to '创建项目', new_project_path(course: 0, project_type: 0), :target=>'_blank'%>
-					</div>
-				</p>
-			</td>
-		</div>
-			</tr>
-			<% if @bid.reward_type == 3 %>
-			<tr>
-				<td><%= f.text_area :bid_message, :id => "bid_message", :required => true, :rows => 4, :cols => 40, :placeholder => l(:label_bid_reason_homework), :style => "resize: none;", :class => 'noline'%></td>
-			</tr>
-			<% else %>
-			<tr>
-				<td><%= f.text_area :bid_message, :id => "bid_message", :required => true, :rows => 4, :cols => 40, :placeholder => l(:label_bid_reason), :style => "resize: none;", :class => 'noline'%></td>
-			</tr>
-			<% end %>
-			<tr>
-				<td align="right">
-				<%= submit_tag l(:button_add), :name => nil , :class => "enterprise",
-				 :onmouseout => "this.style.backgroundPosition = 'left top'",
-				  :onmouseover => "this.style.backgroundPosition = 'left -30px'"%>
-				<%= submit_tag l(:button_cancel), :name => nil, :onclick => "cancel();",
-				:type => 'button', :class => "enterprise", :onmouseout => "this.style.backgroundPosition = 'left top'",
-				:onmouseover => "this.style.backgroundPosition = 'left -30px'" %>
-				</td>
-			</tr>
-		</table>
-		<% end %>
-	</div>
-	<% end %>
-	<div id='bidding_project_list'>
-	<%= render :partial => 'project_list', :locals => {:bidding_project => @bidding_project,:bid => @bid} %>
-	</div>
+                      <div class="font_lighter" style="font-size: 13px;">
+                        <%= link_to '创建项目', new_project_path(course: 0, project_type: 0), :target => '_blank' %>
+                      </div>
+                    </td>
+                  </div>
+                </tr>
+                <% if @bid.reward_type == Bid::Homework %>
+                    <tr>
+                      <td><%= f.text_area :bid_message, :id => "bid_message", :required => true, :rows => 4, :cols => 40, :placeholder => l(:label_bid_reason_homework), :style => "resize: none;", :class => 'noline' %></td>
+                    </tr>
+                <% else %>
+                    <tr>
+                      <td><%= f.text_area :bid_message, :id => "bid_message", :required => true, :rows => 4, :cols => 40, :placeholder => l(:label_bid_reason), :style => "resize: none;", :class => 'noline' %></td>
+                    </tr>
+                <% end %>
+                <tr>
+                  <td align="right">
+                    <%= submit_tag l(:button_add), :name => nil, :class => "enterprise",
+                                   :onmouseout => "this.style.backgroundPosition = 'left top'",
+                                   :onmouseover => "this.style.backgroundPosition = 'left -30px'" %>
+                    <%= submit_tag l(:button_cancel), :name => nil, :onclick => "cancel();",
+                                   :type => 'button', :class => "enterprise", :onmouseout => "this.style.backgroundPosition = 'left top'",
+                                   :onmouseover => "this.style.backgroundPosition = 'left -30px'" %>
+                  </td>
+                </tr>
+              </table>
+          <% end %>
+        </div>
+    <% end %>
+    <div id='bidding_project_list'>
+      <%= render :partial => 'project_list', :locals => {:bidding_project => @bidding_project, :bid => @bid} %>
+    </div>
 <% end %>
 

app/views/issues/_attributes.html.erb

@@ -2,7 +2,7 @@
 
 <fieldset class="collapsible collapsed" style="padding-left: 50px;">
 	<legend  onclick="toggleFieldset(this);" style="font-size:12px;"><strong><%= l(:label_change_properties) %></strong></legend>
-<div class="splitcontent" style="display: block;"> <!-- nyan -->
+<div class="splitcontent" style="display: block;">
 <div class="splitcontentleft">
 <% if @issue.safe_attribute?('status_id') && @allowed_statuses.present? %>
 <p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), {:required => true},

app/views/layouts/base_projects.html.erb

@@ -12,6 +12,7 @@
 		<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
 		<%= javascript_heads %>
 		<%= heads_for_theme %>
+		<%= hubspot_head %>
 		<%= call_hook :view_layouts_base_html_head %>
 		<!-- page specific tags -->
 		<%= yield :header_tags -%>

app/views/members/appliedproject.js.erb

@@ -0,0 +1 @@
+$('#principals_for_applied_member').html('<%= escape_javascript(render_principals_for_applied_members(@project)) %>');

app/views/members/create.js.erb

@@ -1,11 +1,13 @@
 $('#tab-content-members').html('<%= escape_javascript(render :partial => 'projects/settings/members') %>');
 hideOnLoad();
 
-<% if @members.present? && @members.all? {|m| m.valid? } %>
-  <% @members.each do |member| %>
-    $("#member-<%= member.id %>").effect("highlight");
+<%if !@applied_members%>
+  <% if @members.present? && @members.all? {|m| m.valid? } %>
+    <% @members.each do |member| %>
+      $("#member-<%= member.id %>").effect("highlight");
+    <% end %>
+  <% else %>
+    <% errors = @members.collect {|m| m.errors.full_messages}.flatten.uniq.join(', ') %>
+    alert('<%= raw(escape_javascript(l(:notice_failed_to_save_members, :errors => errors))) %>');
   <% end %>
-<% else %>
-  <% errors = @members.collect {|m| m.errors.full_messages}.flatten.uniq.join(', ') %>
-  alert('<%= raw(escape_javascript(l(:notice_failed_to_save_members, :errors => errors))) %>');
 <% end %>

app/views/open_source_projects/_show_memo.html.erb

@@ -0,0 +1,77 @@
+<!--added by yiang -->
+<!--display the board-->
+
+<div class="borad-topic-count" style="margin-top:10px">
+	 <span>共有 <%= link_to memos.count %> 个贴子 </span
+</div>
+<div style="padding-top: 10px">
+	<% if memos.any? %>
+	<% memos.each do |topic| %>
+	<table class="content-text-list">
+		<tr>
+			<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(topic.author), :class => "avatar"), user_path(topic.author) if topic.author%>
+			<%= image_tag('../images/avatars/User/0',  :class => "avatar") unless topic.author%> </td>
+			<td>
+			<table width="630px" border="0">
+				<tr>
+					<td valign="top" width="500px" class="<%= topic.sticky ? 'sticky' : '' %> <%= topic.locked? ? 'locked' : '' %>"><%= link_to h(topic.subject), open_source_project_relative_memo_path(open_source_project, topic) %></td>
+					<td align="right" rowspan="3">
+					<table class="borad-count">
+						<tr>
+							<td align="center" class="borad-count-digit"><%= link_to (topic.replies_count), open_source_project_relative_memo_path(open_source_project, topic) %></td>
+						</tr>
+						<tr>
+							<td align="center">回帖</td>
+						</tr>
+					</table></td>
+					
+					<td align="right" rowspan="3">
+					<table class="borad-count">
+						<tr>
+							<td align="center" class="borad-count-digit"><%= link_to (topic.viewed_count_crawl+topic.viewed_count_local), open_source_project_relative_memo_path(open_source_project, topic) %></td>
+						</tr>
+						<tr>
+							<td align="center">关注</td>
+						</tr>
+					</table></td>
+
+					<td align="right" rowspan="3">
+					<table class="borad-count">
+						<tr>
+							<td align="center" class="borad-count-digit"><%= link_to (topic.viewed_count_crawl+topic.viewed_count_local), open_source_project_relative_memo_path(open_source_project, topic) %></td>
+						</tr>
+						<tr>
+							<td align="center">浏览</td>
+						</tr>
+					</table></td>
+				</tr>
+				<tr>
+					<td colspan="2" ><span class="font_description"> </span></td>
+				</tr>
+				<!--  <tr>
+					<td align="left" colspan="2" ><span class="font_lighter"><%#= authoring topic.created_at, topic.author %>
+						<br />
+					</span></td>
+				</tr>  -->
+				<tr>
+					<td align="left" colspan="2" >帖子来源：<span class="font_lighter" style="color: #068d9c"><%=link_to 'OSChina', topic.url %>
+					</span></td>
+					<td align="left"><%= no_use_link(topic, User.current) %> </td>
+				</tr>
+
+
+			</table></td>
+		</tr>
+
+	</table>
+
+	<% end %>
+	<div class="pagination">
+		<%= pagination_links_full @topic_pages, @topic_count %>
+	</div>
+	<% else %>
+	<p class="nodata">
+		<%= l(:label_no_data) %>
+	</p>
+	<% end %>
+</div>

app/views/open_source_projects/index.html.erb

@@ -1,4 +1,4 @@
-<div class="top-content">
+<div class="top-content" >
 	<%= form_tag(:controller => 'open_source_projects', :action => "search", :method => :get) do %>
 	<table width="940px">
 		<tr>
@@ -18,15 +18,16 @@
 	</table>
 	<% end %>
 </div>
+
 <style type="text/css">
 .tb-navigation {
 	position: relative;
 	z-index: 400;
 }
-blockquote, body, button, code, dd, div, dl, dt, fieldset, form, h1, h2, h3, h4, h5, h6, input, legend, li, ol, p, pre, td, textarea, th, ul {
+/*blockquote, body, button, code, dd, div, dl, dt, fieldset, form, h1, h2, h3, h4, h5, h6, input, legend, li, ol, p, pre, td, textarea, th, ul {
 	margin: 0;
 	padding: 0;
-}
+}*/
 
 .navigation {
 	color: #666;
@@ -128,9 +129,190 @@ li {
 .nav-search-con{
 	padding-top: 7px;
 }
+
+
 </style>
+<%= javascript_include_tag "ichart.1.2.min" %>
+<%= stylesheet_link_tag  "buglist-div-use.css" %>
+<%= stylesheet_link_tag  "buglist-ichart.css" %>
+<%= stylesheet_link_tag  "buglist.css" %>
+
+  <div class="mask">
+    <div class="header2"></div>
+    <div class="colleft">
+      <div class="col1" >
+        <h1>安全态势分析 </h1>
+        <div id='canvasDiv' style="border-style:none"></div>
+      </div>
+
+      <div class="col2">
+      <div> <span> <h1 style="fontsize:19px">软件安全漏洞 </h1></span><span  style="margin-top: -30px; margin-right:70px;float: right; display: block;"><a href="#" hover="text-decoration: underline;" >More >></span></a></div>
+        <div class="fixed"></div>
+        <div class="li_list" style="margin-top:10px;margin-left:10px">
+          <ul style="list-style-type: square;">
+            <li><span class="li_time">[DDoS漏洞]</span><a href="/vuldb/ssvid-62261" title="Cobbler 2.4.x - 2.6.x 本地文件包含">Cobbler 2.4.x - 2.6.x 本地文件包含</a></li>
+
+            <li><span class="li_time">[OpenSSL漏洞]</span><a href="/vuldb/ssvid-62260" title="Ruby OpenSSL CA私钥伪造漏洞">Ruby OpenSSL CA私钥伪造漏洞</a></li>
+
+            <li style="color: red"><span class="li_time">[远程溢出漏洞]</span><a href="/vuldb/ssvid-62259" title="Adobe Flash Player 整数堆栈下溢远程命令执行">Adobe Flash Player 整数堆栈下溢远程命令执行</a></li>
+
+           <!--  <li><span class="li_time">14-05-07</span><a href="/vuldb/ssvid-62258" title="PHPDISK phpdisk_del_process.php SQL注入漏洞">PHPDISK phpdisk_del_process.php SQL注入漏洞</a></li> -->
+
+      <!--       <li><span class="li_time">[OpenSSL漏洞]</span><a href="/vuldb/ssvid-62257" title="BEESCMS 3.4 order_save.php SQL注入漏洞">BEESCMS 3.4 order_save.php SQL注入漏洞</a></li> -->
+
+            <li ><span class="li_time">[SQL注入漏洞]</span><a href="/vuldb/ssvid-62256" title="Apache/NGINX 下 PHP-FPM 或者 PHP-CGI 拒绝服务漏洞">Apache/NGINX 下 PHP-FPM 拒绝服务漏洞</a></li>
+
+            <li><span class="li_time">[SQL注入漏洞]</span><a href="/vuldb/ssvid-62250" title="AlienVault OSSIM SQL注入以及远程代码执行">AlienVault OSSIM SQL注入以及远程代码执行</a></li>
+
+            <li><span class="li_time">[DDoS漏洞]</span><a href="/vuldb/ssvid-62248" title="Eucalyptus Web Services拒绝服务漏洞">Eucalyptus Web Services拒绝服务漏洞</a></li>
+
+            <li ><span class="li_time">[OpenSSL漏洞]</span><a href="/vuldb/ssvid-62245" title="Watchguard Fireware XTM OpenSSL TLS心跳信息泄漏漏洞">Watchguard Fireware XTM OpenSSL TLS心跳...</a></li>
+
+            <li style="color: red"><span class="li_time">[OpenSSL漏洞]</span><a href="/vuldb/ssvid-62244" title="SAP Sybase SQL Anywhere OpenSSL TLS泄漏漏洞">SAP Sybase SQL Anywhere OpenSSL TLS</a></li>
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div style="clear:both; margin:0 0 10 0"></div>
+ <script type="text/javascript">
+                        $(function(){
+                                var flow=[];
+                                for(var i=0;i<35;i++){
+                                        flow.push(Math.floor(Math.random()*(30+((i%12)*5)))+10);
+                                        // t.push(Math.floor(Math.random()*(30+((i%12)*5)))+10);
+                                }
+                                
+                                var data = [
+                                                {
+                                                        name : 'commit',
+                                                        value:flow,
+                                                        color:'#0d8ecf',
+                                                        line_width:2
+                                                }
+
+                                         ];
+                         
+                                var labels = ["","2010","2011","2012","2013","2014"];
+                                
+                                var line = new iChart.LineBasic2D({
+                                        render : 'canvasDiv',
+                                        data: data,
+                                        align:'center',
+                                        title : '',
+                                        subtitle : '',
+                                        footnote : '',
+                                        width : 430, // 面板大小
+                                        height : 210,
+                                        shadow:true,
+							//shadow_color : '#20262f',
+							shadow_blur : 1,
+							shadow_offsetx : 0,
+							shadow_offsety : 2, 
+							//background_color:null //'#383e46'设置透明背景
+
+                                        tip:{
+                                                enable:true,
+                                                shadow:true,
+                                                move_duration:400,
+                                                border:{
+										enable:true,
+										radius : 5,
+										width:2,
+										color:'#3f8695'
+										},  	
+                                        },   
+
+                                        legend : {
+								enable : true,
+								row:1,//设置在一行上显示，与column配合使用
+								column : 'max',
+								valign:'top',
+								sign:'bar',
+								background_color:null,//设置透明背景
+								offsetx:-80,//设置x轴偏移，满足位置需要
+								border : true
+							},
+							  crosshair:{
+                                                enable:true, //十字交叉线
+                                                line_color:'#62bce9'
+                                        },
+                                        sub_option : {
+                                        	     label:false, //是否显示数值
+                                        	     // hollow_inside:false,
+                                                smooth : true,//平滑曲线
+                                                point_size:2, // 焦点大小
+                                                // point_hollow : true,
+                                                
+                                                
+                                        },                                    
+                                         coordinate:{
+                                                width:370, // 图表大小
+                                                //valid_width:330,
+                                                height:150,
+                                                axis:{
+                                                        // color:'#9f9f9f',
+                                                        color:'#dcdcdc',
+                                                        width:[0,0,2,2]
+                                                },
+                                                grids:{
+                                                        vertical:{
+                                                                way:'share_alike',
+                                                                value:1  
+                                                                // 改垂直线
+                                                        }
+                                                },
+                                                scale:[{ 
+                                                     position:'left',       
+                                                     start_scale:0,
+                                                     scale_space:50,
+                                                     end_scale:70, 
+                                                     scale_color:'#9f9f9f',
+                                                    // label : {color:'#ffffff',fontsize:11},
+
+                                                },{
+                                                         position:'bottom',     
+                                                         labels:labels
+                                                }]
+                                        }
+                                });
+                        //开始画图
+
+                         /**
+*自定义组件,画平均线。
+*/
+line.plugin(new iChart.Custom({
+drawFn:function(){
+/**
+*计算平均值的高度(坐标Y值)
+*计算高度还不会！ 会划线了！
+*/
+// var avg = line.total/5,
+// coo = line.getCoordinate(),
+// x = coo.get('originx'),
+// W = coo.width,
+// S = coo.getScale('left'),
+// H = coo.height,
+// h = (avg - S.start) * H / S.distance,
+// y = line.y + H - h;
+line.target.line(28,97,400,97,2,'#b32c0d')
+.textAlign('start')
+.textBaseline('middle')
+.textFont('600 12px Verdana');
+}
+})); 
+                        line.draw();
+                });
+                                
+  //]]>
+  </script>
+
+
+
+
+
 <%#======================================================================box before%>
-<div class="tb-navigation" data-spm="a230r.1.3">
+<div class="tb-navigation" data-spm="a230r.1.3"  style="margin-top:20px">
 	<div class="navigation">
 		<div class="nav-switch">
 				<a href="javascript:(function (){$('.nav-content').toggle();})();">

app/views/open_source_projects/show.html.erb

@@ -51,4 +51,4 @@
 		:title => l(:button_delete)
 		) if @forum.destroyable_by?(User.current) %>
 </div>
-<%= render :partial => 'open_source_projects/show_topics', :locals => {:memos => @memos} %>
+<%= render :partial => 'open_source_projects/show_topics', :locals => {:memos => @memos, :open_source_project => @open_source_project} %>

app/views/open_source_projects/showmemo.html.erb

@@ -0,0 +1,55 @@
+<!-- added by fq -->
+<div id="add-memo" class='lz' style="display: none; padding: 20px;">
+	<h3><%=l(:label_memo_new)%></h3>
+	<% if User.current.logged? %>
+	<%= labelled_form_for(@memo, :url => open_source_project_relative_memos_path(@open_source_project), :html => {:multipart => true} ) do |f|  %>
+	<% if @memo.errors.any? %>
+		<div id="error_explanation">
+			<h2><%= pluralize(@memo.errors.count, "error") %> prohibited this memo from being saved:</h2>
+
+			<ul>
+				<% @memo.errors.full_messages.each do |msg| %>
+				<li><%= msg %></li>
+				<% end %>
+			</ul>
+		</div>
+	<% end %>
+	<div class="actions" style="max-width:680px">
+		<p><%= f.text_field :subject, :required => true%></p>
+		<p style="max-width:680px"><%= f.text_area :content, :required => true, :id => 'editor02' %></p>
+		<script type="text/javascript">var ckeditor=CKEDITOR.replace('editor02');</script>
+		<br/>
+		<p>             
+			<%#= l(:label_attachment_plural) %><br />
+			<%#= render :partial => 'attachments/form', :locals => {:container => @memo} %>
+		</p>
+		<%= f.submit :value => l(:label_memo_create) %>
+		<%= link_to l(:button_cancel), "#", :onclick => '$("#add-memo").hide(); return false;' %>
+	</div>
+	<% end %>
+<% end %>
+</div>
+<!--modified by huang-->
+<% #= link_to '发布帖子', new_forum_memo_path(@forum), :class => 'icon icon-add' %>
+<span>
+	<%= link_to l(:label_memo_new_from_forum), new_open_source_project_relative_memo_path(@open_source_project), :class => 'icon icon-add',
+            :onclick => 'showAndScrollTo("add-memo", "memo_subject"); return false;' if User.current.logged? %>
+</span>
+
+<div class="contextual-borad">
+	<%#= link_to(
+		image_tag('edit.png')+l(:label_forum_edit),
+		{:action => 'edit', :id => @forum},
+		:method => 'get',
+		:title => l(:button_edit)
+		) if @forum.editable_by?(User.current) %>
+	<%#= link_to(
+		image_tag('delete.png')+'删除讨论区',
+		{:action => 'destroy', :id => @forum},
+		:method => :delete,
+		:data => {:confirm => l(:text_are_you_sure)},
+		:title => l(:button_delete)
+		) if @forum.destroyable_by?(User.current) %>
+</div>
+<%= render :partial => 'open_source_projects/show_memo', :locals => {:memos => @memos, :open_source_project => @open_source_project} %>
+</div>