From b4c299bff86983f85b3df396214b0790f2a8d019 Mon Sep 17 00:00:00 2001
From: ganyiang <ganyiang@gmail.com>
Date: Fri, 30 May 2014 09:35:06 +0800
Subject: [PATCH 01/62] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dosp=E4=B8=AD=E2=80=9C?=
 =?UTF-8?q?=E7=83=AD=E5=B8=96=E2=80=9D=E4=B8=8B=E6=98=BE=E7=A4=BA=E2=80=9C?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=B8=AE=E5=8A=A9=E2=80=9D=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/open_source_projects/_show_memo.html.erb   | 1 -
 app/views/open_source_projects/_show_topics.html.erb | 1 -
 public/stylesheets/buglist-div-use.css               | 2 +-
 public/stylesheets/buglist.css                       | 1 +
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/views/open_source_projects/_show_memo.html.erb b/app/views/open_source_projects/_show_memo.html.erb
index c5448a595..6633ccd75 100644
--- a/app/views/open_source_projects/_show_memo.html.erb
+++ b/app/views/open_source_projects/_show_memo.html.erb
@@ -61,7 +61,6 @@
 				<tr>
 					<td align="left">帖子来源：<span class="font_lighter" style="color: #068d9c"><%=link_to 'OSChina', topic.url %>
 					</span></td>
-					<td colspan="3" align="center"><%= no_use_link(topic, User.current) %> </td>
 				</tr>
 
 
diff --git a/app/views/open_source_projects/_show_topics.html.erb b/app/views/open_source_projects/_show_topics.html.erb
index f207cc552..38f689244 100644
--- a/app/views/open_source_projects/_show_topics.html.erb
+++ b/app/views/open_source_projects/_show_topics.html.erb
@@ -458,7 +458,6 @@
 				<tr>
 					<td align="left">帖子来源：<span class="font_lighter" style="color: #068d9c"><%=link_to 'OSChina', topic.url %>
 					</span></td>
-					<td colspan="3" align="center"><%= no_use_link(topic, User.current) %> </td>
 				</tr>
 			</table></td>
 		</tr>
diff --git a/public/stylesheets/buglist-div-use.css b/public/stylesheets/buglist-div-use.css
index de0c7c4ad..8ee6af1e8 100644
--- a/public/stylesheets/buglist-div-use.css
+++ b/public/stylesheets/buglist-div-use.css
@@ -31,7 +31,7 @@
    overflow: hidden;
    float: left;
    width: 440px;
-   left: 3%;
+   left: 2%;
 
   }
 
diff --git a/public/stylesheets/buglist.css b/public/stylesheets/buglist.css
index 4bc9267f7..49e816581 100644
--- a/public/stylesheets/buglist.css
+++ b/public/stylesheets/buglist.css
@@ -9,6 +9,7 @@ padding:0 0 0 0px;
 
 .li_time {
 padding:0 7px 0 0;
+list-style-type: square;
 }
 
 

From 9f16123bed895232ac607d3a85e16949ed12cbe8 Mon Sep 17 00:00:00 2001
From: ganyiang <ganyiang@gmail.com>
Date: Fri, 30 May 2014 11:29:05 +0800
Subject: [PATCH 02/62] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dosp=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=B8=96=E5=AD=90=E9=A1=B5=E9=9D=A2=EF=BC=8Cfooter=E6=BC=82?=
 =?UTF-8?q?=E7=A7=BB=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/open_source_projects/showmemo.html.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/open_source_projects/showmemo.html.erb b/app/views/open_source_projects/showmemo.html.erb
index 387237113..7c3bd5c31 100644
--- a/app/views/open_source_projects/showmemo.html.erb
+++ b/app/views/open_source_projects/showmemo.html.erb
@@ -51,5 +51,6 @@
 		:title => l(:button_delete)
 		) if @forum.destroyable_by?(User.current) %>
 </div>
+<div>
 <%= render :partial => 'open_source_projects/show_memo', :locals => {:memos => @memos, :open_source_project => @open_source_project} %>
 </div>
\ No newline at end of file

From bf71a38608794dabd6a43672f7d3a47ef761124e Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Fri, 30 May 2014 20:32:37 +0800
Subject: [PATCH 03/62] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../javascripts/contestnotifications.js       |   2 +
 .../stylesheets/contestnotifications.css      |   4 +
 app/controllers/application_controller.rb     |  30 ++++
 app/controllers/comments_controller.rb        |   9 +
 .../contestnotifications_controller.rb        | 161 ++++++++++++++++++
 app/controllers/documents_controller.rb       |   1 +
 .../issue_categories_controller.rb            |   7 +
 app/controllers/members_controller.rb         |   1 +
 app/controllers/versions_controller.rb        |   8 +
 app/helpers/contestnotifications_helper.rb    |   2 +
 app/models/contest.rb                         |  12 ++
 app/models/contestnotification.rb             |  61 +++++++
 app/models/user.rb                            |   1 +
 app/views/contestnotifications/_form.html.erb |  41 +++++
 app/views/contestnotifications/edit.html.erb  |   6 +
 app/views/contestnotifications/index.html.erb | 133 +++++++++++++++
 app/views/contestnotifications/new.html.erb   |  16 ++
 app/views/contestnotifications/show.html.erb  |  35 ++++
 config/locales/zh.yml                         |   2 +
 config/routes.rb                              |   3 +
 ...40530010015_create_contestnotifications.rb |  14 ++
 db/schema.rb                                  |  13 +-
 lib/redmine.rb                                |   8 +
 test/fixtures/contestnotifications.yml        |  17 ++
 .../contestnotifications_controller_test.rb   |  49 ++++++
 test/unit/contestnotification_test.rb         |   7 +
 .../contestnotifications_helper_test.rb       |   4 +
 27 files changed, 646 insertions(+), 1 deletion(-)
 create mode 100644 app/assets/javascripts/contestnotifications.js
 create mode 100644 app/assets/stylesheets/contestnotifications.css
 create mode 100644 app/controllers/contestnotifications_controller.rb
 create mode 100644 app/helpers/contestnotifications_helper.rb
 create mode 100644 app/models/contestnotification.rb
 create mode 100644 app/views/contestnotifications/_form.html.erb
 create mode 100644 app/views/contestnotifications/edit.html.erb
 create mode 100644 app/views/contestnotifications/index.html.erb
 create mode 100644 app/views/contestnotifications/new.html.erb
 create mode 100644 app/views/contestnotifications/show.html.erb
 create mode 100644 db/migrate/20140530010015_create_contestnotifications.rb
 create mode 100644 test/fixtures/contestnotifications.yml
 create mode 100644 test/functional/contestnotifications_controller_test.rb
 create mode 100644 test/unit/contestnotification_test.rb
 create mode 100644 test/unit/helpers/contestnotifications_helper_test.rb

diff --git a/app/assets/javascripts/contestnotifications.js b/app/assets/javascripts/contestnotifications.js
new file mode 100644
index 000000000..dee720fac
--- /dev/null
+++ b/app/assets/javascripts/contestnotifications.js
@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.
diff --git a/app/assets/stylesheets/contestnotifications.css b/app/assets/stylesheets/contestnotifications.css
new file mode 100644
index 000000000..afad32db0
--- /dev/null
+++ b/app/assets/stylesheets/contestnotifications.css
@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index a25b346ca..06e2285c2 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -264,6 +264,12 @@ class ApplicationController < ActionController::Base
     render_404
   end
 
+  def find_contest_by_contest_id
+    @contest = Contest.find(params[:contest_id])
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+
   # Find a project based on params[:project_id]
   # TODO: some subclasses override this, see about merging their logic
   def find_optional_project
@@ -274,12 +280,26 @@ class ApplicationController < ActionController::Base
     render_404
   end
 
+  def find_optional_contest
+    @contest = Contest.find(params[:contest_id]) unless params[:contest_id].blank?
+    allowed = User.current.allowed_to?({:controller => params[:controller], :action => params[:action]}, @contest, :global => true)
+    allowed ? true : deny_access
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+  
   # Finds and sets @project based on @object.project
   def find_project_from_association
     render_404 unless @object.present?
 
     @project = @object.project
   end
+  
+  def find_contest_from_association
+    render_404 unless @object.present?
+
+    @contest = @object.contest
+  end
 
   def find_model_object
     model = self.class.model_object
@@ -291,6 +311,16 @@ class ApplicationController < ActionController::Base
     render_404
   end
 
+  def find_model_object_contest
+    model = self.class.model_object
+    if model
+      @object = model.find(params[:id])
+      self.instance_variable_set('@' + controller_name.singularize, @object) if @object
+    end
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+
   def self.model_object(model)
     self.model_object = model
   end
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index b2689d0c2..5b5578c09 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -19,6 +19,7 @@ class CommentsController < ApplicationController
   default_search_scope :news
   model_object News
   before_filter :find_model_object
+  before_filter :find_model_object_contest  
   before_filter :find_project_from_association
   before_filter :authorize
 
@@ -50,4 +51,12 @@ class CommentsController < ApplicationController
     @comment = nil
     @news
   end
+  
+  def find_model_object_contest
+    super
+    @contestnotification = @object
+    @comment = nil
+    @contestnotification
+  end  
+  
 end
diff --git a/app/controllers/contestnotifications_controller.rb b/app/controllers/contestnotifications_controller.rb
new file mode 100644
index 000000000..4ca19e6ed
--- /dev/null
+++ b/app/controllers/contestnotifications_controller.rb
@@ -0,0 +1,161 @@
+class ContestnotificationsController < ApplicationController
+  # GET /contestnotifications
+  # GET /contestnotifications.json
+  layout 'base_contest'
+  default_search_scope :contestnotification
+  model_object Contestnotification
+  before_filter :find_model_object_contest, :except => [:new, :create, :index]
+  before_filter :find_contest_from_association, :except => [:new, :create, :index]
+  before_filter :find_contest_by_contest_id, :only => [:new, :create]
+  before_filter :authorize, :except => [:index]
+  before_filter :find_optional_contest, :only => :index
+  accept_rss_auth :index
+  accept_api_auth :index  
+  
+  def index
+    # @contestnotifications = Contestnotification.all
+# 
+    # respond_to do |format|
+      # format.html # index.html.erb
+      # format.json { render json: @contestnotifications }
+    # end
+    
+    ### begin ###
+    case params[:format]
+    when 'xml', 'json'
+      @offset, @limit = api_offset_and_limit
+    else
+      @limit =  10
+    end
+
+    scope = @contest ? @contest.contestnotification.visible : Contestnotification.visible
+
+    @contestnotification_count = scope.count
+    @contestnotification_pages = Paginator.new @contestnotification_count, @limit, params['page']
+    @offset ||= @contestnotification_pages.offset
+    @contestnotifications = scope.all(:include => [:author, :contest],
+                                       :order => "#{Contestnotification.table_name}.created_on DESC",
+                                       :offset => @offset,
+                                       :limit => @limit)  
+                                      
+    respond_to do |format|
+      format.html {
+        @contestnotification = Contestnotification.new # for adding news inline
+        render :layout => 'base_contest'
+      }
+      format.api
+      format.atom { render_feed(@contestnotifications, :title => (@contest ? @contest.name : Setting.app_title) + ": #{l(:label_contest_notification)}") }
+    end
+  ### end ###
+  end
+
+  # GET /contestnotifications/1
+  # GET /contestnotifications/1.json
+  def show
+    # @contestnotification = Contestnotification.find(params[:id])
+# 
+    # respond_to do |format|
+      # format.html # show.html.erb
+      # format.json { render json: @contestnotification }
+    # end
+    @comments = @contestnotification.comments
+    @comments.reverse! if User.current.wants_comments_in_reverse_order?    
+    render :layout => 'base_contest'
+
+  end
+
+  # GET /contestnotifications/new
+  # GET /contestnotifications/new.json
+  def new
+    # @contestnotification = Contestnotification.new
+# 
+    # respond_to do |format|
+      # format.html # new.html.erb
+      # format.json { render json: @contestnotification }
+    # end
+    @contestnotification = Contestnotification.new(:contest => @contest, :author => User.current)
+    render :layout => 'base_contest'
+  end
+
+  # GET /contestnotifications/1/edit
+  def edit
+    # @contestnotification = Contestnotification.find(params[:id])
+  end
+
+  # POST /contestnotifications
+  # POST /contestnotifications.json
+  def create
+    # @contestnotification = Contestnotification.new(params[:contestnotification])
+# 
+    # respond_to do |format|
+      # if @contestnotification.save
+        # format.html { redirect_to @contestnotification, notice: 'Contestnotification was successfully created.' }
+        # format.json { render json: @contestnotification, status: :created, location: @contestnotification }
+      # else
+        # format.html { render action: "new" }
+        # format.json { render json: @contestnotification.errors, status: :unprocessable_entity }
+      # end
+    # end
+    @contestnotification = Contestnotification.new(:contest => @contest, :author => User.current) 
+    @contestnotification.safe_attributes = params[:contestnotification]
+    @news.save_attachments(params[:attachments])
+    if @contestnotification.save
+      render_attachment_warning_if_needed(@contestnotification)
+      flash[:notice] = l(:notice_successful_create)
+      redirect_to project_news_index_path(@contest)
+    else
+      layout_file = 'base_contest' 
+      render :action => 'new', :layout => layout_file
+    end
+  end
+
+  # PUT /contestnotifications/1
+  # PUT /contestnotifications/1.json
+  def update
+    # @contestnotification = Contestnotification.find(params[:id])
+# 
+    # respond_to do |format|
+      # if @contestnotification.update_attributes(params[:contestnotification])
+        # format.html { redirect_to @contestnotification, notice: 'Contestnotification was successfully updated.' }
+        # format.json { head :no_content }
+      # else
+        # format.html { render action: "edit" }
+        # format.json { render json: @contestnotification.errors, status: :unprocessable_entity }
+      # end
+    # end
+    @contestnotification.safe_attributes = params[:contestnotification]
+    @contestnotification.save_attachments(params[:attachments])
+    if @contestnotification.save
+      render_attachment_warning_if_needed(@contestnotification)
+      flash[:notice] = l(:notice_successful_update)
+      redirect_to contestnotification_path(@contestnotification)
+    else
+      render :action => 'edit'
+    end
+  end
+
+  # DELETE /contestnotifications/1
+  # DELETE /contestnotifications/1.json
+  def destroy
+    # @contestnotification = Contestnotification.find(params[:id])
+    # @contestnotification.destroy
+# 
+    # respond_to do |format|
+      # format.html { redirect_to contestnotifications_url }
+      # format.json { head :no_content }
+    # end
+    @contestnotification.destroy
+    redirect_to contest_contestnotification_index_path(@contest)
+  end
+
+  private
+
+  def find_optional_contest
+    return true unless params[:contest_id]
+    @contest = Contest.find(params[:contest_id])
+    authorize
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+ 
+end
diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb
index 51486f252..7e21242cc 100644
--- a/app/controllers/documents_controller.rb
+++ b/app/controllers/documents_controller.rb
@@ -21,6 +21,7 @@ class DocumentsController < ApplicationController
   model_object Document
   before_filter :find_project_by_project_id, :only => [:index, :new, :create]
   before_filter :find_model_object, :except => [:index, :new, :create]
+  before_filter :find_model_object_contest, :except => [:index, :new, :create]
   before_filter :find_project_from_association, :except => [:index, :new, :create]
   before_filter :authorize , :except => [:index]#Added by young
 
diff --git a/app/controllers/issue_categories_controller.rb b/app/controllers/issue_categories_controller.rb
index a716653a5..f5ba71def 100644
--- a/app/controllers/issue_categories_controller.rb
+++ b/app/controllers/issue_categories_controller.rb
@@ -19,6 +19,7 @@ class IssueCategoriesController < ApplicationController
   menu_item :settings
   model_object IssueCategory
   before_filter :find_model_object, :except => [:index, :new, :create]
+  before_filter :find_model_object_contest, :except => [:index, :new, :create]
   before_filter :find_project_from_association, :except => [:index, :new, :create]
   before_filter :find_project_by_project_id, :only => [:index, :new, :create]
   before_filter :authorize
@@ -119,4 +120,10 @@ class IssueCategoriesController < ApplicationController
     super
     @category = @object
   end
+  
+  def find_model_object_contest
+    super
+    @category = @object
+  end  
+  
 end
diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index d8e583bf7..29c37c09b 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -17,6 +17,7 @@
 class MembersController < ApplicationController
   model_object Member
   before_filter :find_model_object, :except => [:index, :create, :autocomplete]
+  before_filter :find_model_object_contest, :except => [:index, :create, :autocomplete]
   before_filter :find_project_from_association, :except => [:index, :create, :autocomplete]
   before_filter :find_project_by_project_id, :only => [:index, :create, :autocomplete]
   before_filter :authorize
diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb
index 49e32ba17..72cb5301f 100644
--- a/app/controllers/versions_controller.rb
+++ b/app/controllers/versions_controller.rb
@@ -20,6 +20,7 @@ class VersionsController < ApplicationController
   menu_item :roadmap
   model_object Version
   before_filter :find_model_object, :except => [:index, :new, :create, :close_completed]
+  before_filter :find_model_object_contest, :except => [:index, :new, :create]
   before_filter :find_project_from_association, :except => [:index, :new, :create, :close_completed]
   before_filter :find_project_by_project_id, :only => [:index, :new, :create, :close_completed]
   before_filter :authorize
@@ -154,6 +155,13 @@ class VersionsController < ApplicationController
     redirect_to settings_project_path(@project, :tab => 'versions')
   end
 
+  def close_completed_contest
+    if request.put?
+      @contest.close_completed_versions
+    end
+    redirect_to settings_contest_path(@contest, :tab => 'versions')
+  end
+
   def destroy
     if @version.fixed_issues.empty?
       @version.destroy
diff --git a/app/helpers/contestnotifications_helper.rb b/app/helpers/contestnotifications_helper.rb
new file mode 100644
index 000000000..ab17149d7
--- /dev/null
+++ b/app/helpers/contestnotifications_helper.rb
@@ -0,0 +1,2 @@
+module ContestnotificationsHelper
+end
diff --git a/app/models/contest.rb b/app/models/contest.rb
index 9a3268654..4234f7519 100644
--- a/app/models/contest.rb
+++ b/app/models/contest.rb
@@ -13,6 +13,7 @@ class Contest < ActiveRecord::Base
   has_many :join_in_competitions, foreign_key: 'competition_id', :dependent => :destroy
   has_many :join_in_contests, class_name: 'JoinInCompetition', foreign_key: 'competition_id', :dependent => :destroy
   has_many :praise_tread, as: :praise_tread_object, dependent: :destroy
+  has_many :contestnotification, :dependent => :destroy, :include => :author
 
   
 
@@ -93,6 +94,17 @@ class Contest < ActiveRecord::Base
     end
   end
 
+  # Closes open and locked project versions that are completed
+  def close_completed_versions_contest
+    Version.transaction do
+      versions.where(:status => %w(open locked)).all.each do |version|
+        if version.completed?
+          version.update_attribute(:status, 'closed')
+        end
+      end
+    end
+  end
+
   def set_commit(commit)
     self.update_attribute(:commit, commit)
   end
diff --git a/app/models/contestnotification.rb b/app/models/contestnotification.rb
new file mode 100644
index 000000000..b0021c98a
--- /dev/null
+++ b/app/models/contestnotification.rb
@@ -0,0 +1,61 @@
+class Contestnotification < ActiveRecord::Base
+  attr_accessible :author_id, :comments_count, :contest_id, :description, :summary, :title
+
+  include Redmine::SafeAttributes
+  belongs_to :contest
+  belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
+  has_many :comments, :as => :commented, :dependent => :delete_all, :order => "created_at"
+  # fq
+  has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
+  
+  validates_presence_of :title, :description
+  validates_length_of :title, :maximum => 60
+  validates_length_of :summary, :maximum => 255
+
+  acts_as_attachable :delete_permission => :manage_contestnotification
+  acts_as_searchable :columns => ['title', 'summary', "#{table_name}.description"], :include => :contest
+  acts_as_event :url => Proc.new {|o| {:controller => 'contestnotification', :action => 'show', :id => o.id}}
+  acts_as_activity_provider :find_options => {:include => [:contest, :author]},
+                            :author_key => :author_id
+  acts_as_watchable
+
+  after_create :add_author_as_watcher, :reset_counters!
+ 
+  after_create :act_as_activity
+ 
+  
+  # scope :visible, lambda {|*args|
+    # includes(:contest).where(Contest.allowed_to_condition(args.shift || User.current, :view_news, *args))
+  # }
+
+  safe_attributes 'title', 'summary', 'description'
+
+  def visible?(user=User.current)
+    !user.nil? && user.allowed_to?(:view_contestnotification, contest)
+  end
+
+  # Returns true if the news can be commented by user
+  def commentable?(user=User.current)
+    user.allowed_to?(:comment_contestnotification, contest)
+  end
+
+  def recipients
+    contest.users.select {|user| user.notify_about?(self)}.map(&:mail)
+  end
+
+  # returns latest news for contests visible by user
+  def self.latest(user = User.current, count = 5)
+    visible(user).includes([:author, :contest]).order("#{Contestnotification.table_name}.created_on DESC").limit(count).all
+  end
+
+  private
+
+  def add_author_as_watcher
+    Watcher.create(:watchable => self, :user => author)
+  end
+  ## fq
+  def act_as_activity
+    self.acts << Activity.new(:user_id => self.author_id)
+  end    
+
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index cf8e3c0cf..c8b02f1a7 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -109,6 +109,7 @@ class User < Principal
 # added by bai
   has_many :join_in_contests, :dependent => :destroy
   has_many :news, :foreign_key => 'author_id'
+  has_many :contestnotification, :foreign_key => 'author_id'
   has_many :comments, :foreign_key => 'author_id'
   has_many :wiki_contents, :foreign_key => 'author_id'
   has_many :journals
diff --git a/app/views/contestnotifications/_form.html.erb b/app/views/contestnotifications/_form.html.erb
new file mode 100644
index 000000000..7fb5b719f
--- /dev/null
+++ b/app/views/contestnotifications/_form.html.erb
@@ -0,0 +1,41 @@
+<%= form_for(@contestnotification) do |f| %>
+  <% if @contestnotification.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@contestnotification.errors.count, "error") %> prohibited this contestnotification from being saved:</h2>
+
+      <ul>
+      <% @contestnotification.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="field">
+    <%= f.label :contest_id %><br />
+    <%= f.number_field :contest_id %>
+  </div>
+  <div class="field">
+    <%= f.label :title %><br />
+    <%= f.text_field :title %>
+  </div>
+  <div class="field">
+    <%= f.label :summary %><br />
+    <%= f.text_field :summary %>
+  </div>
+  <div class="field">
+    <%= f.label :description %><br />
+    <%= f.text_field :description %>
+  </div>
+  <div class="field">
+    <%= f.label :author_id %><br />
+    <%= f.number_field :author_id %>
+  </div>
+  <div class="field">
+    <%= f.label :comments_count %><br />
+    <%= f.number_field :comments_count %>
+  </div>
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>
diff --git a/app/views/contestnotifications/edit.html.erb b/app/views/contestnotifications/edit.html.erb
new file mode 100644
index 000000000..1db3cd205
--- /dev/null
+++ b/app/views/contestnotifications/edit.html.erb
@@ -0,0 +1,6 @@
+<h1>Editing contestnotification</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @contestnotification %> |
+<%= link_to 'Back', contestnotifications_path %>
diff --git a/app/views/contestnotifications/index.html.erb b/app/views/contestnotifications/index.html.erb
new file mode 100644
index 000000000..2dbfdf899
--- /dev/null
+++ b/app/views/contestnotifications/index.html.erb
@@ -0,0 +1,133 @@
+<!-- <h1>Listing contestnotifications</h1>
+
+<table>
+  <tr>
+    <th>Contest</th>
+    <th>Title</th>
+    <th>Summary</th>
+    <th>Description</th>
+    <th>Author</th>
+    <th>Comments count</th>
+    <th></th>
+    <th></th>
+    <th></th>
+  </tr>
+
+<% @contestnotifications.each do |contestnotification| %>
+  <tr>
+    <td><%= contestnotification.contest_id %></td>
+    <td><%= contestnotification.title %></td>
+    <td><%= contestnotification.summary %></td>
+    <td><%= contestnotification.description %></td>
+    <td><%= contestnotification.author_id %></td>
+    <td><%= contestnotification.comments_count %></td>
+    <td><%= link_to 'Show', contestnotification %></td>
+    <td><%= link_to 'Edit', edit_contestnotification_path(contestnotification) %></td>
+    <td><%= link_to 'Destroy', contestnotification, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+  </tr>
+<% end %>
+</table>
+
+<br />
+
+<%= link_to 'New Contestnotification', new_contestnotification_path %> -->
+
+<!--begin-->
+<%
+     btn_tips = l(:label_news_new)
+     label_tips = l(:label_news)
+%>
+
+<span style="font-size: 16px; border-bottom:1px solid #f0f0f0; margin-right: 15px;">
+	<%= label_tips %>
+</span>
+
+<%= link_to(btn_tips,
+          new_contest_contestnotification_path(@contest),
+          :class => 'icon icon-add',
+          :onclick => 'showAndScrollTo("add-news", "news_title"); return false;') %>
+
+<% if @contest && User.current.allowed_to?(:manage_news, @contest) %>
+    <div id="add-news" class="add_frame" style="display:none;">
+      <%= labelled_form_for @contestnotification, :url => contest_contestnotification_index_path(@contest),
+                            :html => {:id => 'news-form', :multipart => true} do |f| %>
+          <%= render :partial => 'news/form', :locals => {:f => f} %>
+          <%= submit_tag l(:button_create), :class => 'whiteButton m3p10 h30', :name => nil %><!-- button-submit  --> |
+          <%= preview_link preview_contestnotification_path(:contest_id => @contest), 'news-form', target='preview', {:class => 'whiteButton m3p10'} %>
+          |
+          <%= link_to l(:button_cancel), "#", :onclick => '$("#add-news").hide()', :class => 'whiteButton m3p10' %>
+      <% end if @contest %>
+      <div id="preview" class="wiki"></div>
+    </div>
+<% end %>
+<div>
+  <% if @contestnotifications.empty? %>
+      <p class="nodata">
+        <%= l(:label_no_data) %>
+      </p>
+  <% else %>
+      <% @contestnotifications.each do |contestnotification| %>
+
+          <table class="content-text-list">
+            <tr>
+              <td colspan="2" valign="top" width="50"><%= link_to image_tag(url_to_avatar(contestnotification.author), :class => "avatar"), user_path(contestnotification.author) %></td>
+              <td>
+                <table width="580px" border="0">
+
+                  <tr>
+                     <td colspan="2" valign="top">
+                       <strong><%= link_to_user(contestnotification.author) if contestnotification.respond_to?(:author) %></strong><span style="margin-left: 4px;" class="font_lighter"><%= l(:label_project_notice) %></span><span><%= link_to h(news.title), news_path(news) %></span>
+                         <span style="float: right"><%= delete_link contestnotification_path(news) if User.current.allowed_to?(:manage_contestnotification, @contest) %> </span>
+                     </td>
+                  </tr>
+                  <tr>
+                    <td colspan="2" width="580px">
+                      <span class="font_description"><%= textilizable(contestnotification, :description) %></span></td>
+                  </tr>
+                  <tr>
+                    <td align="left"><span class="font_lighter"> <%= l :label_update_time %>
+                      ：&nbsp;<%= format_time(contestnotification.created_at) %></span></td>
+                    <td width="350" align="right" class="a"><%= link_to l(:label_project_newother), contestnotification_path(contestnotification) %><%= "(#{l(:label_x_comments, :count => contestnotification.comments_count)})" if contestnotification.comments_count >= 0 %></td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+          </table>
+      <% end %>
+  <% end %>
+</div>
+<!--end-->
+<div style="padding-right: 10px">
+  <div class="pagination">
+    <ul>
+      <%= pagination_links_full @news_pages %>
+    </ul>
+  </div>
+
+  <% other_formats_links do |f| %>
+      <%= f.link_to 'Atom', :url => {:project_id => @project, :key => User.current.rss_key} %>
+  <% end %>
+
+  <% content_for :header_tags do %>
+      <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
+      <%= stylesheet_link_tag 'scm' %>
+  <% end %>
+
+  <% html_title(l(:label_news_plural)) -%>
+</div>
+
+<script type='text/javascript'>
+    $(document).ready(function ($) {
+        $('.content-text-list').each(function () {
+            $(this).find('.delete_icon').hide();
+            $(this).mouseenter(function (event) {
+                $(this).find('.delete_icon').show();
+            });
+            $(this).mouseleave(function (event) {
+                $(this).find('.delete_icon').hide();
+            });
+        });
+    });
+</script>
+
+<!--end-->
diff --git a/app/views/contestnotifications/new.html.erb b/app/views/contestnotifications/new.html.erb
new file mode 100644
index 000000000..f29bf784e
--- /dev/null
+++ b/app/views/contestnotifications/new.html.erb
@@ -0,0 +1,16 @@
+<!-- <h1>New contestnotification</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', contestnotifications_path %> -->
+
+
+<!-- <h3><%=l(:label_news_new)%></h3> -->
+
+<%= labelled_form_for @contestnotification, :url => contest_contestnotification_index_path(@contest),
+                                           :html => { :id => 'news-form', :multipart => true } do |f| %>
+  <%= render :partial => 'news/form', :locals => { :f => f } %>
+  <%= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %>
+  <%= preview_link preview_news_path(:project_id => @project), 'news-form' ,target='preview',{:class => 'whiteButton m3p10'}%>
+<% end %>
+<div id="preview" class="wiki"></div>
diff --git a/app/views/contestnotifications/show.html.erb b/app/views/contestnotifications/show.html.erb
new file mode 100644
index 000000000..310f8b579
--- /dev/null
+++ b/app/views/contestnotifications/show.html.erb
@@ -0,0 +1,35 @@
+<p id="notice"><%= notice %></p>
+
+<p>
+  <b>Contest:</b>
+  <%= @contestnotification.contest_id %>
+</p>
+
+<p>
+  <b>Title:</b>
+  <%= @contestnotification.title %>
+</p>
+
+<p>
+  <b>Summary:</b>
+  <%= @contestnotification.summary %>
+</p>
+
+<p>
+  <b>Description:</b>
+  <%= @contestnotification.description %>
+</p>
+
+<p>
+  <b>Author:</b>
+  <%= @contestnotification.author_id %>
+</p>
+
+<p>
+  <b>Comments count:</b>
+  <%= @contestnotification.comments_count %>
+</p>
+
+
+<%= link_to 'Edit', edit_contestnotification_path(@contestnotification) %> |
+<%= link_to 'Back', contestnotifications_path %>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index f86a757c6..51337ddca 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1961,6 +1961,8 @@ zh:
   label_attendingcontestwork_deposit_project: 托管项目
   label_attendingcontestwork_sorting_intimation: 您可以重新打分，打分结果以最后一次打分为主！
   
+  label_contest_notification: 竞赛通知
+  
   #end
   
   # ajax异步验证
diff --git a/config/routes.rb b/config/routes.rb
index b2fdd370d..ef63888f8 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -16,6 +16,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 RedmineApp::Application.routes.draw do
+  resources :contestnotifications
+
+
   resources :homework_users
 
 
diff --git a/db/migrate/20140530010015_create_contestnotifications.rb b/db/migrate/20140530010015_create_contestnotifications.rb
new file mode 100644
index 000000000..087c2cf8c
--- /dev/null
+++ b/db/migrate/20140530010015_create_contestnotifications.rb
@@ -0,0 +1,14 @@
+class CreateContestnotifications < ActiveRecord::Migration
+  def change
+    create_table :contestnotifications do |t|
+      t.integer :contest_id
+      t.string :title
+      t.string :summary
+      t.string :description
+      t.integer :author_id
+      t.integer :comments_count
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 68b9ad655..1123adad2 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140526104509) do
+ActiveRecord::Schema.define(:version => 20140530010015) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -210,6 +210,17 @@ ActiveRecord::Schema.define(:version => 20140526104509) do
     t.string   "reward"
   end
 
+  create_table "contestnotifications", :force => true do |t|
+    t.integer  "contest_id"
+    t.string   "title"
+    t.string   "summary"
+    t.string   "description"
+    t.integer  "author_id"
+    t.integer  "comments_count"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+  end
+
   create_table "contests", :force => true do |t|
     t.string   "name"
     t.string   "budget",      :default => ""
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 3a3cad611..7b28ac22e 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -146,6 +146,12 @@ Redmine::AccessControl.map do |map|
     map.permission :comment_news, {:comments => :create}
   end
 
+  map.project_module :contestnotification do |map|
+    map.permission :manage_contestnotification, {:contestnotification => [:new, :create, :edit, :update, :destroy], :comments => [:destroy]}, :require => :member
+    map.permission :view_contestnotification, {:contestnotification => [:index, :show]}, :public => true, :read => true
+    map.permission :comment_contestnotification, {:comments => :create}
+  end
+
   map.project_module :documents do |map|
     map.permission :add_documents, {:documents => [:new, :create, :add_attachment]}, :require => :loggedin
     map.permission :edit_documents, {:documents => [:edit, :update, :add_attachment]}, :require => :loggedin
@@ -390,6 +396,7 @@ Redmine::Activity.map do |activity|
   activity.register :issues, :class_name => %w(Issue Journal)
   activity.register :changesets
   activity.register :news
+  activity.register :contestnotification
   activity.register :documents, :class_name => %w(Document Attachment)
   activity.register :files, :class_name => 'Attachment'
   activity.register :wiki_edits, :class_name => 'WikiContent::Version', :default => false
@@ -405,6 +412,7 @@ end
 Redmine::Search.map do |search|
   search.register :issues
   search.register :news
+  search.register :contestnotification
   search.register :documents
   search.register :changesets
   search.register :wiki_pages
diff --git a/test/fixtures/contestnotifications.yml b/test/fixtures/contestnotifications.yml
new file mode 100644
index 000000000..6409a5f71
--- /dev/null
+++ b/test/fixtures/contestnotifications.yml
@@ -0,0 +1,17 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
+
+one:
+  contest_id: 1
+  title: MyString
+  summary: MyString
+  description: MyString
+  author_id: 1
+  comments_count: 1
+
+two:
+  contest_id: 1
+  title: MyString
+  summary: MyString
+  description: MyString
+  author_id: 1
+  comments_count: 1
diff --git a/test/functional/contestnotifications_controller_test.rb b/test/functional/contestnotifications_controller_test.rb
new file mode 100644
index 000000000..948955a87
--- /dev/null
+++ b/test/functional/contestnotifications_controller_test.rb
@@ -0,0 +1,49 @@
+require 'test_helper'
+
+class ContestnotificationsControllerTest < ActionController::TestCase
+  setup do
+    @contestnotification = contestnotifications(:one)
+  end
+
+  test "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:contestnotifications)
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create contestnotification" do
+    assert_difference('Contestnotification.count') do
+      post :create, contestnotification: { author_id: @contestnotification.author_id, comments_count: @contestnotification.comments_count, contest_id: @contestnotification.contest_id, description: @contestnotification.description, summary: @contestnotification.summary, title: @contestnotification.title }
+    end
+
+    assert_redirected_to contestnotification_path(assigns(:contestnotification))
+  end
+
+  test "should show contestnotification" do
+    get :show, id: @contestnotification
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, id: @contestnotification
+    assert_response :success
+  end
+
+  test "should update contestnotification" do
+    put :update, id: @contestnotification, contestnotification: { author_id: @contestnotification.author_id, comments_count: @contestnotification.comments_count, contest_id: @contestnotification.contest_id, description: @contestnotification.description, summary: @contestnotification.summary, title: @contestnotification.title }
+    assert_redirected_to contestnotification_path(assigns(:contestnotification))
+  end
+
+  test "should destroy contestnotification" do
+    assert_difference('Contestnotification.count', -1) do
+      delete :destroy, id: @contestnotification
+    end
+
+    assert_redirected_to contestnotifications_path
+  end
+end
diff --git a/test/unit/contestnotification_test.rb b/test/unit/contestnotification_test.rb
new file mode 100644
index 000000000..22b8113c7
--- /dev/null
+++ b/test/unit/contestnotification_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class ContestnotificationTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/unit/helpers/contestnotifications_helper_test.rb b/test/unit/helpers/contestnotifications_helper_test.rb
new file mode 100644
index 000000000..d79755d82
--- /dev/null
+++ b/test/unit/helpers/contestnotifications_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class ContestnotificationsHelperTest < ActionView::TestCase
+end

From 09ea833dcbd122c668c5ae81d638894f873be903 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Fri, 30 May 2014 20:52:55 +0800
Subject: [PATCH 04/62] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_contestnotifications.html.erb            | 28 ++++++
 app/views/contestnotifications/_form.html.erb | 18 +++-
 app/views/contestnotifications/edit.html.erb  | 17 +++-
 app/views/contestnotifications/new.html.erb   |  2 +-
 app/views/contestnotifications/show.html.erb  | 93 ++++++++++++++++++-
 5 files changed, 151 insertions(+), 7 deletions(-)
 create mode 100644 app/views/contestnotifications/_contestnotifications.html.erb

diff --git a/app/views/contestnotifications/_contestnotifications.html.erb b/app/views/contestnotifications/_contestnotifications.html.erb
new file mode 100644
index 000000000..0866ea198
--- /dev/null
+++ b/app/views/contestnotifications/_contestnotifications.html.erb
@@ -0,0 +1,28 @@
+<!--<p><%= link_to_project(news.project) + ': ' unless @project %>
+<table><tr><td><img src="/images/new/news.png" width="40" height="40"/></td><td><%= link_to h(news.title), news_path(news) %>
+<%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count > 0 %>
+
+ <% unless news.summary.blank? %></td><td><span class="fontligher"><%=h news.summary %></span><% end %></td>
+<td><span class="author"><%= authoring news.created_on, news.author %></span></td></tr></table></p>-->
+
+<table width="660px" border="0" align="center">
+  <tr>
+    <td colspan="2" valign="top" width="50" ><img src="/images/new/news.png" width="40" height="40"/></td>
+    <td><table width="580px" border="0">
+      <tr>
+        <td colspan="2" valign="top"><strong> <%=link_to contestnotification.author,contestnotification_path(contestnotification)%></strong> 
+        	<a class="font_lighter"><%= l(:label_project_newshare) %></a> <%= link_to h(contestnotification.title), news_path(contestnotification) %>
+        </td>
+        </tr>
+      <tr>
+        <td colspan="2" width="580px" ><p class="font_description"><%=h contestnotification.description%></p></td>
+        </tr>
+      <tr>
+        <td align="left"><a class="font_lighter"> <%= contestnotification.created_on %></a></td>
+        <td width="200" align="right" class="a"><%= link_to l(:label_project_newother),contestnotification_path(contestnotification)%>
+        	<%= "(#{l(:label_x_comments, :count => contestnotification.comments_count)})" if contestnotification.comments_count > 0 %>
+        </td>
+      </tr>
+    </table></td>
+  </tr>
+</table>
diff --git a/app/views/contestnotifications/_form.html.erb b/app/views/contestnotifications/_form.html.erb
index 7fb5b719f..ee49a15e6 100644
--- a/app/views/contestnotifications/_form.html.erb
+++ b/app/views/contestnotifications/_form.html.erb
@@ -1,4 +1,4 @@
-<%= form_for(@contestnotification) do |f| %>
+<!-- <%= form_for(@contestnotification) do |f| %>
   <% if @contestnotification.errors.any? %>
     <div id="error_explanation">
       <h2><%= pluralize(@contestnotification.errors.count, "error") %> prohibited this contestnotification from being saved:</h2>
@@ -38,4 +38,18 @@
   <div class="actions">
     <%= f.submit %>
   </div>
-<% end %>
+<% end %> -->
+
+
+<%= error_messages_for @contestnotification %>
+<div class="add_frame_header" >
+	<% str =l(:label_news_new) %>
+</div>
+<div class="box tabular">
+<p><%= f.text_field :title, :required => true, :size => 60, :style => "width:488px;" %></p>
+<!-- <p style="margin-left:-10px;"><%= f.text_area :summary, :cols => 60, :rows => 2, :style => "width:490px;margin-left:10px;" %></p> -->
+<p><%= f.text_area :description, :required => true, :cols => 60, :rows => 11, :class => 'wiki-edit', :style => "width:490px;" %></p>
+<p id="attachments_form" style="margin-left:-10px;"><label style="padding-right: 15px;"><%= l(:label_attachment_plural) %></label><%= render :partial => 'attachments/form', :locals => {:container => @contestnotification} %></p>
+</div>
+
+<%= wikitoolbar_for 'news_description' %>
diff --git a/app/views/contestnotifications/edit.html.erb b/app/views/contestnotifications/edit.html.erb
index 1db3cd205..6d680f2e6 100644
--- a/app/views/contestnotifications/edit.html.erb
+++ b/app/views/contestnotifications/edit.html.erb
@@ -1,6 +1,19 @@
-<h1>Editing contestnotification</h1>
+<!-- <h1>Editing contestnotification</h1>
 
 <%= render 'form' %>
 
 <%= link_to 'Show', @contestnotification %> |
-<%= link_to 'Back', contestnotifications_path %>
+<%= link_to 'Back', contestnotifications_path %> -->
+
+<h3><%=l(:label_news)%></h3>
+
+<%= labelled_form_for @contestnotification, :html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
+<%= render :partial => 'form', :locals => { :f => f } %>
+<%= submit_tag l(:button_save) %>
+<%= preview_link preview_news_path(:project_id => @contest, :id => @contestnotification), 'news-form' %>
+<% end %>
+<div id="preview" class="wiki"></div>
+
+<% content_for :header_tags do %>
+  <%= stylesheet_link_tag 'scm' %>
+<% end %>
diff --git a/app/views/contestnotifications/new.html.erb b/app/views/contestnotifications/new.html.erb
index f29bf784e..cd5920273 100644
--- a/app/views/contestnotifications/new.html.erb
+++ b/app/views/contestnotifications/new.html.erb
@@ -11,6 +11,6 @@
                                            :html => { :id => 'news-form', :multipart => true } do |f| %>
   <%= render :partial => 'news/form', :locals => { :f => f } %>
   <%= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %>
-  <%= preview_link preview_news_path(:project_id => @project), 'news-form' ,target='preview',{:class => 'whiteButton m3p10'}%>
+  <%= preview_link preview_news_path(:contest_id => @contest), 'news-form' ,target='preview',{:class => 'whiteButton m3p10'}%>
 <% end %>
 <div id="preview" class="wiki"></div>
diff --git a/app/views/contestnotifications/show.html.erb b/app/views/contestnotifications/show.html.erb
index 310f8b579..3b3a53fd8 100644
--- a/app/views/contestnotifications/show.html.erb
+++ b/app/views/contestnotifications/show.html.erb
@@ -1,4 +1,4 @@
-<p id="notice"><%= notice %></p>
+<!-- <p id="notice"><%= notice %></p>
 
 <p>
   <b>Contest:</b>
@@ -32,4 +32,93 @@
 
 
 <%= link_to 'Edit', edit_contestnotification_path(@contestnotification) %> |
-<%= link_to 'Back', contestnotifications_path %>
+<%= link_to 'Back', contestnotifications_path %> -->
+
+<!--begin-->
+<div class="contextual">
+	<%= watcher_link(@contestnotification, User.current) %>
+	<%= link_to(l(:button_edit),
+	edit_news_path(@news),
+	:class => 'icon icon-edit',
+	:accesskey => accesskey(:edit),
+	:onclick => '$("#edit-news").show(); return false;') if User.current.allowed_to?(:manage_contestnotification, @contest) %>
+	<%= delete_link news_path(@contestnotification) if User.current.allowed_to?(:manage_contestnotification, @contest) %>
+</div>
+
+<h3><strong><%=h @contestnotification.title %></strong></h3>
+
+<% if authorize_for('contestnotification', 'edit') %>
+<div id="edit-news" style="display:none;">
+	<%= labelled_form_for :contestnotification, @contestnotification, :url => contestnotification_path(@contestnotification),
+	:html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
+	<%= render :partial => 'form', :locals => { :f => f } %>
+	<%= submit_tag l(:button_save) %>
+	<%= preview_link preview_contestnotification_path(:contest_id => @contest, :id => @contestnotification), 'news-form',target='preview',{:class => ''} %> |
+	<%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;' %>
+	<% end %>
+	<div id="preview" class="wiki"></div>
+</div>
+<% end %>
+
+<div id="comments" style="margin-bottom:16px;">
+
+	<div style="margin:15px">
+		<span class="font_description"> <%= textilizable(@contestnotification, :description) %> </span>
+		<br/>
+		<%= link_to_attachments @contestnotification %>
+		<br/>
+		<!--add comment-->
+		<% if @contestnotification.commentable? %>
+		<p>
+			<%= toggle_link l(:label_comment_add), "add_comment_form", :focus => "comment_comments" %>
+		</p>
+		<%= form_tag({:controller => 'comments', :action => 'create', :id => @contestnotification}, :id => "add_comment_form", :style => "display:none;") do %>
+		<div class="box">
+			<%= text_area 'comment', 'comments', :cols => 80, :rows => 15, :class => 'wiki-edit' %>
+			<%= wikitoolbar_for 'comment_comments' %>
+		</div>
+		<p>
+			<%= submit_tag l(:button_add) %>
+		</p>
+		<% end %>
+		<% end %>
+
+		<% html_title @contestnotification.title -%>
+
+		<% content_for :header_tags do %>
+		<%= stylesheet_link_tag 'scm' %>
+		<% end %>
+
+		<!--dispaly comments-->
+		<div  class="line_heng"></div>
+	</div>
+	<h3 class="comments"><%= l(:label_comment_plural) %></h3>
+	<% comments = @comments.reverse %>
+	<% comments.each do |comment| %>
+	<% next if comment.new_record? %>
+	<table width="660px" border="0" align="center">
+		<tr>
+			<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(comment.author), :class => "avatar")%></td>
+			<td>
+			<table width="580px" border="0">
+				<tr>
+					<td colspan="2" valign="top"><strong><%= link_to_user(comment.author) if comment.respond_to?(:author) %> </strong><span class="font_lighter"><%= l(:label_project_newadd) %></span><%= l(:label_comment_plural) %></td>
+				</tr>
+				<tr>
+					<td colspan="2" width="580px" >
+					<p class="font_description">
+						<%= textilizable(comment.comments) %>
+					</p></td>
+				</tr>
+				<tr>
+					<td align="left"><span class="font_lighter"> <%= format_time(comment.created_on) %></span></td>
+					<td width="200" align="right" class="a"><%= link_to_if_authorized image_tag('delete.png'), {:controller => 'comments', :action => 'destroy', :id => @contestnotification, :comment_id => comment},
+					:data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %></td>
+				</tr>
+			</table></td>
+		</tr>
+	</table>
+	<% end if @comments.any? %>
+</div>
+
+<!--end-->

From 528af32f914e72c9d240cd9398cb1c376c4c44ac Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Tue, 3 Jun 2014 09:27:07 +0800
Subject: [PATCH 05/62] =?UTF-8?q?=E4=BF=AE=E6=94=B9forge=EF=BC=8Clocalhost?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=B8=8D=E8=83=BD=E6=98=BE=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/application_controller.rb     |  4 +--
 app/controllers/comments_controller.rb        |  4 +--
 .../contestnotifications_controller.rb        | 32 +++++++++----------
 app/helpers/welcome_helper.rb                 |  5 +--
 app/models/contestnotification.rb             |  2 +-
 .../_contestnotifications.html.erb            | 12 +++----
 app/views/contestnotifications/_form.html.erb |  4 +--
 app/views/contestnotifications/edit.html.erb  |  4 +--
 app/views/contestnotifications/index.html.erb | 20 ++++++------
 app/views/contestnotifications/new.html.erb   |  2 +-
 app/views/contestnotifications/show.html.erb  | 24 +++++++-------
 lib/redmine.rb                                |  4 +--
 12 files changed, 59 insertions(+), 58 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 06e2285c2..27829fa08 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -296,9 +296,9 @@ class ApplicationController < ActionController::Base
   end
   
   def find_contest_from_association
-    render_404 unless @object.present?
+    render_404 unless @contest.present?
 
-    @contest = @object.contest
+    @contest = @contest.contest
   end
 
   def find_model_object
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 5b5578c09..d54e9ae7e 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -54,9 +54,9 @@ class CommentsController < ApplicationController
   
   def find_model_object_contest
     super
-    @contestnotification = @object
+    @contestnotifications = @object
     @comment = nil
-    @contestnotification
+    @contestnotifications
   end  
   
 end
diff --git a/app/controllers/contestnotifications_controller.rb b/app/controllers/contestnotifications_controller.rb
index 4ca19e6ed..15455c806 100644
--- a/app/controllers/contestnotifications_controller.rb
+++ b/app/controllers/contestnotifications_controller.rb
@@ -28,23 +28,23 @@ class ContestnotificationsController < ApplicationController
       @limit =  10
     end
 
-    scope = @contest ? @contest.contestnotification.visible : Contestnotification.visible
+    scope = @contest ? @contest.contestnotifications.visible : Contestnotifications.visible
 
     @contestnotification_count = scope.count
     @contestnotification_pages = Paginator.new @contestnotification_count, @limit, params['page']
     @offset ||= @contestnotification_pages.offset
-    @contestnotifications = scope.all(:include => [:author, :contest],
+    @contestnotificationss = scope.all(:include => [:author, :contest],
                                        :order => "#{Contestnotification.table_name}.created_on DESC",
                                        :offset => @offset,
                                        :limit => @limit)  
                                       
     respond_to do |format|
       format.html {
-        @contestnotification = Contestnotification.new # for adding news inline
+        @contestnotifications = Contestnotifications.new # for adding news inline
         render :layout => 'base_contest'
       }
       format.api
-      format.atom { render_feed(@contestnotifications, :title => (@contest ? @contest.name : Setting.app_title) + ": #{l(:label_contest_notification)}") }
+      format.atom { render_feed(@contestnotificationss, :title => (@contest ? @contest.name : Setting.app_title) + ": #{l(:label_contest_notification)}") }
     end
   ### end ###
   end
@@ -58,7 +58,7 @@ class ContestnotificationsController < ApplicationController
       # format.html # show.html.erb
       # format.json { render json: @contestnotification }
     # end
-    @comments = @contestnotification.comments
+    @comments = @contestnotifications.comments
     @comments.reverse! if User.current.wants_comments_in_reverse_order?    
     render :layout => 'base_contest'
 
@@ -73,7 +73,7 @@ class ContestnotificationsController < ApplicationController
       # format.html # new.html.erb
       # format.json { render json: @contestnotification }
     # end
-    @contestnotification = Contestnotification.new(:contest => @contest, :author => User.current)
+    @contestnotifications = Contestnotifications.new(:contest => @contest, :author => User.current)
     render :layout => 'base_contest'
   end
 
@@ -96,11 +96,11 @@ class ContestnotificationsController < ApplicationController
         # format.json { render json: @contestnotification.errors, status: :unprocessable_entity }
       # end
     # end
-    @contestnotification = Contestnotification.new(:contest => @contest, :author => User.current) 
-    @contestnotification.safe_attributes = params[:contestnotification]
+    @contestnotifications = Contestnotifications.new(:contest => @contest, :author => User.current) 
+    @contestnotifications.safe_attributes = params[:contestnotifications]
     @news.save_attachments(params[:attachments])
-    if @contestnotification.save
-      render_attachment_warning_if_needed(@contestnotification)
+    if @contestnotifications.save
+      render_attachment_warning_if_needed(@contestnotifications)
       flash[:notice] = l(:notice_successful_create)
       redirect_to project_news_index_path(@contest)
     else
@@ -123,12 +123,12 @@ class ContestnotificationsController < ApplicationController
         # format.json { render json: @contestnotification.errors, status: :unprocessable_entity }
       # end
     # end
-    @contestnotification.safe_attributes = params[:contestnotification]
-    @contestnotification.save_attachments(params[:attachments])
-    if @contestnotification.save
-      render_attachment_warning_if_needed(@contestnotification)
+    @contestnotifications.safe_attributes = params[:contestnotifications]
+    @contestnotifications.save_attachments(params[:attachments])
+    if @contestnotifications.save
+      render_attachment_warning_if_needed(@contestnotifications)
       flash[:notice] = l(:notice_successful_update)
-      redirect_to contestnotification_path(@contestnotification)
+      redirect_to contestnotification_path(@contestnotifications)
     else
       render :action => 'edit'
     end
@@ -144,7 +144,7 @@ class ContestnotificationsController < ApplicationController
       # format.html { redirect_to contestnotifications_url }
       # format.json { head :no_content }
     # end
-    @contestnotification.destroy
+    @contestnotifications.destroy
     redirect_to contest_contestnotification_index_path(@contest)
   end
 
diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb
index 330010212..dc651d38a 100644
--- a/app/helpers/welcome_helper.rb
+++ b/app/helpers/welcome_helper.rb
@@ -319,9 +319,10 @@ module WelcomeHelper
       "show_documents" => true,
       "show_messages" => true,
       "show_news" => true,
-      "show_bids" => true
+      "show_bids" => true,
+      "show_contest" => true
     }
-    activity.scope_select{|t| ['changesets', 'documents', 'memos', 'messages', 'journals_for_messages', 'bids', 'news'].include?(t) ? nil : 'You may think you know what the following code does, may be. but why don"t you close this file and go play with something else, Now?' }
+    activity.scope_select{|t| ['changesets', 'documents', 'memos', 'messages', 'journals_for_messages', 'bids', 'news', 'contestnotification'].include?(t) ? nil : 'You may think you know what the following code does, may be. but why don"t you close this file and go play with something else, Now?' }
     activity.events_welcome(nil, nil, {:limit => limit, :types => 'welcome'})
   end
 
diff --git a/app/models/contestnotification.rb b/app/models/contestnotification.rb
index b0021c98a..f7087c49d 100644
--- a/app/models/contestnotification.rb
+++ b/app/models/contestnotification.rb
@@ -45,7 +45,7 @@ class Contestnotification < ActiveRecord::Base
 
   # returns latest news for contests visible by user
   def self.latest(user = User.current, count = 5)
-    visible(user).includes([:author, :contest]).order("#{Contestnotification.table_name}.created_on DESC").limit(count).all
+    visible(user).includes([:author, :contest]).order("#{Contestnotifications.table_name}.created_on DESC").limit(count).all
   end
 
   private
diff --git a/app/views/contestnotifications/_contestnotifications.html.erb b/app/views/contestnotifications/_contestnotifications.html.erb
index 0866ea198..4a062f3b5 100644
--- a/app/views/contestnotifications/_contestnotifications.html.erb
+++ b/app/views/contestnotifications/_contestnotifications.html.erb
@@ -10,17 +10,17 @@
     <td colspan="2" valign="top" width="50" ><img src="/images/new/news.png" width="40" height="40"/></td>
     <td><table width="580px" border="0">
       <tr>
-        <td colspan="2" valign="top"><strong> <%=link_to contestnotification.author,contestnotification_path(contestnotification)%></strong> 
-        	<a class="font_lighter"><%= l(:label_project_newshare) %></a> <%= link_to h(contestnotification.title), news_path(contestnotification) %>
+        <td colspan="2" valign="top"><strong> <%=link_to contestnotifications.author,contestnotifications_path(contestnotifications)%></strong> 
+        	<a class="font_lighter"><%= l(:label_project_newshare) %></a> <%= link_to h(contestnotifications.title), news_path(contestnotifications) %>
         </td>
         </tr>
       <tr>
-        <td colspan="2" width="580px" ><p class="font_description"><%=h contestnotification.description%></p></td>
+        <td colspan="2" width="580px" ><p class="font_description"><%=h contestnotifications.description%></p></td>
         </tr>
       <tr>
-        <td align="left"><a class="font_lighter"> <%= contestnotification.created_on %></a></td>
-        <td width="200" align="right" class="a"><%= link_to l(:label_project_newother),contestnotification_path(contestnotification)%>
-        	<%= "(#{l(:label_x_comments, :count => contestnotification.comments_count)})" if contestnotification.comments_count > 0 %>
+        <td align="left"><a class="font_lighter"> <%= contestnotifications.created_on %></a></td>
+        <td width="200" align="right" class="a"><%= link_to l(:label_project_newother),contestnotifications_path(contestnotifications)%>
+        	<%= "(#{l(:label_x_comments, :count => contestnotifications.comments_count)})" if contestnotifications.comments_count > 0 %>
         </td>
       </tr>
     </table></td>
diff --git a/app/views/contestnotifications/_form.html.erb b/app/views/contestnotifications/_form.html.erb
index ee49a15e6..6904714d6 100644
--- a/app/views/contestnotifications/_form.html.erb
+++ b/app/views/contestnotifications/_form.html.erb
@@ -41,7 +41,7 @@
 <% end %> -->
 
 
-<%= error_messages_for @contestnotification %>
+<%= error_messages_for @contestnotifications %>
 <div class="add_frame_header" >
 	<% str =l(:label_news_new) %>
 </div>
@@ -49,7 +49,7 @@
 <p><%= f.text_field :title, :required => true, :size => 60, :style => "width:488px;" %></p>
 <!-- <p style="margin-left:-10px;"><%= f.text_area :summary, :cols => 60, :rows => 2, :style => "width:490px;margin-left:10px;" %></p> -->
 <p><%= f.text_area :description, :required => true, :cols => 60, :rows => 11, :class => 'wiki-edit', :style => "width:490px;" %></p>
-<p id="attachments_form" style="margin-left:-10px;"><label style="padding-right: 15px;"><%= l(:label_attachment_plural) %></label><%= render :partial => 'attachments/form', :locals => {:container => @contestnotification} %></p>
+<p id="attachments_form" style="margin-left:-10px;"><label style="padding-right: 15px;"><%= l(:label_attachment_plural) %></label><%= render :partial => 'attachments/form', :locals => {:container => @contestnotifications} %></p>
 </div>
 
 <%= wikitoolbar_for 'news_description' %>
diff --git a/app/views/contestnotifications/edit.html.erb b/app/views/contestnotifications/edit.html.erb
index 6d680f2e6..121b15d9a 100644
--- a/app/views/contestnotifications/edit.html.erb
+++ b/app/views/contestnotifications/edit.html.erb
@@ -7,10 +7,10 @@
 
 <h3><%=l(:label_news)%></h3>
 
-<%= labelled_form_for @contestnotification, :html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
+<%= labelled_form_for @contestnotifications, :html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
 <%= submit_tag l(:button_save) %>
-<%= preview_link preview_news_path(:project_id => @contest, :id => @contestnotification), 'news-form' %>
+<%= preview_link preview_news_path(:project_id => @contest, :id => @contestnotifications), 'news-form' %>
 <% end %>
 <div id="preview" class="wiki"></div>
 
diff --git a/app/views/contestnotifications/index.html.erb b/app/views/contestnotifications/index.html.erb
index 2dbfdf899..514b89060 100644
--- a/app/views/contestnotifications/index.html.erb
+++ b/app/views/contestnotifications/index.html.erb
@@ -49,11 +49,11 @@
 
 <% if @contest && User.current.allowed_to?(:manage_news, @contest) %>
     <div id="add-news" class="add_frame" style="display:none;">
-      <%= labelled_form_for @contestnotification, :url => contest_contestnotification_index_path(@contest),
+      <%= labelled_form_for @contestnotifications, :url => contest_contestnotifications_index_path(@contest),
                             :html => {:id => 'news-form', :multipart => true} do |f| %>
           <%= render :partial => 'news/form', :locals => {:f => f} %>
           <%= submit_tag l(:button_create), :class => 'whiteButton m3p10 h30', :name => nil %><!-- button-submit  --> |
-          <%= preview_link preview_contestnotification_path(:contest_id => @contest), 'news-form', target='preview', {:class => 'whiteButton m3p10'} %>
+          <%= preview_link preview_contestnotifications_path(:contest_id => @contest), 'news-form', target='preview', {:class => 'whiteButton m3p10'} %>
           |
           <%= link_to l(:button_cancel), "#", :onclick => '$("#add-news").hide()', :class => 'whiteButton m3p10' %>
       <% end if @contest %>
@@ -61,33 +61,33 @@
     </div>
 <% end %>
 <div>
-  <% if @contestnotifications.empty? %>
+  <% if @contestnotificationss.empty? %>
       <p class="nodata">
         <%= l(:label_no_data) %>
       </p>
   <% else %>
-      <% @contestnotifications.each do |contestnotification| %>
+      <% @contestnotificationss.each do |contestnotifications| %>
 
           <table class="content-text-list">
             <tr>
-              <td colspan="2" valign="top" width="50"><%= link_to image_tag(url_to_avatar(contestnotification.author), :class => "avatar"), user_path(contestnotification.author) %></td>
+              <td colspan="2" valign="top" width="50"><%= link_to image_tag(url_to_avatar(contestnotifications.author), :class => "avatar"), user_path(contestnotifications.author) %></td>
               <td>
                 <table width="580px" border="0">
 
                   <tr>
                      <td colspan="2" valign="top">
-                       <strong><%= link_to_user(contestnotification.author) if contestnotification.respond_to?(:author) %></strong><span style="margin-left: 4px;" class="font_lighter"><%= l(:label_project_notice) %></span><span><%= link_to h(news.title), news_path(news) %></span>
-                         <span style="float: right"><%= delete_link contestnotification_path(news) if User.current.allowed_to?(:manage_contestnotification, @contest) %> </span>
+                       <strong><%= link_to_user(contestnotifications.author) if contestnotifications.respond_to?(:author) %></strong><span style="margin-left: 4px;" class="font_lighter"><%= l(:label_project_notice) %></span><span><%= link_to h(news.title), news_path(news) %></span>
+                         <span style="float: right"><%= delete_link contestnotifications_path(news) if User.current.allowed_to?(:manage_contestnotification, @contest) %> </span>
                      </td>
                   </tr>
                   <tr>
                     <td colspan="2" width="580px">
-                      <span class="font_description"><%= textilizable(contestnotification, :description) %></span></td>
+                      <span class="font_description"><%= textilizable(contestnotifications, :description) %></span></td>
                   </tr>
                   <tr>
                     <td align="left"><span class="font_lighter"> <%= l :label_update_time %>
-                      ：&nbsp;<%= format_time(contestnotification.created_at) %></span></td>
-                    <td width="350" align="right" class="a"><%= link_to l(:label_project_newother), contestnotification_path(contestnotification) %><%= "(#{l(:label_x_comments, :count => contestnotification.comments_count)})" if contestnotification.comments_count >= 0 %></td>
+                      ：&nbsp;<%= format_time(contestnotifications.created_at) %></span></td>
+                    <td width="350" align="right" class="a"><%= link_to l(:label_project_newother), contestnotifications_path(contestnotifications) %><%= "(#{l(:label_x_comments, :count => contestnotifications.comments_count)})" if contestnotifications.comments_count >= 0 %></td>
                   </tr>
                 </table>
               </td>
diff --git a/app/views/contestnotifications/new.html.erb b/app/views/contestnotifications/new.html.erb
index cd5920273..6e474b4ea 100644
--- a/app/views/contestnotifications/new.html.erb
+++ b/app/views/contestnotifications/new.html.erb
@@ -7,7 +7,7 @@
 
 <!-- <h3><%=l(:label_news_new)%></h3> -->
 
-<%= labelled_form_for @contestnotification, :url => contest_contestnotification_index_path(@contest),
+<%= labelled_form_for @contestnotifications, :url => contest_contestnotifications_index_path(@contest),
                                            :html => { :id => 'news-form', :multipart => true } do |f| %>
   <%= render :partial => 'news/form', :locals => { :f => f } %>
   <%= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %>
diff --git a/app/views/contestnotifications/show.html.erb b/app/views/contestnotifications/show.html.erb
index 3b3a53fd8..a8069c73c 100644
--- a/app/views/contestnotifications/show.html.erb
+++ b/app/views/contestnotifications/show.html.erb
@@ -36,24 +36,24 @@
 
 <!--begin-->
 <div class="contextual">
-	<%= watcher_link(@contestnotification, User.current) %>
+	<%= watcher_link(@contestnotifications, User.current) %>
 	<%= link_to(l(:button_edit),
 	edit_news_path(@news),
 	:class => 'icon icon-edit',
 	:accesskey => accesskey(:edit),
 	:onclick => '$("#edit-news").show(); return false;') if User.current.allowed_to?(:manage_contestnotification, @contest) %>
-	<%= delete_link news_path(@contestnotification) if User.current.allowed_to?(:manage_contestnotification, @contest) %>
+	<%= delete_link news_path(@contestnotifications) if User.current.allowed_to?(:manage_contestnotification, @contest) %>
 </div>
 
-<h3><strong><%=h @contestnotification.title %></strong></h3>
+<h3><strong><%=h @contestnotifications.title %></strong></h3>
 
-<% if authorize_for('contestnotification', 'edit') %>
+<% if authorize_for('contestnotifications', 'edit') %>
 <div id="edit-news" style="display:none;">
-	<%= labelled_form_for :contestnotification, @contestnotification, :url => contestnotification_path(@contestnotification),
+	<%= labelled_form_for :contestnotifications, @contestnotifications, :url => contestnotifications_path(@contestnotifications),
 	:html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
 	<%= render :partial => 'form', :locals => { :f => f } %>
 	<%= submit_tag l(:button_save) %>
-	<%= preview_link preview_contestnotification_path(:contest_id => @contest, :id => @contestnotification), 'news-form',target='preview',{:class => ''} %> |
+	<%= preview_link preview_contestnotifications_path(:contest_id => @contest, :id => @contestnotifications), 'news-form',target='preview',{:class => ''} %> |
 	<%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;' %>
 	<% end %>
 	<div id="preview" class="wiki"></div>
@@ -63,16 +63,16 @@
 <div id="comments" style="margin-bottom:16px;">
 
 	<div style="margin:15px">
-		<span class="font_description"> <%= textilizable(@contestnotification, :description) %> </span>
+		<span class="font_description"> <%= textilizable(@contestnotifications, :description) %> </span>
 		<br/>
-		<%= link_to_attachments @contestnotification %>
+		<%= link_to_attachments @contestnotifications %>
 		<br/>
 		<!--add comment-->
-		<% if @contestnotification.commentable? %>
+		<% if @contestnotifications.commentable? %>
 		<p>
 			<%= toggle_link l(:label_comment_add), "add_comment_form", :focus => "comment_comments" %>
 		</p>
-		<%= form_tag({:controller => 'comments', :action => 'create', :id => @contestnotification}, :id => "add_comment_form", :style => "display:none;") do %>
+		<%= form_tag({:controller => 'comments', :action => 'create', :id => @contestnotifications}, :id => "add_comment_form", :style => "display:none;") do %>
 		<div class="box">
 			<%= text_area 'comment', 'comments', :cols => 80, :rows => 15, :class => 'wiki-edit' %>
 			<%= wikitoolbar_for 'comment_comments' %>
@@ -83,7 +83,7 @@
 		<% end %>
 		<% end %>
 
-		<% html_title @contestnotification.title -%>
+		<% html_title @contestnotifications.title -%>
 
 		<% content_for :header_tags do %>
 		<%= stylesheet_link_tag 'scm' %>
@@ -112,7 +112,7 @@
 				</tr>
 				<tr>
 					<td align="left"><span class="font_lighter"> <%= format_time(comment.created_on) %></span></td>
-					<td width="200" align="right" class="a"><%= link_to_if_authorized image_tag('delete.png'), {:controller => 'comments', :action => 'destroy', :id => @contestnotification, :comment_id => comment},
+					<td width="200" align="right" class="a"><%= link_to_if_authorized image_tag('delete.png'), {:controller => 'comments', :action => 'destroy', :id => @contestnotifications, :comment_id => comment},
 					:data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %></td>
 				</tr>
 			</table></td>
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 7b28ac22e..a72e74ce4 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -147,8 +147,8 @@ Redmine::AccessControl.map do |map|
   end
 
   map.project_module :contestnotification do |map|
-    map.permission :manage_contestnotification, {:contestnotification => [:new, :create, :edit, :update, :destroy], :comments => [:destroy]}, :require => :member
-    map.permission :view_contestnotification, {:contestnotification => [:index, :show]}, :public => true, :read => true
+    map.permission :manage_contestnotification, {:contestnotifications => [:new, :create, :edit, :update, :destroy], :comments => [:destroy]}, :require => :member
+    map.permission :view_contestnotification, {:contestnotifications => [:index, :show]}, :public => true, :read => true
     map.permission :comment_contestnotification, {:comments => :create}
   end
 

From 81a45fe977a9432d08374391823cb48bc79be6ef Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Tue, 3 Jun 2014 15:27:04 +0800
Subject: [PATCH 06/62] dfs

---
 .../contestnotifications_controller.rb        |  20 +--
 app/controllers/contests_controller.rb        |   6 +-
 app/controllers/roles_controller.rb           | 108 --------------
 app/models/contestnotification.rb             |   6 +-
 app/views/contestnotifications/index.html.erb | 133 ------------------
 config/routes.rb                              |   8 +-
 lib/redmine.rb                                |  12 +-
 lib/redmine/access_control.rb                 |  18 ++-
 8 files changed, 44 insertions(+), 267 deletions(-)
 delete mode 100644 app/controllers/roles_controller.rb

diff --git a/app/controllers/contestnotifications_controller.rb b/app/controllers/contestnotifications_controller.rb
index 15455c806..110f26466 100644
--- a/app/controllers/contestnotifications_controller.rb
+++ b/app/controllers/contestnotifications_controller.rb
@@ -1,9 +1,9 @@
 class ContestnotificationsController < ApplicationController
   # GET /contestnotifications
   # GET /contestnotifications.json
-  layout 'base_contest'
-  default_search_scope :contestnotification
-  model_object Contestnotification
+  layout 'base_newcontest'
+  default_search_scope :contestnotifications
+  model_object Contestnotifications
   before_filter :find_model_object_contest, :except => [:new, :create, :index]
   before_filter :find_contest_from_association, :except => [:new, :create, :index]
   before_filter :find_contest_by_contest_id, :only => [:new, :create]
@@ -30,18 +30,18 @@ class ContestnotificationsController < ApplicationController
 
     scope = @contest ? @contest.contestnotifications.visible : Contestnotifications.visible
 
-    @contestnotification_count = scope.count
-    @contestnotification_pages = Paginator.new @contestnotification_count, @limit, params['page']
-    @offset ||= @contestnotification_pages.offset
+    @contestnotifications_count = scope.count
+    @contestnotifications_pages = Paginator.new @contestnotifications_count, @limit, params['page']
+    @offset ||= @contestnotifications_pages.offset
     @contestnotificationss = scope.all(:include => [:author, :contest],
-                                       :order => "#{Contestnotification.table_name}.created_on DESC",
+                                       :order => "#{Contestnotifications.table_name}.created_on DESC",
                                        :offset => @offset,
                                        :limit => @limit)  
                                       
     respond_to do |format|
       format.html {
-        @contestnotifications = Contestnotifications.new # for adding news inline
-        render :layout => 'base_contest'
+        @contestnotification = Contestnotification.new # for adding news inline
+        render :layout => 'base_newcontest'
       }
       format.api
       format.atom { render_feed(@contestnotificationss, :title => (@contest ? @contest.name : Setting.app_title) + ": #{l(:label_contest_notification)}") }
@@ -60,7 +60,7 @@ class ContestnotificationsController < ApplicationController
     # end
     @comments = @contestnotifications.comments
     @comments.reverse! if User.current.wants_comments_in_reverse_order?    
-    render :layout => 'base_contest'
+    render :layout => 'base_newcontest'
 
   end
 
diff --git a/app/controllers/contests_controller.rb b/app/controllers/contests_controller.rb
index b51a11436..bd4206808 100644
--- a/app/controllers/contests_controller.rb
+++ b/app/controllers/contests_controller.rb
@@ -4,9 +4,9 @@ class ContestsController < ApplicationController
   menu_item :respond                
   menu_item :project, :only => :show_project
   menu_item :application, :only => :show_softapplication
-  menu_item :attendingcontest, :only => :show_attendingcontest
-  menu_item :contestnotification, :only => :show_notification
-  before_filter :find_contest, :only => [:show_contest, :show_project, :show_softapplication, :show_attendingcontest, :show_notification, :set_reward_project, :set_reward_softapplication, :create,:destroy,:more,:back,:add,:add_softapplication,:new,:show_results, :set_reward,
+  menu_item :attendingcontests, :only => :show_attendingcontest
+  menu_item :contestnotifications, :only => :index
+  before_filter :find_contest, :only => [:show_contest, :show_project, :show_softapplication, :show_attendingcontest, :index, :set_reward_project, :set_reward_softapplication, :create,:destroy,:more,:back,:add,:add_softapplication,:new,:show_results, :set_reward,
                 :show_contest_project, :show_contest_user, :join_in_contest, :unjoin_in_contest, :new_join,:show_participator, :settings]
               
   # added by fq
diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb
deleted file mode 100644
index f4bae1e81..000000000
--- a/app/controllers/roles_controller.rb
+++ /dev/null
@@ -1,108 +0,0 @@
-# Redmine - project management software
-# Copyright (C) 2006-2013  Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-class RolesController < ApplicationController
-  layout 'admin'
-
-  before_filter :require_admin, :except => [:index, :show]
-  before_filter :require_admin_or_api_request, :only => [:index, :show]
-  before_filter :find_role, :only => [:show, :edit, :update, :destroy]
-  accept_api_auth :index, :show
-
-  def index
-    respond_to do |format|
-      format.html {
-        @role_pages, @roles = paginate Role.sorted, :per_page => 25
-        render :action => "index", :layout => false if request.xhr?
-      }
-      format.api {
-        @roles = Role.givable.all
-      }
-    end
-  end
-
-  def show
-    respond_to do |format|
-      format.api
-    end
-  end
-
-  def new
-    # Prefills the form with 'Non member' role permissions by default
-    @role = Role.new(params[:role] || {:permissions => Role.non_member.permissions})
-    if params[:copy].present? && @copy_from = Role.find_by_id(params[:copy])
-      @role.copy_from(@copy_from)
-    end
-    @roles = Role.sorted.all
-  end
-
-  def create
-    @role = Role.new(params[:role])
-    if request.post? && @role.save
-      # workflow copy
-      if !params[:copy_workflow_from].blank? && (copy_from = Role.find_by_id(params[:copy_workflow_from]))
-        @role.workflow_rules.copy(copy_from)
-      end
-      flash[:notice] = l(:notice_successful_create)
-      redirect_to roles_path
-    else
-      @roles = Role.sorted.all
-      render :action => 'new'
-    end
-  end
-
-  def edit
-  end
-
-  def update
-    if request.put? and @role.update_attributes(params[:role])
-      flash[:notice] = l(:notice_successful_update)
-      redirect_to roles_path
-    else
-      render :action => 'edit'
-    end
-  end
-
-  def destroy
-    @role.destroy
-    redirect_to roles_path
-  rescue
-    flash[:error] =  l(:error_can_not_remove_role)
-    redirect_to roles_path
-  end
-
-  def permissions
-    @roles = Role.sorted.all
-    @permissions = Redmine::AccessControl.permissions.select { |p| !p.public? }
-    if request.post?
-      @roles.each do |role|
-        role.permissions = params[:permissions][role.id.to_s]
-        role.save
-      end
-      flash[:notice] = l(:notice_successful_update)
-      redirect_to roles_path
-    end
-  end
-
-  private
-
-  def find_role
-    @role = Role.find(params[:id])
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
-end
diff --git a/app/models/contestnotification.rb b/app/models/contestnotification.rb
index f7087c49d..75b0f5814 100644
--- a/app/models/contestnotification.rb
+++ b/app/models/contestnotification.rb
@@ -31,12 +31,12 @@ class Contestnotification < ActiveRecord::Base
   safe_attributes 'title', 'summary', 'description'
 
   def visible?(user=User.current)
-    !user.nil? && user.allowed_to?(:view_contestnotification, contest)
+    !user.nil? && user.allowed_to?(:view_contestnotifications, contest)
   end
 
   # Returns true if the news can be commented by user
   def commentable?(user=User.current)
-    user.allowed_to?(:comment_contestnotification, contest)
+    user.allowed_to?(:comment_contestnotifications, contest)
   end
 
   def recipients
@@ -57,5 +57,5 @@ class Contestnotification < ActiveRecord::Base
   def act_as_activity
     self.acts << Activity.new(:user_id => self.author_id)
   end    
-
+   
 end
diff --git a/app/views/contestnotifications/index.html.erb b/app/views/contestnotifications/index.html.erb
index 514b89060..e69de29bb 100644
--- a/app/views/contestnotifications/index.html.erb
+++ b/app/views/contestnotifications/index.html.erb
@@ -1,133 +0,0 @@
-<!-- <h1>Listing contestnotifications</h1>
-
-<table>
-  <tr>
-    <th>Contest</th>
-    <th>Title</th>
-    <th>Summary</th>
-    <th>Description</th>
-    <th>Author</th>
-    <th>Comments count</th>
-    <th></th>
-    <th></th>
-    <th></th>
-  </tr>
-
-<% @contestnotifications.each do |contestnotification| %>
-  <tr>
-    <td><%= contestnotification.contest_id %></td>
-    <td><%= contestnotification.title %></td>
-    <td><%= contestnotification.summary %></td>
-    <td><%= contestnotification.description %></td>
-    <td><%= contestnotification.author_id %></td>
-    <td><%= contestnotification.comments_count %></td>
-    <td><%= link_to 'Show', contestnotification %></td>
-    <td><%= link_to 'Edit', edit_contestnotification_path(contestnotification) %></td>
-    <td><%= link_to 'Destroy', contestnotification, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-  </tr>
-<% end %>
-</table>
-
-<br />
-
-<%= link_to 'New Contestnotification', new_contestnotification_path %> -->
-
-<!--begin-->
-<%
-     btn_tips = l(:label_news_new)
-     label_tips = l(:label_news)
-%>
-
-<span style="font-size: 16px; border-bottom:1px solid #f0f0f0; margin-right: 15px;">
-	<%= label_tips %>
-</span>
-
-<%= link_to(btn_tips,
-          new_contest_contestnotification_path(@contest),
-          :class => 'icon icon-add',
-          :onclick => 'showAndScrollTo("add-news", "news_title"); return false;') %>
-
-<% if @contest && User.current.allowed_to?(:manage_news, @contest) %>
-    <div id="add-news" class="add_frame" style="display:none;">
-      <%= labelled_form_for @contestnotifications, :url => contest_contestnotifications_index_path(@contest),
-                            :html => {:id => 'news-form', :multipart => true} do |f| %>
-          <%= render :partial => 'news/form', :locals => {:f => f} %>
-          <%= submit_tag l(:button_create), :class => 'whiteButton m3p10 h30', :name => nil %><!-- button-submit  --> |
-          <%= preview_link preview_contestnotifications_path(:contest_id => @contest), 'news-form', target='preview', {:class => 'whiteButton m3p10'} %>
-          |
-          <%= link_to l(:button_cancel), "#", :onclick => '$("#add-news").hide()', :class => 'whiteButton m3p10' %>
-      <% end if @contest %>
-      <div id="preview" class="wiki"></div>
-    </div>
-<% end %>
-<div>
-  <% if @contestnotificationss.empty? %>
-      <p class="nodata">
-        <%= l(:label_no_data) %>
-      </p>
-  <% else %>
-      <% @contestnotificationss.each do |contestnotifications| %>
-
-          <table class="content-text-list">
-            <tr>
-              <td colspan="2" valign="top" width="50"><%= link_to image_tag(url_to_avatar(contestnotifications.author), :class => "avatar"), user_path(contestnotifications.author) %></td>
-              <td>
-                <table width="580px" border="0">
-
-                  <tr>
-                     <td colspan="2" valign="top">
-                       <strong><%= link_to_user(contestnotifications.author) if contestnotifications.respond_to?(:author) %></strong><span style="margin-left: 4px;" class="font_lighter"><%= l(:label_project_notice) %></span><span><%= link_to h(news.title), news_path(news) %></span>
-                         <span style="float: right"><%= delete_link contestnotifications_path(news) if User.current.allowed_to?(:manage_contestnotification, @contest) %> </span>
-                     </td>
-                  </tr>
-                  <tr>
-                    <td colspan="2" width="580px">
-                      <span class="font_description"><%= textilizable(contestnotifications, :description) %></span></td>
-                  </tr>
-                  <tr>
-                    <td align="left"><span class="font_lighter"> <%= l :label_update_time %>
-                      ：&nbsp;<%= format_time(contestnotifications.created_at) %></span></td>
-                    <td width="350" align="right" class="a"><%= link_to l(:label_project_newother), contestnotifications_path(contestnotifications) %><%= "(#{l(:label_x_comments, :count => contestnotifications.comments_count)})" if contestnotifications.comments_count >= 0 %></td>
-                  </tr>
-                </table>
-              </td>
-            </tr>
-          </table>
-      <% end %>
-  <% end %>
-</div>
-<!--end-->
-<div style="padding-right: 10px">
-  <div class="pagination">
-    <ul>
-      <%= pagination_links_full @news_pages %>
-    </ul>
-  </div>
-
-  <% other_formats_links do |f| %>
-      <%= f.link_to 'Atom', :url => {:project_id => @project, :key => User.current.rss_key} %>
-  <% end %>
-
-  <% content_for :header_tags do %>
-      <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
-      <%= stylesheet_link_tag 'scm' %>
-  <% end %>
-
-  <% html_title(l(:label_news_plural)) -%>
-</div>
-
-<script type='text/javascript'>
-    $(document).ready(function ($) {
-        $('.content-text-list').each(function () {
-            $(this).find('.delete_icon').hide();
-            $(this).mouseenter(function (event) {
-                $(this).find('.delete_icon').show();
-            });
-            $(this).mouseleave(function (event) {
-                $(this).find('.delete_icon').hide();
-            });
-        });
-    });
-</script>
-
-<!--end-->
diff --git a/config/routes.rb b/config/routes.rb
index ef63888f8..c6a727ca6 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -16,8 +16,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 RedmineApp::Application.routes.draw do
-  resources :contestnotifications
-
+  resources :contestnotifications
+  
+  match '/contests/:id/contestnotifications', :controller => 'contestnotifications', :action => 'index'
 
   resources :homework_users
 
@@ -85,7 +86,7 @@ RedmineApp::Application.routes.draw do
       match 'show_project'               , via: :get
       match 'show_softapplication'       , via: :get
       match 'show_attendingcontest'      , via: :get
-      match 'show_notification'          , via: :get
+      #match 'show_notification'          , via: :get
       match 'show_participator'          , via: :get
       match 'set_reward_project'         , via: [:get, :post]
       match 'set_reward_softapplication' , via: [:get, :post]
@@ -93,6 +94,7 @@ RedmineApp::Application.routes.draw do
       match 'add_softapplication'        , via: [:get, :post]
       match 'create'                     , via: :post
       match 'settings'                   , via: [:get, :post]
+
     end   
   end  
   
diff --git a/lib/redmine.rb b/lib/redmine.rb
index a72e74ce4..861e14f7e 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -93,6 +93,7 @@ Redmine::AccessControl.map do |map|
   map.permission :edit_project, {:projects => [:settings, :edit, :update]}, :require => :member
   map.permission :close_project, {:projects => [:close, :reopen]}, :require => :member, :read => true
   map.permission :select_project_modules, {:projects => :modules}, :require => :member
+  map.permission :select_contest_modules, {:contests => :modules}, :require => :member
   map.permission :manage_members, {:projects => :settings, :members => [:index, :show, :create, :update, :destroy, :autocomplete]}, :require => :member
   map.permission :manage_versions, {:projects => :settings, :versions => [:new, :create, :edit, :update, :close_completed, :destroy]}, :require => :member
   map.permission :add_subprojects, {:projects => [:new, :create]}, :require => :member
@@ -146,10 +147,10 @@ Redmine::AccessControl.map do |map|
     map.permission :comment_news, {:comments => :create}
   end
 
-  map.project_module :contestnotification do |map|
-    map.permission :manage_contestnotification, {:contestnotifications => [:new, :create, :edit, :update, :destroy], :comments => [:destroy]}, :require => :member
-    map.permission :view_contestnotification, {:contestnotifications => [:index, :show]}, :public => true, :read => true
-    map.permission :comment_contestnotification, {:comments => :create}
+  map.contest_module :contestnotifications do |map|
+    map.permission :manage_contestnotifications, {:contestnotifications => [:new, :create, :edit, :update, :destroy], :comments => [:destroy]}, :require => :member
+    map.permission :view_contestnotifications, {:contestnotifications => [:index, :show]}, :public => true, :read => true
+    map.permission :comment_contestnotifications, {:comments => :create}
   end
 
   map.project_module :documents do |map|
@@ -293,7 +294,8 @@ Redmine::MenuManager.map :contest_menu do |menu|
   #menu.push :project, :show_project_contest_path, :caption => :label_contest_project
   #menu.push :application, :show_softapplication_contest_path, :caption => :label_contest_application
   menu.push :attendingcontest, {:controller => 'contests', :action => 'show_attendingcontest'}, :caption => :label_attending_contest
-  menu.push :contestnotification, {:controller => 'contests', :action => 'show_notification'}, :caption => :label_contest_notification
+  menu.push :contestnotifications, { :controller => 'contestnotifications', :action => 'index' }, :param => :contest_id, :caption => :label_contest_notification
+  #menu.push :contestnotification, {:controller => 'contests', :action => 'show_notification'}, :caption => :label_contest_notification
   # menu.push :attendingcontest, :show_attendingcontest_contest_path, :caption => :label_attendin,g_contest
   # menu.push :result,  { :controller => 'bids', :action => 'show_results' }, 
              # :caption => :label_bidding_results,:if => Proc.new{ |p| User.current.id == p } 
diff --git a/lib/redmine/access_control.rb b/lib/redmine/access_control.rb
index 7c4a5a5ec..dfde5debc 100644
--- a/lib/redmine/access_control.rb
+++ b/lib/redmine/access_control.rb
@@ -67,20 +67,26 @@ module Redmine
       def available_project_modules
         @available_project_modules ||= @permissions.collect(&:project_module).uniq.compact
       end
-
+      def available_contest_modules
+        @available_contest_modules ||= @permissions.collect(&:contest_module).uniq.compact
+      end
+      
       def modules_permissions(modules)
         @permissions.select {|p| p.project_module.nil? || modules.include?(p.project_module.to_s)}
+        @permissions.select {|p| p.contest_module.nil? || modules.include?(p.contest_module.to_s)}
       end
     end
 
     class Mapper
       def initialize
         @project_module = nil
+        @contest_module = nil
       end
 
       def permission(name, hash, options={})
         @permissions ||= []
         options.merge!(:project_module => @project_module)
+        options.merge!(:contest_module => @contest_module)
         @permissions << Permission.new(name, hash, options)
       end
 
@@ -90,13 +96,19 @@ module Redmine
         @project_module = nil
       end
 
+      def contest_module(name, options={})
+        @contest_module = name
+        yield self
+        @contest_module = nil
+      end
+      
       def mapped_permissions
         @permissions
       end
     end
 
     class Permission
-      attr_reader :name, :actions, :project_module
+      attr_reader :name, :actions, :project_module, :contest_module
 
       def initialize(name, hash, options)
         @name = name
@@ -105,6 +117,8 @@ module Redmine
         @require = options[:require]
         @read = options[:read] || false
         @project_module = options[:project_module]
+        @contest_module = options[:contest_module]
+        
         hash.each do |controller, actions|
           if actions.is_a? Array
             @actions << actions.collect {|action| "#{controller}/#{action}"}

From a3fb48a4bb43f74cf8a48156a76c6f6eaf9ee991 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Tue, 3 Jun 2014 18:24:55 +0800
Subject: [PATCH 07/62] 0603

---
 .../contestnotifications_controller.rb        |  33 +++---
 app/models/contest.rb                         |   2 +-
 app/models/contestnotification.rb             |  11 +-
 app/views/contestnotifications/index.html.erb | 101 ++++++++++++++++
 app/views/contestnotifications/new.html.erb   |   6 +-
 app/views/roles/roles_controller.rb           | 108 ++++++++++++++++++
 config/routes.rb                              |   9 +-
 7 files changed, 242 insertions(+), 28 deletions(-)
 create mode 100644 app/views/roles/roles_controller.rb

diff --git a/app/controllers/contestnotifications_controller.rb b/app/controllers/contestnotifications_controller.rb
index 110f26466..675efd7f0 100644
--- a/app/controllers/contestnotifications_controller.rb
+++ b/app/controllers/contestnotifications_controller.rb
@@ -3,16 +3,19 @@ class ContestnotificationsController < ApplicationController
   # GET /contestnotifications.json
   layout 'base_newcontest'
   default_search_scope :contestnotifications
-  model_object Contestnotifications
+  # model_object Contestnotifications
   before_filter :find_model_object_contest, :except => [:new, :create, :index]
   before_filter :find_contest_from_association, :except => [:new, :create, :index]
   before_filter :find_contest_by_contest_id, :only => [:new, :create]
   before_filter :authorize, :except => [:index]
-  before_filter :find_optional_contest, :only => :index
+  before_filter :find_optional_contest, :only => [:index]
   accept_rss_auth :index
   accept_api_auth :index  
   
+
+  
   def index
+    @user = @contest.author
     # @contestnotifications = Contestnotification.all
 # 
     # respond_to do |format|
@@ -28,13 +31,13 @@ class ContestnotificationsController < ApplicationController
       @limit =  10
     end
 
-    scope = @contest ? @contest.contestnotifications.visible : Contestnotifications.visible
+    scope = @contest ? @contest.contestnotifications.visible : Contestnotification.visible
 
     @contestnotifications_count = scope.count
     @contestnotifications_pages = Paginator.new @contestnotifications_count, @limit, params['page']
     @offset ||= @contestnotifications_pages.offset
     @contestnotificationss = scope.all(:include => [:author, :contest],
-                                       :order => "#{Contestnotifications.table_name}.created_on DESC",
+                                       :order => "#{Contestnotification.table_name}.created_at DESC",
                                        :offset => @offset,
                                        :limit => @limit)  
                                       
@@ -67,14 +70,14 @@ class ContestnotificationsController < ApplicationController
   # GET /contestnotifications/new
   # GET /contestnotifications/new.json
   def new
-    # @contestnotification = Contestnotification.new
-# 
-    # respond_to do |format|
-      # format.html # new.html.erb
-      # format.json { render json: @contestnotification }
-    # end
-    @contestnotifications = Contestnotifications.new(:contest => @contest, :author => User.current)
-    render :layout => 'base_contest'
+    @contestnotification = Contestnotification.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @contestnotification }
+    end
+    # @contestnotifications = Contestnotifications.new(:contest => @contest, :author => User.current)
+    # render :layout => 'base_contest'
   end
 
   # GET /contestnotifications/1/edit
@@ -151,9 +154,9 @@ class ContestnotificationsController < ApplicationController
   private
 
   def find_optional_contest
-    return true unless params[:contest_id]
-    @contest = Contest.find(params[:contest_id])
-    authorize
+    return true unless params[:id]
+    @contest = Contest.find(params[:id])
+    # authorize
   rescue ActiveRecord::RecordNotFound
     render_404
   end
diff --git a/app/models/contest.rb b/app/models/contest.rb
index 4234f7519..d41506b87 100644
--- a/app/models/contest.rb
+++ b/app/models/contest.rb
@@ -13,7 +13,7 @@ class Contest < ActiveRecord::Base
   has_many :join_in_competitions, foreign_key: 'competition_id', :dependent => :destroy
   has_many :join_in_contests, class_name: 'JoinInCompetition', foreign_key: 'competition_id', :dependent => :destroy
   has_many :praise_tread, as: :praise_tread_object, dependent: :destroy
-  has_many :contestnotification, :dependent => :destroy, :include => :author
+  has_many :contestnotifications, :dependent => :destroy, :include => :author
 
   
 
diff --git a/app/models/contestnotification.rb b/app/models/contestnotification.rb
index 75b0f5814..f6b0fd168 100644
--- a/app/models/contestnotification.rb
+++ b/app/models/contestnotification.rb
@@ -12,9 +12,9 @@ class Contestnotification < ActiveRecord::Base
   validates_length_of :title, :maximum => 60
   validates_length_of :summary, :maximum => 255
 
-  acts_as_attachable :delete_permission => :manage_contestnotification
+  acts_as_attachable :delete_permission => :manage_contestnotifications
   acts_as_searchable :columns => ['title', 'summary', "#{table_name}.description"], :include => :contest
-  acts_as_event :url => Proc.new {|o| {:controller => 'contestnotification', :action => 'show', :id => o.id}}
+  acts_as_event :url => Proc.new {|o| {:controller => 'contestnotifications', :action => 'show', :id => o.id}}
   acts_as_activity_provider :find_options => {:include => [:contest, :author]},
                             :author_key => :author_id
   acts_as_watchable
@@ -24,9 +24,10 @@ class Contestnotification < ActiveRecord::Base
   after_create :act_as_activity
  
   
-  # scope :visible, lambda {|*args|
-    # includes(:contest).where(Contest.allowed_to_condition(args.shift || User.current, :view_news, *args))
-  # }
+  scope :visible, lambda {|*args|
+    nil
+    #includes(:contest).where(Contest.allowed_to_condition(args.shift || User.current, :view_contestnotifications, *args))
+  }
 
   safe_attributes 'title', 'summary', 'description'
 
diff --git a/app/views/contestnotifications/index.html.erb b/app/views/contestnotifications/index.html.erb
index e69de29bb..73adc758c 100644
--- a/app/views/contestnotifications/index.html.erb
+++ b/app/views/contestnotifications/index.html.erb
@@ -0,0 +1,101 @@
+
+
+<!--begin-->
+<%
+     btn_tips = l(:label_news_new)
+     label_tips = l(:label_news)
+%>
+
+<span style="font-size: 16px; border-bottom:1px solid #f0f0f0; margin-right: 15px;">
+	<%= label_tips %>
+</span>
+
+<%= link_to(btn_tips,
+          new_contest_contestnotification_path(@contest),
+          :class => 'icon icon-add',
+          :onclick => 'showAndScrollTo("add-news", "news_title"); return false;') %>
+
+<% if @contest && User.current.allowed_to?(:manage_contestnotifications, @contest) %>
+    <div id="add-news" class="add_frame" style="display:none;">
+      <%= labelled_form_for @contestnotifications, :url => contestnotifications_path(@contest),
+                            :html => {:id => 'news-form', :multipart => true} do |f| %>
+          <%= render :partial => 'contestnotifications/form', :locals => {:f => f} %>
+          <%= submit_tag l(:button_create), :class => 'whiteButton m3p10 h30', :name => nil %><!-- button-submit  --> |
+          <%= preview_link preview_contestnotification_path(:contest_id => @contest), 'news-form', target='preview', {:class => 'whiteButton m3p10'} %>
+          |
+          <%= link_to l(:button_cancel), "#", :onclick => '$("#add-news").hide()', :class => 'whiteButton m3p10' %>
+      <% end if @contest %>
+      <div id="preview" class="wiki"></div>
+    </div>
+<% end %>
+<div>
+  <% if @contestnotificationss.empty? %>
+      <p class="nodata">
+        <%= l(:label_no_data) %>
+      </p>
+  <% else %>
+      <% @contestnotificationss.each do |contestnotifications| %>
+
+          <table class="content-text-list">
+            <tr>
+              <td colspan="2" valign="top" width="50"><%= link_to image_tag(url_to_avatar(contestnotifications.author), :class => "avatar"), user_path(contestnotifications.author) %></td>
+              <td>
+                <table width="580px" border="0">
+
+                  <tr>
+                     <td colspan="2" valign="top">
+                       <strong><%= link_to_user(contestnotifications.author) if contestnotifications.respond_to?(:author) %></strong><span style="margin-left: 4px;" class="font_lighter"><%= l(:label_project_notice) %></span><span><%= link_to h(contestnotifications.title), contestnotification_path(contestnotifications) %></span>
+                         <span style="float: right"><%= delete_link contestnotification_path(contestnotifications) if User.current.allowed_to?(:manage_contestnotification, @contest) %> </span>
+                     </td>
+                  </tr>
+                  <tr>
+                    <td colspan="2" width="580px">
+                      <span class="font_description"><%= textilizable(contestnotifications, :description) %></span></td>
+                  </tr>
+                  <tr>
+                    <td align="left"><span class="font_lighter"> <%= l :label_update_time %>
+                      &nbsp;<%= format_time(contestnotifications.created_at) %></span></td>
+                    <td width="350" align="right" class="a"><%= link_to l(:label_project_newother), contestnotification_path(contestnotifications) %><%= "(#{l(:label_x_comments, :count => contestnotifications.comments_count)})" if contestnotifications.comments_count >= 0 %></td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+          </table>
+      <% end %>
+  <% end %>
+</div>
+<!--end-->
+<div style="padding-right: 10px">
+  <div class="pagination">
+    <ul>
+      <%= pagination_links_full @contestnotifications_pages %>
+    </ul>
+  </div>
+
+  <% other_formats_links do |f| %>
+      <%= f.link_to 'Atom', :url => {:contest_id => @contest, :key => User.current.rss_key} %>
+  <% end %>
+
+  <% content_for :header_tags do %>
+      <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
+      <%= stylesheet_link_tag 'scm' %>
+  <% end %>
+
+  <% html_title(l(:label_news_plural)) -%>
+</div>
+
+<script type='text/javascript'>
+    $(document).ready(function ($) {
+        $('.content-text-list').each(function () {
+            $(this).find('.delete_icon').hide();
+            $(this).mouseenter(function (event) {
+                $(this).find('.delete_icon').show();
+            });
+            $(this).mouseleave(function (event) {
+                $(this).find('.delete_icon').hide();
+            });
+        });
+    });
+</script>
+
+<!--end-->
\ No newline at end of file
diff --git a/app/views/contestnotifications/new.html.erb b/app/views/contestnotifications/new.html.erb
index 6e474b4ea..8b84b9685 100644
--- a/app/views/contestnotifications/new.html.erb
+++ b/app/views/contestnotifications/new.html.erb
@@ -7,10 +7,10 @@
 
 <!-- <h3><%=l(:label_news_new)%></h3> -->
 
-<%= labelled_form_for @contestnotifications, :url => contest_contestnotifications_index_path(@contest),
+<%= labelled_form_for @contestnotifications, :url => contest_contestnotifications_path(@contest),
                                            :html => { :id => 'news-form', :multipart => true } do |f| %>
-  <%= render :partial => 'news/form', :locals => { :f => f } %>
+  <%= render :partial => 'contestnotifications/form', :locals => { :f => f } %>
   <%= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %>
-  <%= preview_link preview_news_path(:contest_id => @contest), 'news-form' ,target='preview',{:class => 'whiteButton m3p10'}%>
+  <%#= preview_link preview_contestnotifications_path(:contest_id => @contest), 'news-form' ,target='preview',{:class => 'whiteButton m3p10'}%>
 <% end %>
 <div id="preview" class="wiki"></div>
diff --git a/app/views/roles/roles_controller.rb b/app/views/roles/roles_controller.rb
new file mode 100644
index 000000000..f4bae1e81
--- /dev/null
+++ b/app/views/roles/roles_controller.rb
@@ -0,0 +1,108 @@
+# Redmine - project management software
+# Copyright (C) 2006-2013  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+class RolesController < ApplicationController
+  layout 'admin'
+
+  before_filter :require_admin, :except => [:index, :show]
+  before_filter :require_admin_or_api_request, :only => [:index, :show]
+  before_filter :find_role, :only => [:show, :edit, :update, :destroy]
+  accept_api_auth :index, :show
+
+  def index
+    respond_to do |format|
+      format.html {
+        @role_pages, @roles = paginate Role.sorted, :per_page => 25
+        render :action => "index", :layout => false if request.xhr?
+      }
+      format.api {
+        @roles = Role.givable.all
+      }
+    end
+  end
+
+  def show
+    respond_to do |format|
+      format.api
+    end
+  end
+
+  def new
+    # Prefills the form with 'Non member' role permissions by default
+    @role = Role.new(params[:role] || {:permissions => Role.non_member.permissions})
+    if params[:copy].present? && @copy_from = Role.find_by_id(params[:copy])
+      @role.copy_from(@copy_from)
+    end
+    @roles = Role.sorted.all
+  end
+
+  def create
+    @role = Role.new(params[:role])
+    if request.post? && @role.save
+      # workflow copy
+      if !params[:copy_workflow_from].blank? && (copy_from = Role.find_by_id(params[:copy_workflow_from]))
+        @role.workflow_rules.copy(copy_from)
+      end
+      flash[:notice] = l(:notice_successful_create)
+      redirect_to roles_path
+    else
+      @roles = Role.sorted.all
+      render :action => 'new'
+    end
+  end
+
+  def edit
+  end
+
+  def update
+    if request.put? and @role.update_attributes(params[:role])
+      flash[:notice] = l(:notice_successful_update)
+      redirect_to roles_path
+    else
+      render :action => 'edit'
+    end
+  end
+
+  def destroy
+    @role.destroy
+    redirect_to roles_path
+  rescue
+    flash[:error] =  l(:error_can_not_remove_role)
+    redirect_to roles_path
+  end
+
+  def permissions
+    @roles = Role.sorted.all
+    @permissions = Redmine::AccessControl.permissions.select { |p| !p.public? }
+    if request.post?
+      @roles.each do |role|
+        role.permissions = params[:permissions][role.id.to_s]
+        role.save
+      end
+      flash[:notice] = l(:notice_successful_update)
+      redirect_to roles_path
+    end
+  end
+
+  private
+
+  def find_role
+    @role = Role.find(params[:id])
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+end
diff --git a/config/routes.rb b/config/routes.rb
index c6a727ca6..6876f1af9 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -16,17 +16,16 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 RedmineApp::Application.routes.draw do
-  resources :contestnotifications
+  
   
   match '/contests/:id/contestnotifications', :controller => 'contestnotifications', :action => 'index'
 
   resources :homework_users
 
-
   resources :no_uses
   delete 'no_uses', :to => 'no_uses#delete'
 
-   resources :apply_project_masters
+  resources :apply_project_masters
   delete 'apply_project_masters', :to => 'apply_project_masters#delete'
 
   resources :homework_attach do
@@ -79,6 +78,7 @@ RedmineApp::Application.routes.draw do
       match 'new_join'           , via: :post
       match 'new'                , via: :post
     end
+    resources :contestnotifications 
     member do
       match 'add_softapplication'
       match 'update_contest'             , via: [:put]
@@ -95,7 +95,8 @@ RedmineApp::Application.routes.draw do
       match 'create'                     , via: :post
       match 'settings'                   , via: [:get, :post]
 
-    end   
+    end
+      
   end  
   
   resources :stores do

From 9d783a7caa0a84681190c5163908da9228b946e7 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Tue, 3 Jun 2014 21:52:16 +0800
Subject: [PATCH 08/62] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AB=9E=E8=B5=9B?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E7=AD=89tab-menu=E7=9A=84=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contestnotifications_controller.rb        | 102 ++++---
 app/views/contestnotifications/_form.html.erb |  55 ----
 app/views/contestnotifications/index.html.erb |   4 -
 app/views/contestnotifications/new.html.erb   |  18 +-
 app/views/layouts/base_newcontest.html.erb    |  41 +--
 config/routes.rb                              |   9 +-
 db/schema.rb                                  | 271 +++++++++++++-----
 public/stylesheets/application.css            |   4 +
 8 files changed, 282 insertions(+), 222 deletions(-)

diff --git a/app/controllers/contestnotifications_controller.rb b/app/controllers/contestnotifications_controller.rb
index 675efd7f0..f2c0fb80f 100644
--- a/app/controllers/contestnotifications_controller.rb
+++ b/app/controllers/contestnotifications_controller.rb
@@ -4,31 +4,41 @@ class ContestnotificationsController < ApplicationController
   layout 'base_newcontest'
   default_search_scope :contestnotifications
   # model_object Contestnotifications
-  before_filter :find_model_object_contest, :except => [:new, :create, :index]
-  before_filter :find_contest_from_association, :except => [:new, :create, :index]
-  before_filter :find_contest_by_contest_id, :only => [:new, :create]
-  before_filter :authorize, :except => [:index]
+  # before_filter :find_model_object_contest, :except => [:new, :create, :index]
+  # before_filter :find_contest_from_association, :except => [:new, :create, :index]
+  # before_filter :find_contest_by_contest_id, :only => [:new, :create]
+  before_filter :find_contest
+  before_filter :find_author
+  # before_filter :authorize, :except => [:index]
   before_filter :find_optional_contest, :only => [:index]
   accept_rss_auth :index
-  accept_api_auth :index  
-  
+  accept_api_auth :index
 
-  
-  def index
+  def find_author
     @user = @contest.author
+    render_404 if @user.nil?
+  end
+  def find_contest
+    @contest = Contest.find(params[:contest_id])
+    render_404 if @contest.nil?
+  end
+
+
+  def index
+  
     # @contestnotifications = Contestnotification.all
-# 
+    #
     # respond_to do |format|
-      # format.html # index.html.erb
-      # format.json { render json: @contestnotifications }
+    # format.html # index.html.erb
+    # format.json { render json: @contestnotifications }
     # end
-    
+
     ### begin ###
     case params[:format]
-    when 'xml', 'json'
-      @offset, @limit = api_offset_and_limit
-    else
-      @limit =  10
+      when 'xml', 'json'
+        @offset, @limit = api_offset_and_limit
+      else
+        @limit = 10
     end
 
     scope = @contest ? @contest.contestnotifications.visible : Contestnotification.visible
@@ -39,8 +49,8 @@ class ContestnotificationsController < ApplicationController
     @contestnotificationss = scope.all(:include => [:author, :contest],
                                        :order => "#{Contestnotification.table_name}.created_at DESC",
                                        :offset => @offset,
-                                       :limit => @limit)  
-                                      
+                                       :limit => @limit)
+
     respond_to do |format|
       format.html {
         @contestnotification = Contestnotification.new # for adding news inline
@@ -49,20 +59,20 @@ class ContestnotificationsController < ApplicationController
       format.api
       format.atom { render_feed(@contestnotificationss, :title => (@contest ? @contest.name : Setting.app_title) + ": #{l(:label_contest_notification)}") }
     end
-  ### end ###
+    ### end ###
   end
 
   # GET /contestnotifications/1
   # GET /contestnotifications/1.json
   def show
     # @contestnotification = Contestnotification.find(params[:id])
-# 
+    #
     # respond_to do |format|
-      # format.html # show.html.erb
-      # format.json { render json: @contestnotification }
+    # format.html # show.html.erb
+    # format.json { render json: @contestnotification }
     # end
     @comments = @contestnotifications.comments
-    @comments.reverse! if User.current.wants_comments_in_reverse_order?    
+    @comments.reverse! if User.current.wants_comments_in_reverse_order?
     render :layout => 'base_newcontest'
 
   end
@@ -89,17 +99,17 @@ class ContestnotificationsController < ApplicationController
   # POST /contestnotifications.json
   def create
     # @contestnotification = Contestnotification.new(params[:contestnotification])
-# 
+    #
     # respond_to do |format|
-      # if @contestnotification.save
-        # format.html { redirect_to @contestnotification, notice: 'Contestnotification was successfully created.' }
-        # format.json { render json: @contestnotification, status: :created, location: @contestnotification }
-      # else
-        # format.html { render action: "new" }
-        # format.json { render json: @contestnotification.errors, status: :unprocessable_entity }
-      # end
+    # if @contestnotification.save
+    # format.html { redirect_to @contestnotification, notice: 'Contestnotification was successfully created.' }
+    # format.json { render json: @contestnotification, status: :created, location: @contestnotification }
+    # else
+    # format.html { render action: "new" }
+    # format.json { render json: @contestnotification.errors, status: :unprocessable_entity }
     # end
-    @contestnotifications = Contestnotifications.new(:contest => @contest, :author => User.current) 
+    # end
+    @contestnotifications = Contestnotifications.new(:contest => @contest, :author => User.current)
     @contestnotifications.safe_attributes = params[:contestnotifications]
     @news.save_attachments(params[:attachments])
     if @contestnotifications.save
@@ -107,7 +117,7 @@ class ContestnotificationsController < ApplicationController
       flash[:notice] = l(:notice_successful_create)
       redirect_to project_news_index_path(@contest)
     else
-      layout_file = 'base_contest' 
+      layout_file = 'base_contest'
       render :action => 'new', :layout => layout_file
     end
   end
@@ -116,15 +126,15 @@ class ContestnotificationsController < ApplicationController
   # PUT /contestnotifications/1.json
   def update
     # @contestnotification = Contestnotification.find(params[:id])
-# 
+    #
     # respond_to do |format|
-      # if @contestnotification.update_attributes(params[:contestnotification])
-        # format.html { redirect_to @contestnotification, notice: 'Contestnotification was successfully updated.' }
-        # format.json { head :no_content }
-      # else
-        # format.html { render action: "edit" }
-        # format.json { render json: @contestnotification.errors, status: :unprocessable_entity }
-      # end
+    # if @contestnotification.update_attributes(params[:contestnotification])
+    # format.html { redirect_to @contestnotification, notice: 'Contestnotification was successfully updated.' }
+    # format.json { head :no_content }
+    # else
+    # format.html { render action: "edit" }
+    # format.json { render json: @contestnotification.errors, status: :unprocessable_entity }
+    # end
     # end
     @contestnotifications.safe_attributes = params[:contestnotifications]
     @contestnotifications.save_attachments(params[:attachments])
@@ -142,10 +152,10 @@ class ContestnotificationsController < ApplicationController
   def destroy
     # @contestnotification = Contestnotification.find(params[:id])
     # @contestnotification.destroy
-# 
+    #
     # respond_to do |format|
-      # format.html { redirect_to contestnotifications_url }
-      # format.json { head :no_content }
+    # format.html { redirect_to contestnotifications_url }
+    # format.json { head :no_content }
     # end
     @contestnotifications.destroy
     redirect_to contest_contestnotification_index_path(@contest)
@@ -156,9 +166,9 @@ class ContestnotificationsController < ApplicationController
   def find_optional_contest
     return true unless params[:id]
     @contest = Contest.find(params[:id])
-    # authorize
+      # authorize
   rescue ActiveRecord::RecordNotFound
     render_404
   end
- 
+
 end
diff --git a/app/views/contestnotifications/_form.html.erb b/app/views/contestnotifications/_form.html.erb
index 6904714d6..e69de29bb 100644
--- a/app/views/contestnotifications/_form.html.erb
+++ b/app/views/contestnotifications/_form.html.erb
@@ -1,55 +0,0 @@
-<!-- <%= form_for(@contestnotification) do |f| %>
-  <% if @contestnotification.errors.any? %>
-    <div id="error_explanation">
-      <h2><%= pluralize(@contestnotification.errors.count, "error") %> prohibited this contestnotification from being saved:</h2>
-
-      <ul>
-      <% @contestnotification.errors.full_messages.each do |msg| %>
-        <li><%= msg %></li>
-      <% end %>
-      </ul>
-    </div>
-  <% end %>
-
-  <div class="field">
-    <%= f.label :contest_id %><br />
-    <%= f.number_field :contest_id %>
-  </div>
-  <div class="field">
-    <%= f.label :title %><br />
-    <%= f.text_field :title %>
-  </div>
-  <div class="field">
-    <%= f.label :summary %><br />
-    <%= f.text_field :summary %>
-  </div>
-  <div class="field">
-    <%= f.label :description %><br />
-    <%= f.text_field :description %>
-  </div>
-  <div class="field">
-    <%= f.label :author_id %><br />
-    <%= f.number_field :author_id %>
-  </div>
-  <div class="field">
-    <%= f.label :comments_count %><br />
-    <%= f.number_field :comments_count %>
-  </div>
-  <div class="actions">
-    <%= f.submit %>
-  </div>
-<% end %> -->
-
-
-<%= error_messages_for @contestnotifications %>
-<div class="add_frame_header" >
-	<% str =l(:label_news_new) %>
-</div>
-<div class="box tabular">
-<p><%= f.text_field :title, :required => true, :size => 60, :style => "width:488px;" %></p>
-<!-- <p style="margin-left:-10px;"><%= f.text_area :summary, :cols => 60, :rows => 2, :style => "width:490px;margin-left:10px;" %></p> -->
-<p><%= f.text_area :description, :required => true, :cols => 60, :rows => 11, :class => 'wiki-edit', :style => "width:490px;" %></p>
-<p id="attachments_form" style="margin-left:-10px;"><label style="padding-right: 15px;"><%= l(:label_attachment_plural) %></label><%= render :partial => 'attachments/form', :locals => {:container => @contestnotifications} %></p>
-</div>
-
-<%= wikitoolbar_for 'news_description' %>
diff --git a/app/views/contestnotifications/index.html.erb b/app/views/contestnotifications/index.html.erb
index 73adc758c..090b72a36 100644
--- a/app/views/contestnotifications/index.html.erb
+++ b/app/views/contestnotifications/index.html.erb
@@ -72,10 +72,6 @@
     </ul>
   </div>
 
-  <% other_formats_links do |f| %>
-      <%= f.link_to 'Atom', :url => {:contest_id => @contest, :key => User.current.rss_key} %>
-  <% end %>
-
   <% content_for :header_tags do %>
       <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
       <%= stylesheet_link_tag 'scm' %>
diff --git a/app/views/contestnotifications/new.html.erb b/app/views/contestnotifications/new.html.erb
index 8b84b9685..2ad240014 100644
--- a/app/views/contestnotifications/new.html.erb
+++ b/app/views/contestnotifications/new.html.erb
@@ -1,16 +1,6 @@
-<!-- <h1>New contestnotification</h1>
 
-<%= render 'form' %>
-
-<%= link_to 'Back', contestnotifications_path %> -->
-
-
-<!-- <h3><%=l(:label_news_new)%></h3> -->
-
-<%= labelled_form_for @contestnotifications, :url => contest_contestnotifications_path(@contest),
-                                           :html => { :id => 'news-form', :multipart => true } do |f| %>
-  <%= render :partial => 'contestnotifications/form', :locals => { :f => f } %>
-  <%= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %>
-  <%#= preview_link preview_contestnotifications_path(:contest_id => @contest), 'news-form' ,target='preview',{:class => 'whiteButton m3p10'}%>
-<% end %>
+<%#= labelled_form_for @contestnotifications, :url => contest_contestnotifications_path(@contest), :html => { :id => 'news-form', :multipart => true } do |f| %>
+  <%#= render :partial => 'contestnotifications/form', :locals => { :f => f } %>
+  <%#= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %>
+<%# end %>
 <div id="preview" class="wiki"></div>
diff --git a/app/views/layouts/base_newcontest.html.erb b/app/views/layouts/base_newcontest.html.erb
index e621f2f8b..0ac197348 100644
--- a/app/views/layouts/base_newcontest.html.erb
+++ b/app/views/layouts/base_newcontest.html.erb
@@ -43,7 +43,7 @@
 											<td style="padding-left: 8px"><%=link_to request.host()+"/contests", :controller=>'contests', :action=>'index' %></td>
 			                        		<td ><%=link_to l(:field_homepage), home_path %> > 
 			                        			<%=link_to l(:label_contest_innovate), :controller=>'contests', :action=>'index' %> > 
-			                        			<span><%= link_to @contest.name, show_contest_contest_path %></span>
+			                        			<span><%= link_to @contest.name, show_contest_contest_path(@contest) %></span>
 			                        		</td>
 										</tr>
 									</table>
@@ -95,21 +95,17 @@
 			                 <!-- 参与人和参与项目的数量显示   -->
 								<div class="user_fans">									
 									<table width="240" border="0">
-										<tr align="center" width="80px">										                          
-											<!-- <td class="font_index">
-												<%=link_to "#{@contest.join_in_competitions.count}",:controller => "contests",:action => "show_participator" %>
-											</td> -->	
+										<tr align="center" width="80px">										
 											<!--关注人数-->										
 											<td class="font_index">
-												<!-- <%=link_to "#{@contest.projects.where('is_public=1').count}", :controller => 'contests', :action => 'show_project' %> -->
-												<%=link_to "#{@contest.watcher_users.count}", :controller => 'contests', :action => 'show_project' %>
+												<%=link_to "#{@contest.watcher_users.count}",show_project_contest_path(@contest) %>
 											</td>
 											<!--参赛作品数量-->	
 											<td class="font_index"> 
 												<% if @contest.id == 2 or @contest.id == 3 or @contest.id == 6 %>
 													<%=link_to "#{@contest.projects.where('is_public=1').count}" %>
 												<% else %>
-													<%=link_to "#{@contest.contesting_softapplications.count}", :controller => 'contests', :action => 'show_attendingcontest' %>
+													<%=link_to "#{@contest.contesting_softapplications.count}",show_attendingcontest_contest_path(@contest) %>
 												<% end %>
 											</td>	
 											
@@ -127,7 +123,7 @@
 								<div class="inf_user_image">
 									   <table>
 											<tr>
-												<td><%= l(:lable_contest_user) %><%= link_to(@user.show_name, user_path(@user))%></td>
+												<td><%= l(:lable_contest_user) %><%= link_to(@user.name, user_path(@user))%></td>
 											</tr>			
 											<tr>									
 												<td><%= l(:label_bids_reward_method) %><%= @contest.budget%></td>														
@@ -210,25 +206,7 @@
 
 							
 							<div class="user_underline"></div>
-									<!--参与者-->
-									<!-- <div class="user_fans">
-										<div class="font_title_left">
-											<strong><%= l(:label_participate) %></strong>
-											<% if show_more_participate?(@contest) %>
-											<span  style="font-size: 12px; display: inline; float: right;" >
-												<%= link_to l(:label_more), :controller => "contests", :action => "show_participator"%>
-
-											</span>
-											<% end %>
-										</div>
-										<div class="left_wf">
-											<table>
-												<tr>
-													<td style="padding-top: 5px"> <%= show_participate_picture(@contest) %> </td>
-												</tr>
-											</table>
-										</div>
-									</div> -->
+								
 								<div class="user_underline"></div>	
 						    </div>
 						
@@ -236,7 +214,12 @@
 						<div id="content">
 							<% if display_main_menu?(@contest) %>
 							<div class="tabs_new">
-								<%= render_menu :contest_menu %>
+								<%#= render_menu :contest_menu %>
+								<ul>								
+									<li><a><%= link_to l(:label_user_response), show_contest_contest_path(@contest)%></a></li>
+									<li><a><%= link_to l(:label_attending_contest), show_attendingcontest_contest_path(@contest)%></a></li>
+									<li><a><%= link_to l(:label_contest_notification),  contest_contestnotifications_path(@contest)%></a></li>
+								</ul>								
 							</div>
 							<% end %>
 						
diff --git a/config/routes.rb b/config/routes.rb
index dcf5609b7..1c707bdb0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -18,8 +18,8 @@
 RedmineApp::Application.routes.draw do
   
   
-  match '/contests/:id/contestnotifications', :controller => 'contestnotifications', :action => 'index'
-
+  #match '/contests/:id/contestnotifications', :controller => 'contestnotifications', :action => 'index'
+
   resources :homework_users
 
   resources :no_uses
@@ -72,6 +72,7 @@ RedmineApp::Application.routes.draw do
 
   ## new added by linchun #新竞赛相关
   resources :contests, only: [:index] do
+    resources :contestnotifications#, except: [:index]
     collection do
       match 'new_contest'        , via: :get
       match 'join_in_contest'    , via: :post
@@ -80,11 +81,11 @@ RedmineApp::Application.routes.draw do
       match 'new_join'           , via: :post
       match 'new'                , via: :post
     end
-    resources :contestnotifications 
     member do
+      delete 'destroy_contest'
       match 'add_softapplication'
       match 'update_contest'             , via: [:put]
-      match 'show_contest'               , via: :get
+      match 'show_contest'               , via: [:get, :post]
       match 'show_project'               , via: :get
       match 'show_softapplication'       , via: :get
       match 'show_attendingcontest'      , via: :get
diff --git a/db/schema.rb b/db/schema.rb
index 1123adad2..0e8337b94 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -23,16 +23,6 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
   add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type"
   add_index "activities", ["user_id"], :name => "index_activities_on_user_id"
 
-  create_table "andoidcontests", :force => true do |t|
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "applied_projects", :force => true do |t|
-    t.integer "project_id", :null => false
-    t.integer "user_id",    :null => false
-  end
-
   create_table "apply_project_masters", :force => true do |t|
     t.integer  "user_id"
     t.string   "apply_type"
@@ -55,18 +45,12 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
     t.datetime "created_on"
     t.string   "description"
     t.string   "disk_directory"
-    t.integer  "attachtype",                   :default => 1
   end
 
   add_index "attachments", ["author_id"], :name => "index_attachments_on_author_id"
   add_index "attachments", ["container_id", "container_type"], :name => "index_attachments_on_container_id_and_container_type"
   add_index "attachments", ["created_on"], :name => "index_attachments_on_created_on"
 
-  create_table "attachmentstypes", :force => true do |t|
-    t.integer "typeId",                 :null => false
-    t.string  "typeName", :limit => 50
-  end
-
   create_table "auth_sources", :force => true do |t|
     t.string  "type",              :limit => 30, :default => "",    :null => false
     t.string  "name",              :limit => 60, :default => "",    :null => false
@@ -87,6 +71,20 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
 
   add_index "auth_sources", ["id", "type"], :name => "index_auth_sources_on_id_and_type"
 
+  create_table "bak_mentioned", :primary_key => "Id", :force => true do |t|
+    t.string  "this_real_name",  :limit => 1000
+    t.integer "is_mentioned_in"
+    t.string  "context",         :limit => 2000
+  end
+
+  add_index "bak_mentioned", ["this_real_name", "is_mentioned_in"], :name => "name_mention", :length => {"this_real_name"=>900, "is_mentioned_in"=>nil}
+  add_index "bak_mentioned", ["this_real_name"], :name => "this_real_name"
+  add_index "bak_mentioned", ["this_real_name"], :name => "this_real_name_2"
+  add_index "bak_mentioned", ["this_real_name"], :name => "this_real_name_3", :length => {"this_real_name"=>900}
+  add_index "bak_mentioned", ["this_real_name"], :name => "this_real_name_4"
+  add_index "bak_mentioned", ["this_real_name"], :name => "this_real_name_5"
+  add_index "bak_mentioned", ["this_real_name"], :name => "this_real_name_6"
+
   create_table "biding_projects", :force => true do |t|
     t.integer  "project_id"
     t.integer  "bid_id"
@@ -126,12 +124,9 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
   add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id"
   add_index "boards", ["project_id"], :name => "boards_project_id"
 
-  create_table "bug_to_osps", :force => true do |t|
-    t.integer  "osp_id"
-    t.integer  "relative_memo_id"
-    t.string   "description"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
+  create_table "categories", :primary_key => "Id", :force => true do |t|
+    t.integer "proj_id",         :default => 0, :null => false
+    t.text    "proj_categories"
   end
 
   create_table "changes", :force => true do |t|
@@ -309,6 +304,14 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
   add_index "documents", ["created_on"], :name => "index_documents_on_created_on"
   add_index "documents", ["project_id"], :name => "documents_project_id"
 
+  create_table "eco_projects", :force => true do |t|
+    t.integer  "proj_id",        :default => 0, :null => false
+    t.integer  "eco_proj_id"
+    t.datetime "date_collected"
+  end
+
+  add_index "eco_projects", ["proj_id"], :name => "proj_id"
+
   create_table "enabled_modules", :force => true do |t|
     t.integer "project_id"
     t.string  "name",       :null => false
@@ -330,6 +333,137 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
   add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type"
   add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id"
 
+  create_table "events", :primary_key => "event_id", :force => true do |t|
+    t.string   "job_name"
+    t.datetime "event_time"
+    t.string   "event_type", :limit => 20
+  end
+
+  create_table "fm_article", :force => true do |t|
+    t.integer  "proj_id",                            :default => 0, :null => false
+    t.text     "article_title",  :limit => 16777215
+    t.text     "article_link",   :limit => 16777215
+    t.text     "article_time",   :limit => 16777215
+    t.datetime "date_collected"
+  end
+
+  add_index "fm_article", ["proj_id"], :name => "proj_id"
+
+  create_table "fm_bugtracker_link", :force => true do |t|
+    t.integer  "proj_id",                            :default => 0, :null => false
+    t.text     "description",    :limit => 16777215
+    t.datetime "date_collected"
+  end
+
+  add_index "fm_bugtracker_link", ["proj_id"], :name => "proj_id"
+
+  create_table "fm_datametric_link", :force => true do |t|
+    t.integer  "proj_id",                            :default => 0, :null => false
+    t.text     "description",    :limit => 16777215
+    t.datetime "date_collected"
+  end
+
+  add_index "fm_datametric_link", ["proj_id"], :name => "proj_id"
+
+  create_table "fm_dependency_link", :force => true do |t|
+    t.integer  "proj_id",                            :default => 0, :null => false
+    t.text     "description",    :limit => 16777215
+    t.datetime "date_collected"
+  end
+
+  add_index "fm_dependency_link", ["proj_id"], :name => "proj_id"
+
+  create_table "fm_download_link", :force => true do |t|
+    t.integer  "proj_id",                            :default => 0, :null => false
+    t.text     "download_link",  :limit => 16777215
+    t.datetime "date_collected"
+  end
+
+  add_index "fm_download_link", ["proj_id"], :name => "proj_id"
+
+  create_table "fm_heartbeat", :force => true do |t|
+    t.integer  "proj_id",                        :default => 0, :null => false
+    t.float    "popularity_score", :limit => 12
+    t.float    "vitality_score",   :limit => 12
+    t.integer  "subscription"
+    t.integer  "voting_score"
+    t.integer  "voting_count"
+    t.datetime "date_collected"
+  end
+
+  add_index "fm_heartbeat", ["proj_id"], :name => "proj_id"
+
+  create_table "fm_license", :force => true do |t|
+    t.integer  "proj_id",                            :default => 0, :null => false
+    t.text     "description",    :limit => 16777215
+    t.datetime "date_collected"
+  end
+
+  add_index "fm_license", ["proj_id"], :name => "proj_id"
+
+  create_table "fm_mailinglist_link", :force => true do |t|
+    t.integer  "proj_id",                            :default => 0, :null => false
+    t.text     "description",    :limit => 16777215
+    t.datetime "date_collected"
+  end
+
+  add_index "fm_mailinglist_link", ["proj_id"], :name => "proj_id"
+
+  create_table "fm_operating_system", :force => true do |t|
+    t.integer  "proj_id",                            :default => 0, :null => false
+    t.text     "description",    :limit => 16777215
+    t.datetime "date_collected"
+  end
+
+  add_index "fm_operating_system", ["proj_id"], :name => "proj_id"
+
+  create_table "fm_programming_language", :force => true do |t|
+    t.integer  "proj_id",                            :default => 0, :null => false
+    t.text     "description",    :limit => 16777215
+    t.datetime "date_collected"
+  end
+
+  add_index "fm_programming_language", ["proj_id"], :name => "proj_id"
+
+  create_table "fm_project_spotlight", :force => true do |t|
+    t.integer  "proj_id",                                    :default => 0, :null => false
+    t.text     "description",            :limit => 16777215
+    t.text     "project_name",           :limit => 16777215
+    t.text     "project_spotlight_link", :limit => 16777215
+    t.datetime "date_collected"
+  end
+
+  add_index "fm_project_spotlight", ["proj_id"], :name => "proj_id"
+
+  create_table "fm_release", :force => true do |t|
+    t.integer  "proj_id",                             :default => 0, :null => false
+    t.text     "description",     :limit => 16777215
+    t.text     "release_version", :limit => 16777215
+    t.text     "release_time",    :limit => 16777215
+    t.text     "release_tag",     :limit => 16777215
+    t.datetime "date_collected"
+  end
+
+  add_index "fm_release", ["proj_id"], :name => "proj_id"
+
+  create_table "fm_submit", :force => true do |t|
+    t.integer  "proj_id",                            :default => 0, :null => false
+    t.text     "submitter",      :limit => 16777215
+    t.text     "submitter_link", :limit => 16777215
+    t.text     "submit_time",    :limit => 16777215
+    t.datetime "date_collected"
+  end
+
+  add_index "fm_submit", ["proj_id"], :name => "proj_id"
+
+  create_table "fm_summary", :force => true do |t|
+    t.integer  "proj_id",                            :default => 0, :null => false
+    t.text     "description",    :limit => 16777215
+    t.datetime "date_collected"
+  end
+
+  add_index "fm_summary", ["proj_id"], :name => "proj_id"
+
   create_table "forums", :force => true do |t|
     t.string   "name",                         :null => false
     t.string   "description",  :default => ""
@@ -351,12 +485,9 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
   create_table "homework_attaches", :force => true do |t|
     t.integer  "bid_id"
     t.integer  "user_id"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
     t.string   "reward"
-    t.string   "name"
-    t.string   "description"
-    t.integer  "state"
   end
 
   create_table "homework_for_courses", :force => true do |t|
@@ -364,13 +495,6 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
     t.integer "bid_id"
   end
 
-  create_table "homework_users", :force => true do |t|
-    t.string   "homework_attach_id"
-    t.string   "user_id"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
   create_table "issue_categories", :force => true do |t|
     t.integer "project_id",                   :default => 0,  :null => false
     t.string  "name",           :limit => 30, :default => "", :null => false
@@ -580,6 +704,14 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
     t.datetime "updated_at",  :null => false
   end
 
+  create_table "ohloh_tagged", :force => true do |t|
+    t.integer  "proj_id",                       :default => 0, :null => false
+    t.string   "description",    :limit => 100,                :null => false
+    t.datetime "date_collected"
+  end
+
+  add_index "ohloh_tagged", ["proj_id"], :name => "proj_id"
+
   create_table "open_id_authentication_associations", :force => true do |t|
     t.integer "issued"
     t.integer "lifetime"
@@ -603,7 +735,7 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
     t.integer  "users_count",      :default => 0
     t.date     "last_commit_time"
     t.string   "url"
-    t.date     "date_collected"
+    t.datetime "date_collected"
     t.datetime "created_at",                      :null => false
     t.datetime "updated_at",                      :null => false
   end
@@ -644,14 +776,6 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
 
   add_index "project_statuses", ["grade"], :name => "index_project_statuses_on_grade"
 
-  create_table "projecting_softapplictions", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "softapplication_id"
-    t.integer  "project_id"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-  end
-
   create_table "projects", :force => true do |t|
     t.string   "name",            :default => "",    :null => false
     t.text     "description"
@@ -667,8 +791,6 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
     t.boolean  "inherit_members", :default => false, :null => false
     t.integer  "project_type"
     t.boolean  "hidden_repo",     :default => false, :null => false
-    t.integer  "user_id"
-    t.integer  "attachmenttype",  :default => 1
   end
 
   add_index "projects", ["lft"], :name => "index_projects_on_lft"
@@ -697,13 +819,6 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
   add_index "queries", ["project_id"], :name => "index_queries_on_project_id"
   add_index "queries", ["user_id"], :name => "index_queries_on_user_id"
 
-  create_table "relative_memo_to_open_source_projects", :force => true do |t|
-    t.integer  "osp_id"
-    t.integer  "relative_memo_id"
-    t.datetime "created_at",       :null => false
-    t.datetime "updated_at",       :null => false
-  end
-
   create_table "relative_memos", :force => true do |t|
     t.integer  "osp_id",                                :null => false
     t.integer  "parent_id"
@@ -720,10 +835,6 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
     t.integer  "viewed_count_crawl", :default => 0
     t.integer  "viewed_count_local", :default => 0
     t.string   "url"
-    t.string   "username"
-    t.string   "userhomeurl"
-    t.date     "date_collected"
-    t.string   "topic_resource"
   end
 
   create_table "repositories", :force => true do |t|
@@ -756,7 +867,6 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
     t.string   "province"
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
-    t.string   "logo_link"
   end
 
   create_table "seems_rateable_cached_ratings", :force => true do |t|
@@ -812,9 +922,6 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
     t.integer  "softapplication_id"
     t.integer  "is_public"
     t.string   "application_developers"
-    t.string   "deposit_project_url"
-    t.string   "deposit_project"
-    t.integer  "project_id"
   end
 
   create_table "students_for_courses", :force => true do |t|
@@ -824,6 +931,14 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
     t.datetime "updated_at", :null => false
   end
 
+  create_table "t_project_to_os_projects", :force => true do |t|
+    t.integer  "crawl_proj_id"
+    t.string   "crawl_proj_web"
+    t.integer  "trustie_osp_id"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
+  end
+
   create_table "taggings", :force => true do |t|
     t.integer  "tag_id"
     t.integer  "taggable_id"
@@ -882,6 +997,22 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
   add_index "tokens", ["user_id"], :name => "index_tokens_on_user_id"
   add_index "tokens", ["value"], :name => "tokens_value", :unique => true
 
+  create_table "tprojects", :force => true do |t|
+    t.string   "name",             :limit => 1000,     :default => "0"
+    t.text     "description",      :limit => 16777215
+    t.string   "commit_count",     :limit => 100,      :default => "0"
+    t.string   "code_line",        :limit => 100
+    t.string   "last_commit_time", :limit => 100
+    t.string   "url",              :limit => 1000
+    t.datetime "date_collected"
+    t.string   "created_at",       :limit => 100
+    t.string   "updated_at",       :limit => 100
+    t.integer  "proj_id",                                               :null => false
+    t.string   "user_count",       :limit => 100
+  end
+
+  add_index "tprojects", ["proj_id"], :name => "proj_id"
+
   create_table "trackers", :force => true do |t|
     t.string  "name",          :limit => 30, :default => "",    :null => false
     t.boolean "is_in_chlog",                 :default => false, :null => false
@@ -922,11 +1053,6 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
   add_index "user_grades", ["project_id"], :name => "index_user_grades_on_project_id"
   add_index "user_grades", ["user_id"], :name => "index_user_grades_on_user_id"
 
-  create_table "user_levels", :force => true do |t|
-    t.integer "user_id"
-    t.integer "level"
-  end
-
   create_table "user_preferences", :force => true do |t|
     t.integer "user_id",   :default => 0,     :null => false
     t.text    "others"
@@ -937,11 +1063,16 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
   add_index "user_preferences", ["user_id"], :name => "index_user_preferences_on_user_id"
 
   create_table "user_scores", :force => true do |t|
-    t.integer "user_id"
-    t.integer "collaboration"
-    t.integer "influence"
-    t.integer "skill"
-    t.integer "activity"
+    t.integer  "user_id",       :null => false
+    t.integer  "collaboration"
+    t.integer  "influence"
+    t.integer  "skill"
+    t.integer  "active"
+    t.datetime "created_at",    :null => false
+    t.datetime "updated_at",    :null => false
+    t.integer  "level"
+    t.integer  "file"
+    t.integer  "issue"
   end
 
   create_table "user_statuses", :force => true do |t|
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 977aef8fe..ba077555a 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -2072,6 +2072,7 @@ button.tab-left, button.tab-right {
   padding:4px;
   width: 20px;
   bottom: -1px;
+
 }
 
 button.tab-left {
@@ -2115,6 +2116,9 @@ button.tab-right {
   font-weight:bold;
   border-top-left-radius:4px;
   border-top-right-radius:4px;
+  /*new added*/
+  margin-top: 16px;
+  /*end*/
 }
 
 #content .tabs_new ul li a:hover {

From b5be2d58ceae241d51d1bb64deff981f66e087ec Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Wed, 4 Jun 2014 09:35:39 +0800
Subject: [PATCH 09/62] =?UTF-8?q?=E8=8B=B1=E6=96=87=E5=AD=90=E7=AB=99?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/welcome/contest.html.erb | 30 +++++++++++++++---------------
 config/locales/en.yml              | 18 +++++++++++++++++-
 config/locales/zh.yml              | 12 ++++++++++++
 3 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb
index e6c3ab1f5..6e0d6e919 100644
--- a/app/views/welcome/contest.html.erb
+++ b/app/views/welcome/contest.html.erb
@@ -118,13 +118,13 @@
 		</div>	
 	<div class="welcome_left" id="welcome_left">
 
-			<span class="font_welcome_trustie"><%= l(:label_welcome_trustie) %><%= l(:label_welcome_trustie_contest) %></span> <span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_contest_description) %></span>
+			<span class="font_welcome_trustie"><%= l(:label_welcome_trustie) %>&nbsp;<%= l(:label_welcome_trustie_contest) %></span> <span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_contest_description) %></span>
 	</div>
 
 <!--搜索框-->	
 	<div id="J_Slide" class="d-p-index-box d-p-index-hotproject" style="float: right;">		
 		<%= form_tag({controller: 'contests', action: 'index'}, method: :get) do %>	
-			<%= text_field_tag 'name', params[:name], placeholder:'请输入要搜索的关键字', name: "name", :class => 'blueinputbar', :style => 'width:240px; padding-right:50px;'%>
+			<%= text_field_tag 'name', params[:name], placeholder:<%=l(:label_searching_intimation)%>, name: "name", :class => 'blueinputbar', :style => 'width:240px; padding-right:50px;'%>
 			&nbsp;
 			<%= hidden_field_tag 'project_type', params[:project_type] %>
 			<%= submit_tag l(:label_search), :class => "enterprise" , :name => nil%>
@@ -139,8 +139,8 @@
 
 
 <div id="J_Slide" class="d-p-index-box d-p-index-hotproject">
-<h3 style="margin-left: 5px; color: #e8770d;"><strong>最新热门竞赛</strong></h3>
-	<span style="margin-top: -20px;float: right; display: block;"><%= link_to "更多>>", {:controller => 'contests', :action => 'index', :host => Setting.contest_domain}, :target => "_blank" %></span>
+<h3 style="margin-left: 5px; color: #e8770d;"><strong><%=l(:label_current_hot_contest)%></strong></h3>
+	<span style="margin-top: -20px;float: right; display: block;"><%= link_to l(:label_more_information), {:controller => 'contests', :action => 'index', :host => Setting.contest_domain}, :target => "_blank" %></span>
 	<div class="d-p-projectlist-box">
 		<div class="d-p-projectlist">
 			<% find_all_hot_contest.map do |contest| break if(contest == find_all_hot_contest[5]) %>
@@ -166,7 +166,7 @@
 				
 				<div style="padding-left: 57px; clear: left;">
 	
-					<span class="font_lighter">发布时间：<%=format_time contest.created_on %></span>
+					<span class="font_lighter"><%=l(:label_release_time)%>:&nbsp;<%=format_time contest.created_on %></span>
 				</div>
 				
 			</li>
@@ -179,11 +179,11 @@
 
 <div id="J_Slide" class="d-p-index-box d-p-index-hotproject" style="float: right;">
 <h3 style="margin-left: 5px; color: #e8770d;">
-	<strong>问题和反馈动态</strong>
-	<%= link_to "我要提问" , newbie_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%>
-	<%= link_to "我要反馈" , suggestion_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%>
+	<strong><%=l(:label_issue_feedback_activities)%></strong>
+	<%= link_to l(:label_my_question), newbie_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%>
+	<%= link_to l(:label_my_feedback), suggestion_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%>
 </h3>
-	<span style="margin-top: -20px;float: right; display: block;"><%= link_to "更多>>", forums_path %></span>
+	<span style="margin-top: -20px;float: right; display: block;"><%= link_to l(:label_more_information), forums_path %></span>
 	<div class="d-p-projectlist-box">
 		<ul class="d-p-projectlist">
 			<% find_new_forum_topics(11).each do |topic|%>
@@ -197,13 +197,13 @@
 						<%= "#{l(:label_updated_time, value: time_tag_welcome(topic_last_time topic))}".html_safe %>
 					</span>
 					<span class="memo_author">
-						楼主： <%= link_to_user(topic.author) %>
+						<%=l(:label_question_sponsor)%>:&nbsp;<%= link_to_user(topic.author) %>
 					</span>
 					<span class="memo_last_person">
-						最后回复：<%=link_to_user topic.last_reply.try(:author) %>
+						<%=l(:label_final_reply)%>:&nbsp;<%=link_to_user topic.last_reply.try(:author) %>
 					</span>
 					<span class="memo_reply">
-						回复(<%= link_to topic.try(:replies_count), topic.event_url %>)
+						<%=l(:label_reply)%>(<%= link_to topic.try(:replies_count), topic.event_url %>)
 					</span>
                   </div>
                 </div>
@@ -214,8 +214,8 @@
 </div>
 
 <div id="J_Slide" class="d-p-index-box d-p-index-hotproject">
-<h3 style="margin-left: 5px; color: #e8770d;"><strong>最新参赛作品</strong></h3>
-	<span style="margin-top: -20px;float: right; display: block;"><%= link_to "更多>>", {:controller => 'softapplications', :action => 'index', :host => Setting.contest_domain}, :target => "_blank" %></span>
+<h3 style="margin-left: 5px; color: #e8770d;"><strong><%=l(:label_current_attendingcontest_work)%></strong></h3>
+	<span style="margin-top: -20px;float: right; display: block;"><%= link_to l(:label_more_information), {:controller => 'softapplications', :action => 'index', :host => Setting.contest_domain}, :target => "_blank" %></span>
 	<div class="d-p-projectlist-box">
 		<% if Softapplication.count > 0%>
 			<div class="d-p-projectlist">
@@ -235,7 +235,7 @@
 					</div><br />
 					
 					<div style="padding-left: 55px; clear: left;">
-						<span class="font_lighter">发布时间：<%=format_time softapplication.created_at %></span>
+						<span class="font_lighter"><%=l(:label_release_time)%>:&nbsp;<%=format_time softapplication.created_at %></span>
 					</div>
 					
 				</li>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index fd4368be8..072dd9ecb 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1402,7 +1402,7 @@ en:
   #end
   label_bids_published: published
   label_bids_published_ago: ago  
-  label_welcome_trustie: Trustie forge
+  label_welcome_trustie: Trustie
   label_welcome_trustie_project: Online projects hosting platform
   label_welcome_trustie_course: Online Courses practice platform
   label_welcome_trustie_project_description: Software for Chinese college students and practitioners to provide social-oriented project management, code hosting, resource sharing, cooperation and exchange.
@@ -1617,6 +1617,22 @@ en:
   label_class_hour: period
   label_activity_time: publish date
 
+#added by linchun as competition#
+  label_welcome_trustie_contest: Contest Platform
+  label_welcome_trustie_contest_description: For the University student and programming enthusiasts,providing social competition、application、coding management and so on.
+
+  label_current_hot_contest: Latest Hot Competition
+  label_current_attendingcontest_work: Latest Competition Work
+  label_issue_feedback_activities: Question&Feedback
+  label_more_information: More...
+  label_my_question: My-question
+  label_my_feedback: My-feedback
+  label_release_time: Release-time
+  label_question_sponsor: Sponsor
+  label_final_reply: Final-reply
+  label_reply: Reply  
+
+#end
 
   # ajax异步验证
   modal_valid_passing: can be used.
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 51337ddca..b958362c4 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1963,6 +1963,18 @@ zh:
   
   label_contest_notification: 竞赛通知
   
+  label_current_hot_contest: 最新热门竞赛
+  label_current_attendingcontest_work: 最新参赛作品
+  label_issue_feedback_activities: 问题和反馈动态
+  label_more_information: 更多...
+  label_my_question: 我要提问
+  label_my_feedback: 我要反馈
+  label_release_time: 发布时间
+  label_question_sponsor: 楼主
+  label_final_reply: 最后回复
+  label_reply: 回复
+  label_weixin:　微信扫码
+  label_searching_intimation: 请输入要搜索的关键字
   #end
   
   # ajax异步验证

From ebcdd2cc9e761b88aedf1f075ce9bc0034d0de12 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Wed, 4 Jun 2014 10:08:57 +0800
Subject: [PATCH 10/62] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E8=8B=B1=E6=96=87=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/welcome/contest.html.erb | 2 +-
 config/locales/en.yml              | 3 ++-
 config/locales/zh.yml              | 9 ++++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb
index 6e0d6e919..b0432156c 100644
--- a/app/views/welcome/contest.html.erb
+++ b/app/views/welcome/contest.html.erb
@@ -124,7 +124,7 @@
 <!--搜索框-->	
 	<div id="J_Slide" class="d-p-index-box d-p-index-hotproject" style="float: right;">		
 		<%= form_tag({controller: 'contests', action: 'index'}, method: :get) do %>	
-			<%= text_field_tag 'name', params[:name], placeholder:<%=l(:label_searching_intimation)%>, name: "name", :class => 'blueinputbar', :style => 'width:240px; padding-right:50px;'%>
+			<%= text_field_tag 'name', params[:name], placeholder:'请输入要搜索的关键字', name: "name", :class => 'blueinputbar', :style => 'width:240px; padding-right:50px;'%>
 			&nbsp;
 			<%= hidden_field_tag 'project_type', params[:project_type] %>
 			<%= submit_tag l(:label_search), :class => "enterprise" , :name => nil%>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 072dd9ecb..3d9349f57 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1631,7 +1631,8 @@ en:
   label_question_sponsor: Sponsor
   label_final_reply: Final-reply
   label_reply: Reply  
-
+  label_weixin:　WeiXin
+  label_searching_intimation: please input the keywords
 #end
 
   # ajax异步验证
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index b958362c4..9b77a5f57 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1962,7 +1962,8 @@ zh:
   label_attendingcontestwork_sorting_intimation: 您可以重新打分，打分结果以最后一次打分为主！
   
   label_contest_notification: 竞赛通知
-  
+
+  #english site translation
   label_current_hot_contest: 最新热门竞赛
   label_current_attendingcontest_work: 最新参赛作品
   label_issue_feedback_activities: 问题和反馈动态
@@ -1973,8 +1974,10 @@ zh:
   label_question_sponsor: 楼主
   label_final_reply: 最后回复
   label_reply: 回复
-  label_weixin:　微信扫码
-  label_searching_intimation: 请输入要搜索的关键字
+  label_weixin: 微信扫码
+  label_search_intimation: 请输入要搜索的关键字
+  #end  
+
   #end
   
   # ajax异步验证

From e5a76251a51f8b08ec48ff97263d43b9a3a34292 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Wed, 4 Jun 2014 10:24:47 +0800
Subject: [PATCH 11/62] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B52?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/locales/en.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3d9349f57..d257711f4 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1405,8 +1405,10 @@ en:
   label_welcome_trustie: Trustie
   label_welcome_trustie_project: Online projects hosting platform
   label_welcome_trustie_course: Online Courses practice platform
+  label_welcome_trustie_contest: Online Contests practice platform
   label_welcome_trustie_project_description: Software for Chinese college students and practitioners to provide social-oriented project management, code hosting, resource sharing, cooperation and exchange.
   label_welcome_trustie_course_description: Teachers and Students for Chinese universities to provide social-oriented curriculum management, resource sharing, cooperation achieved, collaborative research.
+  label_welcome_trustie_contest_description: Software for Chinese college students and practitioners to provide social-oriented contest management, code hosting, resource sharing, cooperation and exchange.
   label_welcome_trustie_description: a socialized collaboration platform for project management, collaborative research, software development and software crowdsourcing for creative university students and entrepreneurs.
   label_user_project: Projects
   label_bid_respond_quote: Respond
@@ -1618,8 +1620,6 @@ en:
   label_activity_time: publish date
 
 #added by linchun as competition#
-  label_welcome_trustie_contest: Contest Platform
-  label_welcome_trustie_contest_description: For the University student and programming enthusiasts,providing social competition、application、coding management and so on.
 
   label_current_hot_contest: Latest Hot Competition
   label_current_attendingcontest_work: Latest Competition Work
@@ -1630,9 +1630,9 @@ en:
   label_release_time: Release-time
   label_question_sponsor: Sponsor
   label_final_reply: Final-reply
-  label_reply: Reply  
-  label_weixin:　WeiXin
-  label_searching_intimation: please input the keywords
+  label_reply: Reply
+  label_weixin: 微信扫码
+  label_search_intimation: 请输入要搜索的关键字
 #end
 
   # ajax异步验证

From 4b54f2949d44611f04d4c1029ee615f2347c7385 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Wed, 4 Jun 2014 10:28:20 +0800
Subject: [PATCH 12/62] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BF=AE=E6=94=B92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/welcome/contest.html.erb | 2 +-
 config/locales/en.yml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb
index b0432156c..452f10f4b 100644
--- a/app/views/welcome/contest.html.erb
+++ b/app/views/welcome/contest.html.erb
@@ -109,7 +109,7 @@
 <div class='top_bar'>
 	<div id="identifier-pannel" style="display:none">
 		<%= image_tag '/images/qrweixin.jpg', size: '150x150', alt: 'trustie', class: "weixin" %>
-		<div class="weixin-content">微信扫码</div>
+		<div class="weixin-content"><%=l(:label_weixin)%></div>
 	</div> 
 	<div class="main-content-bar" id="main-content-bar">
 	<!--文字-->	
diff --git a/config/locales/en.yml b/config/locales/en.yml
index d257711f4..60bb8bbd0 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1631,7 +1631,7 @@ en:
   label_question_sponsor: Sponsor
   label_final_reply: Final-reply
   label_reply: Reply
-  label_weixin: 微信扫码
+  label_weixin: WeiXin
   label_search_intimation: 请输入要搜索的关键字
 #end
 

From 7abeabeadf3c48134df24a82bae79cff54f94b43 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Wed, 4 Jun 2014 10:31:02 +0800
Subject: [PATCH 13/62] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BF=AE=E6=94=B93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/welcome/contest.html.erb | 2 +-
 config/locales/en.yml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb
index 452f10f4b..4bc96cdc1 100644
--- a/app/views/welcome/contest.html.erb
+++ b/app/views/welcome/contest.html.erb
@@ -124,7 +124,7 @@
 <!--搜索框-->	
 	<div id="J_Slide" class="d-p-index-box d-p-index-hotproject" style="float: right;">		
 		<%= form_tag({controller: 'contests', action: 'index'}, method: :get) do %>	
-			<%= text_field_tag 'name', params[:name], placeholder:'请输入要搜索的关键字', name: "name", :class => 'blueinputbar', :style => 'width:240px; padding-right:50px;'%>
+			<%= text_field_tag 'name', params[:name], :placeholder => l(:label_search_intimation), name: "name", :class => 'blueinputbar', :style => 'width:240px; padding-right:50px;'%>
 			&nbsp;
 			<%= hidden_field_tag 'project_type', params[:project_type] %>
 			<%= submit_tag l(:label_search), :class => "enterprise" , :name => nil%>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 60bb8bbd0..54057a702 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1632,7 +1632,7 @@ en:
   label_final_reply: Final-reply
   label_reply: Reply
   label_weixin: WeiXin
-  label_search_intimation: 请输入要搜索的关键字
+  label_search_intimation: please input the keywords
 #end
 
   # ajax异步验证

From a38ffb9e9d136bd2b65945396cfcb93bb805434f Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Wed, 4 Jun 2014 10:43:32 +0800
Subject: [PATCH 14/62] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BF=AE=E6=94=B94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/welcome/contest.html.erb | 4 ++--
 config/locales/en.yml              | 1 +
 config/locales/zh.yml              | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb
index 4bc96cdc1..e65e25304 100644
--- a/app/views/welcome/contest.html.erb
+++ b/app/views/welcome/contest.html.erb
@@ -154,9 +154,9 @@
 					<!-- <%= link_to(contest.name, contest.event_url, :class => "d-g-blue d-p-project-name",  :title => "#{contest.name}",  :target => "_blank")  %> -->
 					<%= link_to(contest.name, show_contest_contest_path(contest.id), :class => "d-g-blue d-p-project-name",  :title => "#{contest.name}",  :target => "_blank")  %>
 					<% if contest.id == 2 or contest.id == 3 or contest.id == 6 %>
-						<span class="font_lighter">(<span style="font-size: 13px"><%= link_to("含#{contest.projects.where('is_public=1').count}个作品", show_attendingcontest_contest_path(contest), :target => "_blank") %></span>)</span>
+						<span class="font_lighter">(<span style="font-size: 13px"><%= link_to("#{contest.projects.where('is_public=1').count}"+l(:label_work_quantity), show_attendingcontest_contest_path(contest), :target => "_blank") %></span>)</span>
 					<% else %>
-						<span class="font_lighter">(<span style="font-size: 13px"><%= link_to("含#{contest.contesting_softapplications.count}个作品", show_attendingcontest_contest_path(contest), :target => "_blank") %></span>)</span>
+						<span class="font_lighter">(<span style="font-size: 13px"><%= link_to("#{contest.contesting_softapplications.count}"+l(:label_work_quantity), show_attendingcontest_contest_path(contest), :target => "_blank") %></span>)</span>
 					<% end %>
 				</div>
 				
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 54057a702..ffe8b5e31 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1633,6 +1633,7 @@ en:
   label_reply: Reply
   label_weixin: WeiXin
   label_search_intimation: please input the keywords
+  label_work_quantity: work
 #end
 
   # ajax异步验证
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 9b77a5f57..b924a24b2 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1976,6 +1976,7 @@ zh:
   label_reply: 回复
   label_weixin: 微信扫码
   label_search_intimation: 请输入要搜索的关键字
+  label_work_quantity: 个作品
   #end  
 
   #end

From da26c70f6c6d61ab08adc9c56f0eed29ad696410 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Wed, 4 Jun 2014 10:53:04 +0800
Subject: [PATCH 15/62] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E5=AD=90=E7=AB=99=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/welcome/_link_to_another.html.erb | 6 +++---
 config/locales/en.yml                       | 3 +++
 config/locales/zh.yml                       | 3 +++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/views/welcome/_link_to_another.html.erb b/app/views/welcome/_link_to_another.html.erb
index f5f360d3e..bda48e753 100644
--- a/app/views/welcome/_link_to_another.html.erb
+++ b/app/views/welcome/_link_to_another.html.erb
@@ -1,6 +1,6 @@
 <div class="clearfix"></div>
 <div class="linkother">
-  <a href="http://forge.trustie.net" class="link_other_item">项目托管平台</a>
-  <a href="http://course.trustie.net" class="link_other_item">课程实践平台</a>
-  <a href="http://contest.trustie.net" class="link_other_item">竞赛托管平台</a>
+  <a href="http://forge.trustie.net" class="link_other_item"><%=l(:label_projects_management_platform)%></a>
+  <a href="http://course.trustie.net" class="link_other_item"><%=l(:label_courses_management_platform)%></a>
+  <a href="http://contest.trustie.net" class="link_other_item"><%=l(:label_contests_management_platform)%></a>
 </div>
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ffe8b5e31..7236992fd 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1634,6 +1634,9 @@ en:
   label_weixin: WeiXin
   label_search_intimation: please input the keywords
   label_work_quantity: work
+  label_projects_management_platform: Projects-platform
+  label_courses_management_platform: Courses-platform
+  label_contests_management_platform: Competitions-platform
 #end
 
   # ajax异步验证
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index b924a24b2..6812d6a63 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1977,6 +1977,9 @@ zh:
   label_weixin: 微信扫码
   label_search_intimation: 请输入要搜索的关键字
   label_work_quantity: 个作品
+  label_projects_management_platform: 项目托管平台
+  label_courses_management_platform: 课程实践平台
+  label_contests_management_platform: 竞赛托管平台
   #end  
 
   #end

From ae70081288142b868474d8104098e50dd2807d04 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Wed, 4 Jun 2014 20:29:15 +0800
Subject: [PATCH 16/62] eter

---
 .../contestnotifications_controller.rb        | 32 +++++++++----------
 app/controllers/previews_controller.rb        | 19 ++++++++++-
 app/models/contestnotification.rb             |  2 +-
 app/views/contestnotifications/_form.html.erb | 11 +++++++
 ...tnotifications.html.erb => _news.html.erb} |  8 ++---
 app/views/contestnotifications/edit.html.erb  |  4 +--
 app/views/contestnotifications/index.html.erb | 31 +++++++-----------
 app/views/contestnotifications/new.html.erb   |  9 +++---
 app/views/contestnotifications/show.html.erb  |  4 +--
 config/routes.rb                              |  6 +++-
 db/schema.rb                                  |  5 +++
 11 files changed, 81 insertions(+), 50 deletions(-)
 rename app/views/contestnotifications/{_contestnotifications.html.erb => _news.html.erb} (81%)

diff --git a/app/controllers/contestnotifications_controller.rb b/app/controllers/contestnotifications_controller.rb
index f2c0fb80f..0f485e65b 100644
--- a/app/controllers/contestnotifications_controller.rb
+++ b/app/controllers/contestnotifications_controller.rb
@@ -41,7 +41,7 @@ class ContestnotificationsController < ApplicationController
         @limit = 10
     end
 
-    scope = @contest ? @contest.contestnotifications.visible : Contestnotification.visible
+    scope = @contest ? @contest.contestnotifications.visible : Contestnotifications.visible
 
     @contestnotifications_count = scope.count
     @contestnotifications_pages = Paginator.new @contestnotifications_count, @limit, params['page']
@@ -80,14 +80,14 @@ class ContestnotificationsController < ApplicationController
   # GET /contestnotifications/new
   # GET /contestnotifications/new.json
   def new
-    @contestnotification = Contestnotification.new
-
-    respond_to do |format|
-      format.html # new.html.erb
-      format.json { render json: @contestnotification }
-    end
-    # @contestnotifications = Contestnotifications.new(:contest => @contest, :author => User.current)
-    # render :layout => 'base_contest'
+    # @contestnotification = Contestnotification.new
+# 
+    # respond_to do |format|
+      # format.html # new.html.erb
+      # format.json { render json: @contestnotification }
+    # end
+    @contestnotification = Contestnotification.new(:contest => @contest, :author => User.current)
+    render :layout => 'base_newcontest'
   end
 
   # GET /contestnotifications/1/edit
@@ -109,15 +109,15 @@ class ContestnotificationsController < ApplicationController
     # format.json { render json: @contestnotification.errors, status: :unprocessable_entity }
     # end
     # end
-    @contestnotifications = Contestnotifications.new(:contest => @contest, :author => User.current)
-    @contestnotifications.safe_attributes = params[:contestnotifications]
-    @news.save_attachments(params[:attachments])
-    if @contestnotifications.save
-      render_attachment_warning_if_needed(@contestnotifications)
+    @contestnotification = Contestnotification.new(:contest => @contest, :author => User.current)
+    @contestnotification.safe_attributes = params[:contestnotification]
+    @contestnotification.save_attachments(params[:attachments])
+    if @contestnotification.save
+      render_attachment_warning_if_needed(@contestnotification)
       flash[:notice] = l(:notice_successful_create)
-      redirect_to project_news_index_path(@contest)
+      redirect_to contest_contestnotifications_path(@contest)
     else
-      layout_file = 'base_contest'
+      layout_file = 'base_newcontest'
       render :action => 'new', :layout => layout_file
     end
   end
diff --git a/app/controllers/previews_controller.rb b/app/controllers/previews_controller.rb
index 0083116d2..2ca2cef9e 100644
--- a/app/controllers/previews_controller.rb
+++ b/app/controllers/previews_controller.rb
@@ -16,10 +16,11 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class PreviewsController < ApplicationController
-  before_filter :find_project, :find_attachments
+  before_filter :find_project, :find_attachments, :find_contest
 
   def issue
     @issue = @project.issues.find_by_id(params[:id]) unless params[:id].blank?
+    @issue = @contest.issues.find_by_id(params[:id]) unless params[:id].blank?
     if @issue
       @description = params[:issue] && params[:issue][:description]
       if @description && @description.gsub(/(\r?\n|\n\r?)/, "\n") == @issue.description.to_s.gsub(/(\r?\n|\n\r?)/, "\n")
@@ -50,4 +51,20 @@ class PreviewsController < ApplicationController
     render_404
   end
 
+  def contestnotifications
+    if params[:id].present? && contestnotifications = Contestnotifications.visible.find_by_id(params[:id])
+      @previewed = contestnotifications
+    end
+    @text = (params[:contestnotifications] ? params[:contestnotifications][:description] : nil)
+    render :partial => 'common/preview'
+  end
+
+  private
+  def find_contest
+    contest_id = (params[:issue] && params[:issue][:contest_id]) || params[:contest_id]
+    @contest = Contest.find(contest_id)
+    rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+
 end
diff --git a/app/models/contestnotification.rb b/app/models/contestnotification.rb
index f6b0fd168..b983778e4 100644
--- a/app/models/contestnotification.rb
+++ b/app/models/contestnotification.rb
@@ -19,7 +19,7 @@ class Contestnotification < ActiveRecord::Base
                             :author_key => :author_id
   acts_as_watchable
 
-  after_create :add_author_as_watcher, :reset_counters!
+  after_create :add_author_as_watcher
  
   after_create :act_as_activity
  
diff --git a/app/views/contestnotifications/_form.html.erb b/app/views/contestnotifications/_form.html.erb
index e69de29bb..acfa20a7c 100644
--- a/app/views/contestnotifications/_form.html.erb
+++ b/app/views/contestnotifications/_form.html.erb
@@ -0,0 +1,11 @@
+<%= error_messages_for @contestnotifications %>
+<div class="add_frame_header" >
+	<%= l(:label_news_new) %>
+</div>
+<div class="box tabular">
+<p><%= f.text_field :title, :required => true, :size => 60, :style => "width:488px;" %></p>
+<p><%= f.text_area :description, :required => true, :cols => 60, :rows => 11, :class => 'wiki-edit', :style => "width:490px;" %></p>
+<p id="attachments_form" style="margin-left:-10px;"><label style="padding-right: 15px;"><%= l(:label_attachment_plural) %></label><%= render :partial => 'attachments/form', :locals => {:container => @contestnotifications} %></p>
+</div>
+
+<%= wikitoolbar_for 'news_description' %>
diff --git a/app/views/contestnotifications/_contestnotifications.html.erb b/app/views/contestnotifications/_news.html.erb
similarity index 81%
rename from app/views/contestnotifications/_contestnotifications.html.erb
rename to app/views/contestnotifications/_news.html.erb
index 4a062f3b5..1621c5813 100644
--- a/app/views/contestnotifications/_contestnotifications.html.erb
+++ b/app/views/contestnotifications/_news.html.erb
@@ -10,16 +10,16 @@
     <td colspan="2" valign="top" width="50" ><img src="/images/new/news.png" width="40" height="40"/></td>
     <td><table width="580px" border="0">
       <tr>
-        <td colspan="2" valign="top"><strong> <%=link_to contestnotifications.author,contestnotifications_path(contestnotifications)%></strong> 
-        	<a class="font_lighter"><%= l(:label_project_newshare) %></a> <%= link_to h(contestnotifications.title), news_path(contestnotifications) %>
+        <td colspan="2" valign="top"><strong> <%=link_to contestnotifications.author,contest_contestnotification_path(contestnotifications)%></strong> 
+        	<a class="font_lighter"><%= l(:label_project_newshare) %></a> <%= link_to h(contestnotifications.title), contest_contestnotification_path(contestnotifications) %>
         </td>
         </tr>
       <tr>
         <td colspan="2" width="580px" ><p class="font_description"><%=h contestnotifications.description%></p></td>
         </tr>
       <tr>
-        <td align="left"><a class="font_lighter"> <%= contestnotifications.created_on %></a></td>
-        <td width="200" align="right" class="a"><%= link_to l(:label_project_newother),contestnotifications_path(contestnotifications)%>
+        <td align="left"><a class="font_lighter"> <%= contestnotifications.created_at %></a></td>
+        <td width="200" align="right" class="a"><%= link_to l(:label_project_newother),contest_contestnotification_path(contestnotifications)%>
         	<%= "(#{l(:label_x_comments, :count => contestnotifications.comments_count)})" if contestnotifications.comments_count > 0 %>
         </td>
       </tr>
diff --git a/app/views/contestnotifications/edit.html.erb b/app/views/contestnotifications/edit.html.erb
index 121b15d9a..3d3403818 100644
--- a/app/views/contestnotifications/edit.html.erb
+++ b/app/views/contestnotifications/edit.html.erb
@@ -7,10 +7,10 @@
 
 <h3><%=l(:label_news)%></h3>
 
-<%= labelled_form_for @contestnotifications, :html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
+<%= labelled_form_for @contestnotifications, :html => { :id => 'contestnotifications-form', :multipart => true, :method => :put } do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
 <%= submit_tag l(:button_save) %>
-<%= preview_link preview_news_path(:project_id => @contest, :id => @contestnotifications), 'news-form' %>
+<%= preview_link preview_news_path(:project_id => @contest, :id => @contestnotifications), 'contestnotifications-form' %>
 <% end %>
 <div id="preview" class="wiki"></div>
 
diff --git a/app/views/contestnotifications/index.html.erb b/app/views/contestnotifications/index.html.erb
index 090b72a36..e114b610c 100644
--- a/app/views/contestnotifications/index.html.erb
+++ b/app/views/contestnotifications/index.html.erb
@@ -1,29 +1,22 @@
 
-
-<!--begin-->
-<%
-     btn_tips = l(:label_news_new)
-     label_tips = l(:label_news)
-%>
-
 <span style="font-size: 16px; border-bottom:1px solid #f0f0f0; margin-right: 15px;">
-	<%= label_tips %>
+	<%= l(:label_news) %>
 </span>
 
-<%= link_to(btn_tips,
+<%= link_to(l(:label_news_new),
           new_contest_contestnotification_path(@contest),
           :class => 'icon icon-add',
-          :onclick => 'showAndScrollTo("add-news", "news_title"); return false;') %>
+          :onclick => 'showAndScrollTo("add-contestnotifications", "contestnotifications_title"); return false;') %>
 
 <% if @contest && User.current.allowed_to?(:manage_contestnotifications, @contest) %>
-    <div id="add-news" class="add_frame" style="display:none;">
-      <%= labelled_form_for @contestnotifications, :url => contestnotifications_path(@contest),
-                            :html => {:id => 'news-form', :multipart => true} do |f| %>
+    <div id="add-contestnotifications" class="add_frame" style="display:none;">
+      <%= labelled_form_for @contestnotifications, :url => contest_contestnotifications_path(@contest),
+                            :html => {:id => 'contestnotifications-form', :multipart => true} do |f| %>
           <%= render :partial => 'contestnotifications/form', :locals => {:f => f} %>
-          <%= submit_tag l(:button_create), :class => 'whiteButton m3p10 h30', :name => nil %><!-- button-submit  --> |
-          <%= preview_link preview_contestnotification_path(:contest_id => @contest), 'news-form', target='preview', {:class => 'whiteButton m3p10'} %>
+          <%= submit_tag l(:button_create), :class => 'whiteButton m3p10 h30', :name => nil %>
+          <%= preview_link preview_contestnotifications_path(:contest_id => @contest), 'contestnotifications-form', target='preview', {:class => 'whiteButton m3p10'} %>
           |
-          <%= link_to l(:button_cancel), "#", :onclick => '$("#add-news").hide()', :class => 'whiteButton m3p10' %>
+          <%= link_to l(:button_cancel), "#", :onclick => '$("#add-contestnotifications").hide(); return false;', :class => 'whiteButton m3p10' %>
       <% end if @contest %>
       <div id="preview" class="wiki"></div>
     </div>
@@ -44,8 +37,8 @@
 
                   <tr>
                      <td colspan="2" valign="top">
-                       <strong><%= link_to_user(contestnotifications.author) if contestnotifications.respond_to?(:author) %></strong><span style="margin-left: 4px;" class="font_lighter"><%= l(:label_project_notice) %></span><span><%= link_to h(contestnotifications.title), contestnotification_path(contestnotifications) %></span>
-                         <span style="float: right"><%= delete_link contestnotification_path(contestnotifications) if User.current.allowed_to?(:manage_contestnotification, @contest) %> </span>
+                       <strong><%= link_to_user(contestnotifications.author) if contestnotifications.respond_to?(:author) %></strong><span style="margin-left: 4px;" class="font_lighter"><%= l(:label_project_notice) %></span><span><%= link_to h(contestnotifications.title), contest_contestnotification_path(contestnotifications) %></span>
+                         <span style="float: right"><%= delete_link contest_contestnotification_path(contestnotifications) if User.current.allowed_to?(:manage_contestnotifications, @contest) %> </span>
                      </td>
                   </tr>
                   <tr>
@@ -55,7 +48,7 @@
                   <tr>
                     <td align="left"><span class="font_lighter"> <%= l :label_update_time %>
                       &nbsp;<%= format_time(contestnotifications.created_at) %></span></td>
-                    <td width="350" align="right" class="a"><%= link_to l(:label_project_newother), contestnotification_path(contestnotifications) %><%= "(#{l(:label_x_comments, :count => contestnotifications.comments_count)})" if contestnotifications.comments_count >= 0 %></td>
+                    <td width="350" align="right" class="a"><%= link_to l(:label_project_newother), contest_contestnotification_path(contestnotifications) %><%= "(#{l(:label_x_comments, :count => contestnotifications.comments_count)})" if contestnotifications.comments_count >= 0 %></td>
                   </tr>
                 </table>
               </td>
diff --git a/app/views/contestnotifications/new.html.erb b/app/views/contestnotifications/new.html.erb
index 2ad240014..c4e322ec8 100644
--- a/app/views/contestnotifications/new.html.erb
+++ b/app/views/contestnotifications/new.html.erb
@@ -1,6 +1,7 @@
 
-<%#= labelled_form_for @contestnotifications, :url => contest_contestnotifications_path(@contest), :html => { :id => 'news-form', :multipart => true } do |f| %>
-  <%#= render :partial => 'contestnotifications/form', :locals => { :f => f } %>
-  <%#= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %>
-<%# end %>
+<%= labelled_form_for @contestnotification, :url => contest_contestnotifications_path(@contest), :html => { :id => 'contestnotifications-form', :multipart => true } do |f| %>
+  <%= render :partial => 'contestnotifications/form', :locals => { :f => f } %>
+  <%= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %>
+  <%= preview_link preview_contestnotifications_path(:contest_id => @contest), 'contestnotifications-form' ,target='preview',{:class => 'whiteButton m3p10'}%>
+<% end %>
 <div id="preview" class="wiki"></div>
diff --git a/app/views/contestnotifications/show.html.erb b/app/views/contestnotifications/show.html.erb
index a8069c73c..517f60bca 100644
--- a/app/views/contestnotifications/show.html.erb
+++ b/app/views/contestnotifications/show.html.erb
@@ -50,10 +50,10 @@
 <% if authorize_for('contestnotifications', 'edit') %>
 <div id="edit-news" style="display:none;">
 	<%= labelled_form_for :contestnotifications, @contestnotifications, :url => contestnotifications_path(@contestnotifications),
-	:html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
+	:html => { :id => 'contestnotifications-form', :multipart => true, :method => :put } do |f| %>
 	<%= render :partial => 'form', :locals => { :f => f } %>
 	<%= submit_tag l(:button_save) %>
-	<%= preview_link preview_contestnotifications_path(:contest_id => @contest, :id => @contestnotifications), 'news-form',target='preview',{:class => ''} %> |
+	<%= preview_link preview_contestnotifications_path(:contest_id => @contest, :id => @contestnotifications), 'contestnotifications-form',target='preview',{:class => ''} %> |
 	<%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;' %>
 	<% end %>
 	<div id="preview" class="wiki"></div>
diff --git a/config/routes.rb b/config/routes.rb
index 1c707bdb0..aba8b4e32 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -17,7 +17,7 @@
 
 RedmineApp::Application.routes.draw do
   
-  
+
   #match '/contests/:id/contestnotifications', :controller => 'contestnotifications', :action => 'index'
 
   resources :homework_users
@@ -70,6 +70,10 @@ RedmineApp::Application.routes.draw do
     end
   end
 
+  #resources :contestnotifications, :only => [:index, :show, :edit, :update, :destroy]
+  match '/contestnotifications/:id/comments', :to => 'comments#create', :via => :post
+  match '/contestnotifications/:id/comments/:comment_id', :to => 'comments#destroy', :via => :delete
+  match '/contestnotifications/preview', :controller => 'previews', :action => 'contestnotifications', :as => 'preview_contestnotifications', :via => [:get, :post, :put]  
   ## new added by linchun #新竞赛相关
   resources :contests, only: [:index] do
     resources :contestnotifications#, except: [:index]
diff --git a/db/schema.rb b/db/schema.rb
index 0e8337b94..f750f247f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -23,6 +23,11 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
   add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type"
   add_index "activities", ["user_id"], :name => "index_activities_on_user_id"
 
+  create_table "applied_projects", :force => true do |t|
+    t.integer "project_id", :null => false
+    t.integer "user_id",    :null => false
+  end
+
   create_table "apply_project_masters", :force => true do |t|
     t.integer  "user_id"
     t.string   "apply_type"

From ed84ec633f6412dc7589aca55f2f07d6d1b05c11 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Wed, 4 Jun 2014 20:57:53 +0800
Subject: [PATCH 17/62] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/contestnotifications/edit.html.erb  | 2 +-
 app/views/contestnotifications/index.html.erb | 4 ++--
 config/routes.rb                              | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/contestnotifications/edit.html.erb b/app/views/contestnotifications/edit.html.erb
index 3d3403818..a86a50419 100644
--- a/app/views/contestnotifications/edit.html.erb
+++ b/app/views/contestnotifications/edit.html.erb
@@ -10,7 +10,7 @@
 <%= labelled_form_for @contestnotifications, :html => { :id => 'contestnotifications-form', :multipart => true, :method => :put } do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
 <%= submit_tag l(:button_save) %>
-<%= preview_link preview_news_path(:project_id => @contest, :id => @contestnotifications), 'contestnotifications-form' %>
+<%= preview_link preview_contestnotifications_path(:project_id => @contest, :id => @contestnotifications), 'contestnotifications-form' %>
 <% end %>
 <div id="preview" class="wiki"></div>
 
diff --git a/app/views/contestnotifications/index.html.erb b/app/views/contestnotifications/index.html.erb
index e114b610c..658d7d894 100644
--- a/app/views/contestnotifications/index.html.erb
+++ b/app/views/contestnotifications/index.html.erb
@@ -37,7 +37,7 @@
 
                   <tr>
                      <td colspan="2" valign="top">
-                       <strong><%= link_to_user(contestnotifications.author) if contestnotifications.respond_to?(:author) %></strong><span style="margin-left: 4px;" class="font_lighter"><%= l(:label_project_notice) %></span><span><%= link_to h(contestnotifications.title), contest_contestnotification_path(contestnotifications) %></span>
+                       <strong><%= link_to_user(contestnotifications.author) if contestnotifications.respond_to?(:author) %></strong><span style="margin-left: 4px;" class="font_lighter"><%= l(:label_project_notice) %></span><span><%#= link_to h(contestnotifications.title), contest_contestnotification_path(contestnotifications) %></span>
                          <span style="float: right"><%= delete_link contest_contestnotification_path(contestnotifications) if User.current.allowed_to?(:manage_contestnotifications, @contest) %> </span>
                      </td>
                   </tr>
@@ -48,7 +48,7 @@
                   <tr>
                     <td align="left"><span class="font_lighter"> <%= l :label_update_time %>
                       &nbsp;<%= format_time(contestnotifications.created_at) %></span></td>
-                    <td width="350" align="right" class="a"><%= link_to l(:label_project_newother), contest_contestnotification_path(contestnotifications) %><%= "(#{l(:label_x_comments, :count => contestnotifications.comments_count)})" if contestnotifications.comments_count >= 0 %></td>
+                    <td width="350" align="right" class="a"><%#= link_to l(:label_project_newother), contest_contestnotification_path(contestnotifications) %><%#= "(#{l(:label_x_comments, :count => contestnotifications.comments_count)})" if(contestnotifications.comments_count >= 0)%></td>
                   </tr>
                 </table>
               </td>
diff --git a/config/routes.rb b/config/routes.rb
index aba8b4e32..df0501209 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -76,7 +76,7 @@ RedmineApp::Application.routes.draw do
   match '/contestnotifications/preview', :controller => 'previews', :action => 'contestnotifications', :as => 'preview_contestnotifications', :via => [:get, :post, :put]  
   ## new added by linchun #新竞赛相关
   resources :contests, only: [:index] do
-    resources :contestnotifications#, except: [:index]
+    resources :contestnotifications
     collection do
       match 'new_contest'        , via: :get
       match 'join_in_contest'    , via: :post

From 2e11d76652d8ce007fb46f07801c35d30731483d Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Wed, 4 Jun 2014 21:26:57 +0800
Subject: [PATCH 18/62] lin

---
 app/models/contestnotification.rb             |  2 +-
 app/views/contestnotifications/index.html.erb | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/models/contestnotification.rb b/app/models/contestnotification.rb
index b983778e4..a055d3000 100644
--- a/app/models/contestnotification.rb
+++ b/app/models/contestnotification.rb
@@ -46,7 +46,7 @@ class Contestnotification < ActiveRecord::Base
 
   # returns latest news for contests visible by user
   def self.latest(user = User.current, count = 5)
-    visible(user).includes([:author, :contest]).order("#{Contestnotifications.table_name}.created_on DESC").limit(count).all
+    visible(user).includes([:author, :contest]).order("#{Contestnotifications.table_name}.created_at DESC").limit(count).all
   end
 
   private
diff --git a/app/views/contestnotifications/index.html.erb b/app/views/contestnotifications/index.html.erb
index 658d7d894..c9ce1622d 100644
--- a/app/views/contestnotifications/index.html.erb
+++ b/app/views/contestnotifications/index.html.erb
@@ -1,12 +1,11 @@
-
 <span style="font-size: 16px; border-bottom:1px solid #f0f0f0; margin-right: 15px;">
 	<%= l(:label_news) %>
 </span>
 
 <%= link_to(l(:label_news_new),
-          new_contest_contestnotification_path(@contest),
-          :class => 'icon icon-add',
-          :onclick => 'showAndScrollTo("add-contestnotifications", "contestnotifications_title"); return false;') %>
+            new_contest_contestnotification_path(@contest),
+            :class => 'icon icon-add',
+            :onclick => 'showAndScrollTo("add-contestnotifications", "contestnotifications_title"); return false;') %>
 
 <% if @contest && User.current.allowed_to?(:manage_contestnotifications, @contest) %>
     <div id="add-contestnotifications" class="add_frame" style="display:none;">
@@ -36,10 +35,11 @@
                 <table width="580px" border="0">
 
                   <tr>
-                     <td colspan="2" valign="top">
-                       <strong><%= link_to_user(contestnotifications.author) if contestnotifications.respond_to?(:author) %></strong><span style="margin-left: 4px;" class="font_lighter"><%= l(:label_project_notice) %></span><span><%#= link_to h(contestnotifications.title), contest_contestnotification_path(contestnotifications) %></span>
-                         <span style="float: right"><%= delete_link contest_contestnotification_path(contestnotifications) if User.current.allowed_to?(:manage_contestnotifications, @contest) %> </span>
-                     </td>
+                    <td colspan="2" valign="top">
+                      <strong><%= link_to_user(contestnotifications.author) if contestnotifications.respond_to?(:author) %></strong><span style="margin-left: 4px;" class="font_lighter">
+                      <%= l(:label_project_notice) %></span><span><%= link_to h(contestnotifications.title), contest_contestnotification_path(@contest, contestnotifications) %></span>
+                      <span style="float: right"><%= delete_link contest_contestnotification_path(@contest, contestnotifications) if true || User.current.allowed_to?(:manage_contestnotifications, @contest) %> </span>
+                    </td>
                   </tr>
                   <tr>
                     <td colspan="2" width="580px">
@@ -48,7 +48,7 @@
                   <tr>
                     <td align="left"><span class="font_lighter"> <%= l :label_update_time %>
                       &nbsp;<%= format_time(contestnotifications.created_at) %></span></td>
-                    <td width="350" align="right" class="a"><%#= link_to l(:label_project_newother), contest_contestnotification_path(contestnotifications) %><%#= "(#{l(:label_x_comments, :count => contestnotifications.comments_count)})" if(contestnotifications.comments_count >= 0)%></td>
+                    <td width="350" align="right" class="a"><%= link_to l(:label_project_newother), contest_contestnotification_path(@contest, contestnotifications) %><%= "(#{l(:label_x_comments, :count => contestnotifications.comments.count)})" if(contestnotifications.comments.count >= 0)%></td>
                   </tr>
                 </table>
               </td>

From d06488c10d7ffda11bd38b0eaa7bb4e3b00e107a Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Thu, 5 Jun 2014 10:28:36 +0800
Subject: [PATCH 19/62] =?UTF-8?q?=E4=B8=BA=E7=AB=9E=E8=B5=9B=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E6=B7=BB=E5=8A=A0=E8=AF=84=E8=AE=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../notificationcomments.js.coffee            |   3 +
 .../stylesheets/notificationcomments.css.scss |   3 +
 app/controllers/comments_controller.rb        |  11 +-
 .../contestnotifications_controller.rb        |   6 +-
 .../notificationcomments_controller.rb        |  35 +++
 app/helpers/notificationcomments_helper.rb    |   2 +
 app/models/notificationcomments.rb            |  11 +
 app/models/user.rb                            |   5 +
 app/models/user_preference.rb                 |   3 +
 config/routes.rb                              |   4 +-
 .../20140401004102_create_relative_memos.rb   |   2 +-
 ...40530010015_create_contestnotifications.rb |   2 +-
 ...40605003915_create_notificationcomments.rb |  12 +
 db/schema.rb                                  | 283 +++++-------------
 test/fixtures/notificationcomments.yml        |  13 +
 .../notificationcomments_controller_test.rb   |   7 +
 .../notificationcomments_helper_test.rb       |   4 +
 test/unit/notificationcomments_test.rb        |   7 +
 18 files changed, 189 insertions(+), 224 deletions(-)
 create mode 100644 app/assets/javascripts/notificationcomments.js.coffee
 create mode 100644 app/assets/stylesheets/notificationcomments.css.scss
 create mode 100644 app/controllers/notificationcomments_controller.rb
 create mode 100644 app/helpers/notificationcomments_helper.rb
 create mode 100644 app/models/notificationcomments.rb
 create mode 100644 db/migrate/20140605003915_create_notificationcomments.rb
 create mode 100644 test/fixtures/notificationcomments.yml
 create mode 100644 test/functional/notificationcomments_controller_test.rb
 create mode 100644 test/unit/helpers/notificationcomments_helper_test.rb
 create mode 100644 test/unit/notificationcomments_test.rb

diff --git a/app/assets/javascripts/notificationcomments.js.coffee b/app/assets/javascripts/notificationcomments.js.coffee
new file mode 100644
index 000000000..761567942
--- /dev/null
+++ b/app/assets/javascripts/notificationcomments.js.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
diff --git a/app/assets/stylesheets/notificationcomments.css.scss b/app/assets/stylesheets/notificationcomments.css.scss
new file mode 100644
index 000000000..aea714e47
--- /dev/null
+++ b/app/assets/stylesheets/notificationcomments.css.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the notificationcomments controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index d54e9ae7e..90c034fdb 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -18,8 +18,7 @@
 class CommentsController < ApplicationController
   default_search_scope :news
   model_object News
-  before_filter :find_model_object
-  before_filter :find_model_object_contest  
+  before_filter :find_model_object 
   before_filter :find_project_from_association
   before_filter :authorize
 
@@ -51,12 +50,6 @@ class CommentsController < ApplicationController
     @comment = nil
     @news
   end
-  
-  def find_model_object_contest
-    super
-    @contestnotifications = @object
-    @comment = nil
-    @contestnotifications
-  end  
+   
   
 end
diff --git a/app/controllers/contestnotifications_controller.rb b/app/controllers/contestnotifications_controller.rb
index 0f485e65b..8aea1a6cd 100644
--- a/app/controllers/contestnotifications_controller.rb
+++ b/app/controllers/contestnotifications_controller.rb
@@ -5,7 +5,7 @@ class ContestnotificationsController < ApplicationController
   default_search_scope :contestnotifications
   # model_object Contestnotifications
   # before_filter :find_model_object_contest, :except => [:new, :create, :index]
-  # before_filter :find_contest_from_association, :except => [:new, :create, :index]
+  before_filter :find_contest_from_association, :except => [:new, :create, :index]
   # before_filter :find_contest_by_contest_id, :only => [:new, :create]
   before_filter :find_contest
   before_filter :find_author
@@ -71,8 +71,8 @@ class ContestnotificationsController < ApplicationController
     # format.html # show.html.erb
     # format.json { render json: @contestnotification }
     # end
-    @comments = @contestnotifications.comments
-    @comments.reverse! if User.current.wants_comments_in_reverse_order?
+    @notificationcomments = @contestnotifications.notificationcomments
+    @notificationcomments.reverse! if User.current.wants_notificationcomments_in_reverse_order?
     render :layout => 'base_newcontest'
 
   end
diff --git a/app/controllers/notificationcomments_controller.rb b/app/controllers/notificationcomments_controller.rb
new file mode 100644
index 000000000..78272aae1
--- /dev/null
+++ b/app/controllers/notificationcomments_controller.rb
@@ -0,0 +1,35 @@
+class NotificationcommentsController < ApplicationController
+  default_search_scope :contestnotifications
+  model_object Contestnotifications
+  before_filter :find_model_object 
+  before_filter :find_contest_from_association
+  before_filter :authorize
+
+  def create
+    raise Unauthorized unless @contestnotifications.commentable?
+
+    @notificaioncomment = Notificaioncomment.new
+    @notificaioncomment.safe_attributes = params[:notificaioncomment]
+    @notificaioncomment.author = User.current
+    if @contestnotifications.notificaioncomments << @notificaioncomment
+      flash[:notice] = l(:label_comment_added)
+    end
+
+    redirect_to contest_contestnotification_path(@contestnotifications)
+  end
+
+  def destroy
+    @contestnotifications.notificaioncomments.find(params[:notificaioncomment_id]).destroy
+    redirect_to contest_contestnotification_path(@contestnotifications)
+  end
+
+  private
+
+  def find_model_object
+    super
+    @contestnotifications = @object
+    @notificaioncomment = nil
+    @contestnotifications
+  end
+  
+end
diff --git a/app/helpers/notificationcomments_helper.rb b/app/helpers/notificationcomments_helper.rb
new file mode 100644
index 000000000..2d90bfe32
--- /dev/null
+++ b/app/helpers/notificationcomments_helper.rb
@@ -0,0 +1,2 @@
+module NotificationcommentsHelper
+end
diff --git a/app/models/notificationcomments.rb b/app/models/notificationcomments.rb
new file mode 100644
index 000000000..142cef1db
--- /dev/null
+++ b/app/models/notificationcomments.rb
@@ -0,0 +1,11 @@
+class Notificationcomments < ActiveRecord::Base
+  attr_accessible :author_id, :notificationcommented_id, :notificationcommented_type, :notificationcomments
+
+  include Redmine::SafeAttributes
+  belongs_to :notificationcommented, :polymorphic => true, :counter_cache => true
+  belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
+
+  validates_presence_of :notificationcommented, :author, :comments
+
+  safe_attributes 'notificationcomments'
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index c8b02f1a7..daf52d6c4 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -111,6 +111,7 @@ class User < Principal
   has_many :news, :foreign_key => 'author_id'
   has_many :contestnotification, :foreign_key => 'author_id'
   has_many :comments, :foreign_key => 'author_id'
+  has_many :notificationcomments, :foreign_key => 'author_id'  
   has_many :wiki_contents, :foreign_key => 'author_id'
   has_many :journals
   has_many :messages, :foreign_key => 'author_id'
@@ -460,6 +461,9 @@ class User < Principal
     self.pref[:comments_sorting] == 'desc'
   end
 
+  def wants_notificationcomments_in_reverse_order?
+    self.pref[:notificationcomments_sorting] == 'desc'
+  end
   # Return user's RSS key (a 40 chars long string), used to access feeds
   def rss_key
     if rss_token.nil?
@@ -804,6 +808,7 @@ class User < Principal
     substitute = User.anonymous
     Attachment.update_all ['author_id = ?', substitute.id], ['author_id = ?', id]
     Comment.update_all ['author_id = ?', substitute.id], ['author_id = ?', id]
+    Notificationcomment.update_all ['author_id = ?', substitute.id], ['author_id = ?', id]
     Issue.update_all ['author_id = ?', substitute.id], ['author_id = ?', id]
     Issue.update_all 'assigned_to_id = NULL', ['assigned_to_id = ?', id]
     Journal.update_all ['user_id = ?', substitute.id], ['user_id = ?', id]
diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index 5b95386be..e0a541804 100644
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -54,6 +54,9 @@ class UserPreference < ActiveRecord::Base
   def comments_sorting; self[:comments_sorting] end
   def comments_sorting=(order); self[:comments_sorting]=order end
 
+  def notificationcomments_sorting; self[:notificationcomments_sorting] end
+  def notificationcomments_sorting=(order); self[:notificationcomments_sorting]=order end
+
   def warn_on_leaving_unsaved; self[:warn_on_leaving_unsaved] || '1'; end
   def warn_on_leaving_unsaved=(value); self[:warn_on_leaving_unsaved]=value; end
 end
diff --git a/config/routes.rb b/config/routes.rb
index df0501209..a93d17242 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -71,8 +71,8 @@ RedmineApp::Application.routes.draw do
   end
 
   #resources :contestnotifications, :only => [:index, :show, :edit, :update, :destroy]
-  match '/contestnotifications/:id/comments', :to => 'comments#create', :via => :post
-  match '/contestnotifications/:id/comments/:comment_id', :to => 'comments#destroy', :via => :delete
+  match '/contestnotifications/:id/notificationcomments', :to => 'notificationcomments#create', :via => :post
+  match '/contestnotifications/:id/notificationcomments/:notificationcomment_id', :to => 'notificationcomments#destroy', :via => :delete
   match '/contestnotifications/preview', :controller => 'previews', :action => 'contestnotifications', :as => 'preview_contestnotifications', :via => [:get, :post, :put]  
   ## new added by linchun #新竞赛相关
   resources :contests, only: [:index] do
diff --git a/db/migrate/20140401004102_create_relative_memos.rb b/db/migrate/20140401004102_create_relative_memos.rb
index 6f0d776db..04b8862a3 100644
--- a/db/migrate/20140401004102_create_relative_memos.rb
+++ b/db/migrate/20140401004102_create_relative_memos.rb
@@ -4,7 +4,7 @@ class CreateRelativeMemos < ActiveRecord::Migration
       t.integer :osp_id, :null => true
       t.integer :parent_id, null: true
       t.string :subject, null: false
-      t.mediumtext :content, null: false
+      t.text :content, null: false
       t.integer :author_id
       t.integer :replies_count, default: 0
       t.integer :last_reply_id
diff --git a/db/migrate/20140530010015_create_contestnotifications.rb b/db/migrate/20140530010015_create_contestnotifications.rb
index 087c2cf8c..5aa1e2f9f 100644
--- a/db/migrate/20140530010015_create_contestnotifications.rb
+++ b/db/migrate/20140530010015_create_contestnotifications.rb
@@ -6,7 +6,7 @@ class CreateContestnotifications < ActiveRecord::Migration
       t.string :summary
       t.string :description
       t.integer :author_id
-      t.integer :comments_count
+      t.integer :notificationcomments_count
 
       t.timestamps
     end
diff --git a/db/migrate/20140605003915_create_notificationcomments.rb b/db/migrate/20140605003915_create_notificationcomments.rb
new file mode 100644
index 000000000..58588d0a5
--- /dev/null
+++ b/db/migrate/20140605003915_create_notificationcomments.rb
@@ -0,0 +1,12 @@
+class CreateNotificationcomments < ActiveRecord::Migration
+  def change
+    create_table :notificationcomments do |t|
+      t.string :notificationcommented_type
+      t.integer :notificationcommented_id
+      t.integer :author_id
+      t.text :notificationcomments
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index f750f247f..3573c188f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140530010015) do
+ActiveRecord::Schema.define(:version => 20140605003915) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -50,12 +50,18 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
     t.datetime "created_on"
     t.string   "description"
     t.string   "disk_directory"
+    t.integer  "attachtype",                   :default => 1
   end
 
   add_index "attachments", ["author_id"], :name => "index_attachments_on_author_id"
   add_index "attachments", ["container_id", "container_type"], :name => "index_attachments_on_container_id_and_container_type"
   add_index "attachments", ["created_on"], :name => "index_attachments_on_created_on"
 
+  create_table "attachmentstypes", :force => true do |t|
+    t.integer "typeId",                 :null => false
+    t.string  "typeName", :limit => 50
+  end
+
   create_table "auth_sources", :force => true do |t|
     t.string  "type",              :limit => 30, :default => "",    :null => false
     t.string  "name",              :limit => 60, :default => "",    :null => false
@@ -76,20 +82,6 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
 
   add_index "auth_sources", ["id", "type"], :name => "index_auth_sources_on_id_and_type"
 
-  create_table "bak_mentioned", :primary_key => "Id", :force => true do |t|
-    t.string  "this_real_name",  :limit => 1000
-    t.integer "is_mentioned_in"
-    t.string  "context",         :limit => 2000
-  end
-
-  add_index "bak_mentioned", ["this_real_name", "is_mentioned_in"], :name => "name_mention", :length => {"this_real_name"=>900, "is_mentioned_in"=>nil}
-  add_index "bak_mentioned", ["this_real_name"], :name => "this_real_name"
-  add_index "bak_mentioned", ["this_real_name"], :name => "this_real_name_2"
-  add_index "bak_mentioned", ["this_real_name"], :name => "this_real_name_3", :length => {"this_real_name"=>900}
-  add_index "bak_mentioned", ["this_real_name"], :name => "this_real_name_4"
-  add_index "bak_mentioned", ["this_real_name"], :name => "this_real_name_5"
-  add_index "bak_mentioned", ["this_real_name"], :name => "this_real_name_6"
-
   create_table "biding_projects", :force => true do |t|
     t.integer  "project_id"
     t.integer  "bid_id"
@@ -129,9 +121,12 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
   add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id"
   add_index "boards", ["project_id"], :name => "boards_project_id"
 
-  create_table "categories", :primary_key => "Id", :force => true do |t|
-    t.integer "proj_id",         :default => 0, :null => false
-    t.text    "proj_categories"
+  create_table "bug_to_osps", :force => true do |t|
+    t.integer  "osp_id"
+    t.integer  "relative_memo_id"
+    t.string   "description"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
   end
 
   create_table "changes", :force => true do |t|
@@ -216,9 +211,9 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
     t.string   "summary"
     t.string   "description"
     t.integer  "author_id"
-    t.integer  "comments_count"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
+    t.integer  "notificationcomments_count"
+    t.datetime "created_at",                 :null => false
+    t.datetime "updated_at",                 :null => false
   end
 
   create_table "contests", :force => true do |t|
@@ -309,14 +304,6 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
   add_index "documents", ["created_on"], :name => "index_documents_on_created_on"
   add_index "documents", ["project_id"], :name => "documents_project_id"
 
-  create_table "eco_projects", :force => true do |t|
-    t.integer  "proj_id",        :default => 0, :null => false
-    t.integer  "eco_proj_id"
-    t.datetime "date_collected"
-  end
-
-  add_index "eco_projects", ["proj_id"], :name => "proj_id"
-
   create_table "enabled_modules", :force => true do |t|
     t.integer "project_id"
     t.string  "name",       :null => false
@@ -338,137 +325,6 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
   add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type"
   add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id"
 
-  create_table "events", :primary_key => "event_id", :force => true do |t|
-    t.string   "job_name"
-    t.datetime "event_time"
-    t.string   "event_type", :limit => 20
-  end
-
-  create_table "fm_article", :force => true do |t|
-    t.integer  "proj_id",                            :default => 0, :null => false
-    t.text     "article_title",  :limit => 16777215
-    t.text     "article_link",   :limit => 16777215
-    t.text     "article_time",   :limit => 16777215
-    t.datetime "date_collected"
-  end
-
-  add_index "fm_article", ["proj_id"], :name => "proj_id"
-
-  create_table "fm_bugtracker_link", :force => true do |t|
-    t.integer  "proj_id",                            :default => 0, :null => false
-    t.text     "description",    :limit => 16777215
-    t.datetime "date_collected"
-  end
-
-  add_index "fm_bugtracker_link", ["proj_id"], :name => "proj_id"
-
-  create_table "fm_datametric_link", :force => true do |t|
-    t.integer  "proj_id",                            :default => 0, :null => false
-    t.text     "description",    :limit => 16777215
-    t.datetime "date_collected"
-  end
-
-  add_index "fm_datametric_link", ["proj_id"], :name => "proj_id"
-
-  create_table "fm_dependency_link", :force => true do |t|
-    t.integer  "proj_id",                            :default => 0, :null => false
-    t.text     "description",    :limit => 16777215
-    t.datetime "date_collected"
-  end
-
-  add_index "fm_dependency_link", ["proj_id"], :name => "proj_id"
-
-  create_table "fm_download_link", :force => true do |t|
-    t.integer  "proj_id",                            :default => 0, :null => false
-    t.text     "download_link",  :limit => 16777215
-    t.datetime "date_collected"
-  end
-
-  add_index "fm_download_link", ["proj_id"], :name => "proj_id"
-
-  create_table "fm_heartbeat", :force => true do |t|
-    t.integer  "proj_id",                        :default => 0, :null => false
-    t.float    "popularity_score", :limit => 12
-    t.float    "vitality_score",   :limit => 12
-    t.integer  "subscription"
-    t.integer  "voting_score"
-    t.integer  "voting_count"
-    t.datetime "date_collected"
-  end
-
-  add_index "fm_heartbeat", ["proj_id"], :name => "proj_id"
-
-  create_table "fm_license", :force => true do |t|
-    t.integer  "proj_id",                            :default => 0, :null => false
-    t.text     "description",    :limit => 16777215
-    t.datetime "date_collected"
-  end
-
-  add_index "fm_license", ["proj_id"], :name => "proj_id"
-
-  create_table "fm_mailinglist_link", :force => true do |t|
-    t.integer  "proj_id",                            :default => 0, :null => false
-    t.text     "description",    :limit => 16777215
-    t.datetime "date_collected"
-  end
-
-  add_index "fm_mailinglist_link", ["proj_id"], :name => "proj_id"
-
-  create_table "fm_operating_system", :force => true do |t|
-    t.integer  "proj_id",                            :default => 0, :null => false
-    t.text     "description",    :limit => 16777215
-    t.datetime "date_collected"
-  end
-
-  add_index "fm_operating_system", ["proj_id"], :name => "proj_id"
-
-  create_table "fm_programming_language", :force => true do |t|
-    t.integer  "proj_id",                            :default => 0, :null => false
-    t.text     "description",    :limit => 16777215
-    t.datetime "date_collected"
-  end
-
-  add_index "fm_programming_language", ["proj_id"], :name => "proj_id"
-
-  create_table "fm_project_spotlight", :force => true do |t|
-    t.integer  "proj_id",                                    :default => 0, :null => false
-    t.text     "description",            :limit => 16777215
-    t.text     "project_name",           :limit => 16777215
-    t.text     "project_spotlight_link", :limit => 16777215
-    t.datetime "date_collected"
-  end
-
-  add_index "fm_project_spotlight", ["proj_id"], :name => "proj_id"
-
-  create_table "fm_release", :force => true do |t|
-    t.integer  "proj_id",                             :default => 0, :null => false
-    t.text     "description",     :limit => 16777215
-    t.text     "release_version", :limit => 16777215
-    t.text     "release_time",    :limit => 16777215
-    t.text     "release_tag",     :limit => 16777215
-    t.datetime "date_collected"
-  end
-
-  add_index "fm_release", ["proj_id"], :name => "proj_id"
-
-  create_table "fm_submit", :force => true do |t|
-    t.integer  "proj_id",                            :default => 0, :null => false
-    t.text     "submitter",      :limit => 16777215
-    t.text     "submitter_link", :limit => 16777215
-    t.text     "submit_time",    :limit => 16777215
-    t.datetime "date_collected"
-  end
-
-  add_index "fm_submit", ["proj_id"], :name => "proj_id"
-
-  create_table "fm_summary", :force => true do |t|
-    t.integer  "proj_id",                            :default => 0, :null => false
-    t.text     "description",    :limit => 16777215
-    t.datetime "date_collected"
-  end
-
-  add_index "fm_summary", ["proj_id"], :name => "proj_id"
-
   create_table "forums", :force => true do |t|
     t.string   "name",                         :null => false
     t.string   "description",  :default => ""
@@ -490,9 +346,12 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
   create_table "homework_attaches", :force => true do |t|
     t.integer  "bid_id"
     t.integer  "user_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
     t.string   "reward"
+    t.string   "name"
+    t.string   "description"
+    t.integer  "state"
   end
 
   create_table "homework_for_courses", :force => true do |t|
@@ -500,6 +359,13 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
     t.integer "bid_id"
   end
 
+  create_table "homework_users", :force => true do |t|
+    t.string   "homework_attach_id"
+    t.string   "user_id"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
   create_table "issue_categories", :force => true do |t|
     t.integer "project_id",                   :default => 0,  :null => false
     t.string  "name",           :limit => 30, :default => "", :null => false
@@ -709,14 +575,15 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
     t.datetime "updated_at",  :null => false
   end
 
-  create_table "ohloh_tagged", :force => true do |t|
-    t.integer  "proj_id",                       :default => 0, :null => false
-    t.string   "description",    :limit => 100,                :null => false
-    t.datetime "date_collected"
+  create_table "notificationcomments", :force => true do |t|
+    t.string   "notificationcommented_type"
+    t.integer  "notificationcommented_id"
+    t.integer  "author_id"
+    t.text     "notificationcomments"
+    t.datetime "created_at",                 :null => false
+    t.datetime "updated_at",                 :null => false
   end
 
-  add_index "ohloh_tagged", ["proj_id"], :name => "proj_id"
-
   create_table "open_id_authentication_associations", :force => true do |t|
     t.integer "issued"
     t.integer "lifetime"
@@ -740,7 +607,7 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
     t.integer  "users_count",      :default => 0
     t.date     "last_commit_time"
     t.string   "url"
-    t.datetime "date_collected"
+    t.date     "date_collected"
     t.datetime "created_at",                      :null => false
     t.datetime "updated_at",                      :null => false
   end
@@ -781,6 +648,14 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
 
   add_index "project_statuses", ["grade"], :name => "index_project_statuses_on_grade"
 
+  create_table "projecting_softapplictions", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "softapplication_id"
+    t.integer  "project_id"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
   create_table "projects", :force => true do |t|
     t.string   "name",            :default => "",    :null => false
     t.text     "description"
@@ -796,6 +671,8 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
     t.boolean  "inherit_members", :default => false, :null => false
     t.integer  "project_type"
     t.boolean  "hidden_repo",     :default => false, :null => false
+    t.integer  "attachmenttype",  :default => 1
+    t.integer  "user_id"
   end
 
   add_index "projects", ["lft"], :name => "index_projects_on_lft"
@@ -824,8 +701,15 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
   add_index "queries", ["project_id"], :name => "index_queries_on_project_id"
   add_index "queries", ["user_id"], :name => "index_queries_on_user_id"
 
+  create_table "relative_memo_to_open_source_projects", :force => true do |t|
+    t.integer  "osp_id"
+    t.integer  "relative_memo_id"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
+  end
+
   create_table "relative_memos", :force => true do |t|
-    t.integer  "osp_id",                                :null => false
+    t.integer  "osp_id"
     t.integer  "parent_id"
     t.string   "subject",                               :null => false
     t.text     "content",                               :null => false
@@ -840,6 +724,10 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
     t.integer  "viewed_count_crawl", :default => 0
     t.integer  "viewed_count_local", :default => 0
     t.string   "url"
+    t.string   "username"
+    t.string   "userhomeurl"
+    t.date     "date_collected"
+    t.string   "topic_resource"
   end
 
   create_table "repositories", :force => true do |t|
@@ -872,6 +760,7 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
     t.string   "province"
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
+    t.string   "logo_link"
   end
 
   create_table "seems_rateable_cached_ratings", :force => true do |t|
@@ -907,11 +796,10 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
     t.string   "url"
     t.string   "title"
     t.integer  "share_type"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
     t.integer  "project_id"
     t.integer  "user_id"
-    t.string   "description"
   end
 
   create_table "softapplications", :force => true do |t|
@@ -927,6 +815,9 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
     t.integer  "softapplication_id"
     t.integer  "is_public"
     t.string   "application_developers"
+    t.string   "deposit_project_url"
+    t.string   "deposit_project"
+    t.integer  "project_id"
   end
 
   create_table "students_for_courses", :force => true do |t|
@@ -936,14 +827,6 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
     t.datetime "updated_at", :null => false
   end
 
-  create_table "t_project_to_os_projects", :force => true do |t|
-    t.integer  "crawl_proj_id"
-    t.string   "crawl_proj_web"
-    t.integer  "trustie_osp_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-  end
-
   create_table "taggings", :force => true do |t|
     t.integer  "tag_id"
     t.integer  "taggable_id"
@@ -1002,22 +885,6 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
   add_index "tokens", ["user_id"], :name => "index_tokens_on_user_id"
   add_index "tokens", ["value"], :name => "tokens_value", :unique => true
 
-  create_table "tprojects", :force => true do |t|
-    t.string   "name",             :limit => 1000,     :default => "0"
-    t.text     "description",      :limit => 16777215
-    t.string   "commit_count",     :limit => 100,      :default => "0"
-    t.string   "code_line",        :limit => 100
-    t.string   "last_commit_time", :limit => 100
-    t.string   "url",              :limit => 1000
-    t.datetime "date_collected"
-    t.string   "created_at",       :limit => 100
-    t.string   "updated_at",       :limit => 100
-    t.integer  "proj_id",                                               :null => false
-    t.string   "user_count",       :limit => 100
-  end
-
-  add_index "tprojects", ["proj_id"], :name => "proj_id"
-
   create_table "trackers", :force => true do |t|
     t.string  "name",          :limit => 30, :default => "",    :null => false
     t.boolean "is_in_chlog",                 :default => false, :null => false
@@ -1037,8 +904,8 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
     t.integer  "zip_code"
     t.datetime "created_at",         :null => false
     t.datetime "updated_at",         :null => false
-    t.string   "technical_title"
     t.integer  "identity"
+    t.string   "technical_title"
     t.string   "student_id"
     t.string   "teacher_realname"
     t.string   "student_realname"
@@ -1058,6 +925,11 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
   add_index "user_grades", ["project_id"], :name => "index_user_grades_on_project_id"
   add_index "user_grades", ["user_id"], :name => "index_user_grades_on_user_id"
 
+  create_table "user_levels", :force => true do |t|
+    t.integer "user_id"
+    t.integer "level"
+  end
+
   create_table "user_preferences", :force => true do |t|
     t.integer "user_id",   :default => 0,     :null => false
     t.text    "others"
@@ -1068,16 +940,11 @@ ActiveRecord::Schema.define(:version => 20140530010015) do
   add_index "user_preferences", ["user_id"], :name => "index_user_preferences_on_user_id"
 
   create_table "user_scores", :force => true do |t|
-    t.integer  "user_id",       :null => false
-    t.integer  "collaboration"
-    t.integer  "influence"
-    t.integer  "skill"
-    t.integer  "active"
-    t.datetime "created_at",    :null => false
-    t.datetime "updated_at",    :null => false
-    t.integer  "level"
-    t.integer  "file"
-    t.integer  "issue"
+    t.integer "user_id"
+    t.integer "collaboration"
+    t.integer "influence"
+    t.integer "skill"
+    t.integer "activity"
   end
 
   create_table "user_statuses", :force => true do |t|
diff --git a/test/fixtures/notificationcomments.yml b/test/fixtures/notificationcomments.yml
new file mode 100644
index 000000000..54c42b849
--- /dev/null
+++ b/test/fixtures/notificationcomments.yml
@@ -0,0 +1,13 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
+
+one:
+  notificationcommented_type: MyString
+  notificationcommented_id: 1
+  author_id: 1
+  notificationcomments: MyText
+
+two:
+  notificationcommented_type: MyString
+  notificationcommented_id: 1
+  author_id: 1
+  notificationcomments: MyText
diff --git a/test/functional/notificationcomments_controller_test.rb b/test/functional/notificationcomments_controller_test.rb
new file mode 100644
index 000000000..21496467e
--- /dev/null
+++ b/test/functional/notificationcomments_controller_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class NotificationcommentsControllerTest < ActionController::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/unit/helpers/notificationcomments_helper_test.rb b/test/unit/helpers/notificationcomments_helper_test.rb
new file mode 100644
index 000000000..ecec0cbde
--- /dev/null
+++ b/test/unit/helpers/notificationcomments_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class NotificationcommentsHelperTest < ActionView::TestCase
+end
diff --git a/test/unit/notificationcomments_test.rb b/test/unit/notificationcomments_test.rb
new file mode 100644
index 000000000..798084efb
--- /dev/null
+++ b/test/unit/notificationcomments_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class NotificationcommentsTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

From 8b78929190f87edfbded67f4032205abd79b252f Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Thu, 5 Jun 2014 11:02:32 +0800
Subject: [PATCH 20/62] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AB=9E=E8=B5=9B?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E4=B8=AD=E8=AF=84=E8=AE=BA=E7=9A=84=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../notificationcomments_controller.rb        |  2 +-
 app/models/contestnotification.rb             |  4 +--
 app/views/contestnotifications/_news.html.erb |  2 +-
 app/views/contestnotifications/index.html.erb |  2 +-
 app/views/contestnotifications/show.html.erb  | 30 +++++++++----------
 db/schema.rb                                  | 17 ++++++-----
 lib/redmine.rb                                |  4 +--
 7 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/app/controllers/notificationcomments_controller.rb b/app/controllers/notificationcomments_controller.rb
index 78272aae1..e0c5adf72 100644
--- a/app/controllers/notificationcomments_controller.rb
+++ b/app/controllers/notificationcomments_controller.rb
@@ -6,7 +6,7 @@ class NotificationcommentsController < ApplicationController
   before_filter :authorize
 
   def create
-    raise Unauthorized unless @contestnotifications.commentable?
+    raise Unauthorized unless @contestnotifications.notificationcommentable?
 
     @notificaioncomment = Notificaioncomment.new
     @notificaioncomment.safe_attributes = params[:notificaioncomment]
diff --git a/app/models/contestnotification.rb b/app/models/contestnotification.rb
index a055d3000..cba9dfa0c 100644
--- a/app/models/contestnotification.rb
+++ b/app/models/contestnotification.rb
@@ -36,8 +36,8 @@ class Contestnotification < ActiveRecord::Base
   end
 
   # Returns true if the news can be commented by user
-  def commentable?(user=User.current)
-    user.allowed_to?(:comment_contestnotifications, contest)
+  def notificationcommentable?(user=User.current)
+    user.allowed_to?(:notificationcomment_contestnotifications, contest)
   end
 
   def recipients
diff --git a/app/views/contestnotifications/_news.html.erb b/app/views/contestnotifications/_news.html.erb
index 1621c5813..301a193d8 100644
--- a/app/views/contestnotifications/_news.html.erb
+++ b/app/views/contestnotifications/_news.html.erb
@@ -20,7 +20,7 @@
       <tr>
         <td align="left"><a class="font_lighter"> <%= contestnotifications.created_at %></a></td>
         <td width="200" align="right" class="a"><%= link_to l(:label_project_newother),contest_contestnotification_path(contestnotifications)%>
-        	<%= "(#{l(:label_x_comments, :count => contestnotifications.comments_count)})" if contestnotifications.comments_count > 0 %>
+        	<%= "(#{l(:label_x_comments, :count => contestnotifications.notificationcomments_count)})" if contestnotifications.notificationcomments_count > 0 %>
         </td>
       </tr>
     </table></td>
diff --git a/app/views/contestnotifications/index.html.erb b/app/views/contestnotifications/index.html.erb
index c9ce1622d..93d4aaf1f 100644
--- a/app/views/contestnotifications/index.html.erb
+++ b/app/views/contestnotifications/index.html.erb
@@ -48,7 +48,7 @@
                   <tr>
                     <td align="left"><span class="font_lighter"> <%= l :label_update_time %>
                       &nbsp;<%= format_time(contestnotifications.created_at) %></span></td>
-                    <td width="350" align="right" class="a"><%= link_to l(:label_project_newother), contest_contestnotification_path(@contest, contestnotifications) %><%= "(#{l(:label_x_comments, :count => contestnotifications.comments.count)})" if(contestnotifications.comments.count >= 0)%></td>
+                    <td width="350" align="right" class="a"><%= link_to l(:label_project_newother), contest_contestnotification_path(@contest, contestnotifications) %><%= "(#{l(:label_x_comments, :count => contestnotifications.notificationcomments.count)})" if(contestnotifications.notificationcomments.count >= 0)%></td>
                   </tr>
                 </table>
               </td>
diff --git a/app/views/contestnotifications/show.html.erb b/app/views/contestnotifications/show.html.erb
index 517f60bca..a9ba5f513 100644
--- a/app/views/contestnotifications/show.html.erb
+++ b/app/views/contestnotifications/show.html.erb
@@ -60,7 +60,7 @@
 </div>
 <% end %>
 
-<div id="comments" style="margin-bottom:16px;">
+<div id="notificationcomments" style="margin-bottom:16px;">
 
 	<div style="margin:15px">
 		<span class="font_description"> <%= textilizable(@contestnotifications, :description) %> </span>
@@ -68,13 +68,13 @@
 		<%= link_to_attachments @contestnotifications %>
 		<br/>
 		<!--add comment-->
-		<% if @contestnotifications.commentable? %>
+		<% if @contestnotifications.notificationcommentable? %>
 		<p>
-			<%= toggle_link l(:label_comment_add), "add_comment_form", :focus => "comment_comments" %>
+			<%= toggle_link l(:label_comment_add), "add_notificationcomment_form", :focus => "comment_comments" %>
 		</p>
-		<%= form_tag({:controller => 'comments', :action => 'create', :id => @contestnotifications}, :id => "add_comment_form", :style => "display:none;") do %>
+		<%= form_tag({:controller => 'notificationcomments', :action => 'create', :id => @contestnotifications}, :id => "add_notificationcomment_form", :style => "display:none;") do %>
 		<div class="box">
-			<%= text_area 'comment', 'comments', :cols => 80, :rows => 15, :class => 'wiki-edit' %>
+			<%= text_area 'notificationcomment', 'notificationcomments', :cols => 80, :rows => 15, :class => 'wiki-edit' %>
 			<%= wikitoolbar_for 'comment_comments' %>
 		</div>
 		<p>
@@ -92,33 +92,33 @@
 		<!--dispaly comments-->
 		<div  class="line_heng"></div>
 	</div>
-	<h3 class="comments"><%= l(:label_comment_plural) %></h3>
-	<% comments = @comments.reverse %>
-	<% comments.each do |comment| %>
-	<% next if comment.new_record? %>
+	<h3 class="notificationcomments"><%= l(:label_comment_plural) %></h3>
+	<% notificationcomments = @notificationcomments.reverse %>
+	<% notificationcomments.each do |notificationcomment| %>
+	<% next if notificationcomment.new_record? %>
 	<table width="660px" border="0" align="center">
 		<tr>
-			<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(comment.author), :class => "avatar")%></td>
+			<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(notificationcomment.author), :class => "avatar")%></td>
 			<td>
 			<table width="580px" border="0">
 				<tr>
-					<td colspan="2" valign="top"><strong><%= link_to_user(comment.author) if comment.respond_to?(:author) %> </strong><span class="font_lighter"><%= l(:label_project_newadd) %></span><%= l(:label_comment_plural) %></td>
+					<td colspan="2" valign="top"><strong><%= link_to_user(notificationcomment.author) if notificationcomment.respond_to?(:author) %> </strong><span class="font_lighter"><%= l(:label_project_newadd) %></span><%= l(:label_comment_plural) %></td>
 				</tr>
 				<tr>
 					<td colspan="2" width="580px" >
 					<p class="font_description">
-						<%= textilizable(comment.comments) %>
+						<%= textilizable(notificationcomment.notificationcomments) %>
 					</p></td>
 				</tr>
 				<tr>
-					<td align="left"><span class="font_lighter"> <%= format_time(comment.created_on) %></span></td>
-					<td width="200" align="right" class="a"><%= link_to_if_authorized image_tag('delete.png'), {:controller => 'comments', :action => 'destroy', :id => @contestnotifications, :comment_id => comment},
+					<td align="left"><span class="font_lighter"> <%= format_time(notificationcomment.created_at) %></span></td>
+					<td width="200" align="right" class="a"><%= link_to_if_authorized image_tag('delete.png'), {:controller => 'notificationcomments', :action => 'destroy', :id => @contestnotifications, :notificationcomment_id => notificationcomment},
 					:data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %></td>
 				</tr>
 			</table></td>
 		</tr>
 	</table>
-	<% end if @comments.any? %>
+	<% end if @notificationcomments.any? %>
 </div>
 
 <!--end-->
diff --git a/db/schema.rb b/db/schema.rb
index 3573c188f..50d8e823f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -211,9 +211,9 @@ ActiveRecord::Schema.define(:version => 20140605003915) do
     t.string   "summary"
     t.string   "description"
     t.integer  "author_id"
-    t.integer  "notificationcomments_count"
-    t.datetime "created_at",                 :null => false
-    t.datetime "updated_at",                 :null => false
+    t.integer  "comments_count"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
   end
 
   create_table "contests", :force => true do |t|
@@ -671,8 +671,8 @@ ActiveRecord::Schema.define(:version => 20140605003915) do
     t.boolean  "inherit_members", :default => false, :null => false
     t.integer  "project_type"
     t.boolean  "hidden_repo",     :default => false, :null => false
-    t.integer  "attachmenttype",  :default => 1
     t.integer  "user_id"
+    t.integer  "attachmenttype",  :default => 1
   end
 
   add_index "projects", ["lft"], :name => "index_projects_on_lft"
@@ -709,7 +709,7 @@ ActiveRecord::Schema.define(:version => 20140605003915) do
   end
 
   create_table "relative_memos", :force => true do |t|
-    t.integer  "osp_id"
+    t.integer  "osp_id",                                :null => false
     t.integer  "parent_id"
     t.string   "subject",                               :null => false
     t.text     "content",                               :null => false
@@ -796,10 +796,11 @@ ActiveRecord::Schema.define(:version => 20140605003915) do
     t.string   "url"
     t.string   "title"
     t.integer  "share_type"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
     t.integer  "project_id"
     t.integer  "user_id"
+    t.string   "description"
   end
 
   create_table "softapplications", :force => true do |t|
@@ -904,8 +905,8 @@ ActiveRecord::Schema.define(:version => 20140605003915) do
     t.integer  "zip_code"
     t.datetime "created_at",         :null => false
     t.datetime "updated_at",         :null => false
-    t.integer  "identity"
     t.string   "technical_title"
+    t.integer  "identity"
     t.string   "student_id"
     t.string   "teacher_realname"
     t.string   "student_realname"
diff --git a/lib/redmine.rb b/lib/redmine.rb
index c612fd89e..71fbfed5b 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -148,9 +148,9 @@ Redmine::AccessControl.map do |map|
   end
 
   map.contest_module :contestnotifications do |map|
-    map.permission :manage_contestnotifications, {:contestnotifications => [:new, :create, :edit, :update, :destroy], :comments => [:destroy]}, :require => :member
+    map.permission :manage_contestnotifications, {:contestnotifications => [:new, :create, :edit, :update, :destroy], :notificationcomments => [:destroy]}, :require => :member
     map.permission :view_contestnotifications, {:contestnotifications => [:index, :show]}, :public => true, :read => true
-    map.permission :comment_contestnotifications, {:comments => :create}
+    map.permission :notificationcomment_contestnotifications, {:notificationcomments => :create}
   end
 
   map.project_module :documents do |map|

From 982bf17ebc0cb25df6e00793f748825ee067a44d Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Thu, 5 Jun 2014 11:19:59 +0800
Subject: [PATCH 21/62] dfd

---
 app/models/contestnotification.rb            | 4 ++--
 app/models/notificationcomments.rb           | 2 +-
 app/views/contestnotifications/show.html.erb | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/models/contestnotification.rb b/app/models/contestnotification.rb
index cba9dfa0c..04ceb93c2 100644
--- a/app/models/contestnotification.rb
+++ b/app/models/contestnotification.rb
@@ -1,10 +1,10 @@
 class Contestnotification < ActiveRecord::Base
-  attr_accessible :author_id, :comments_count, :contest_id, :description, :summary, :title
+  attr_accessible :author_id, :notificationcomments_count, :contest_id, :description, :summary, :title
 
   include Redmine::SafeAttributes
   belongs_to :contest
   belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
-  has_many :comments, :as => :commented, :dependent => :delete_all, :order => "created_at"
+  has_many :notificationcomments, :as => :notificationcommented, :dependent => :delete_all, :order => "created_at"
   # fq
   has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
   
diff --git a/app/models/notificationcomments.rb b/app/models/notificationcomments.rb
index 142cef1db..1aad7c7e3 100644
--- a/app/models/notificationcomments.rb
+++ b/app/models/notificationcomments.rb
@@ -5,7 +5,7 @@ class Notificationcomments < ActiveRecord::Base
   belongs_to :notificationcommented, :polymorphic => true, :counter_cache => true
   belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
 
-  validates_presence_of :notificationcommented, :author, :comments
+  validates_presence_of :notificationcommented, :author, :notificationcomments
 
   safe_attributes 'notificationcomments'
 end
diff --git a/app/views/contestnotifications/show.html.erb b/app/views/contestnotifications/show.html.erb
index a9ba5f513..bd4c8a4f8 100644
--- a/app/views/contestnotifications/show.html.erb
+++ b/app/views/contestnotifications/show.html.erb
@@ -70,12 +70,12 @@
 		<!--add comment-->
 		<% if @contestnotifications.notificationcommentable? %>
 		<p>
-			<%= toggle_link l(:label_comment_add), "add_notificationcomment_form", :focus => "comment_comments" %>
+			<%= toggle_link l(:label_comment_add), "add_notificationcomment_form", :focus => "notificationcomment_notificationcomments" %>
 		</p>
 		<%= form_tag({:controller => 'notificationcomments', :action => 'create', :id => @contestnotifications}, :id => "add_notificationcomment_form", :style => "display:none;") do %>
 		<div class="box">
 			<%= text_area 'notificationcomment', 'notificationcomments', :cols => 80, :rows => 15, :class => 'wiki-edit' %>
-			<%= wikitoolbar_for 'comment_comments' %>
+			<%= wikitoolbar_for 'notificationcomment_notificationcomments' %>
 		</div>
 		<p>
 			<%= submit_tag l(:button_add) %>

From f17c01010f32b7d62b4de711d1abd30715812859 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Thu, 5 Jun 2014 11:58:59 +0800
Subject: [PATCH 22/62] werew

---
 app/models/contestnotification.rb             | 2 +-
 app/views/contestnotifications/index.html.erb | 2 +-
 app/views/news/index.html.erb                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/contestnotification.rb b/app/models/contestnotification.rb
index 04ceb93c2..2f09e7f9c 100644
--- a/app/models/contestnotification.rb
+++ b/app/models/contestnotification.rb
@@ -1,5 +1,5 @@
 class Contestnotification < ActiveRecord::Base
-  attr_accessible :author_id, :notificationcomments_count, :contest_id, :description, :summary, :title
+  #attr_accessible :author_id, :notificationcomments_count, :contest_id, :description, :summary, :title
 
   include Redmine::SafeAttributes
   belongs_to :contest
diff --git a/app/views/contestnotifications/index.html.erb b/app/views/contestnotifications/index.html.erb
index 93d4aaf1f..f4354a099 100644
--- a/app/views/contestnotifications/index.html.erb
+++ b/app/views/contestnotifications/index.html.erb
@@ -48,7 +48,7 @@
                   <tr>
                     <td align="left"><span class="font_lighter"> <%= l :label_update_time %>
                       &nbsp;<%= format_time(contestnotifications.created_at) %></span></td>
-                    <td width="350" align="right" class="a"><%= link_to l(:label_project_newother), contest_contestnotification_path(@contest, contestnotifications) %><%= "(#{l(:label_x_comments, :count => contestnotifications.notificationcomments.count)})" if(contestnotifications.notificationcomments.count >= 0)%></td>
+                    <td width="350" align="right" class="a"><%= link_to l(:label_project_newother), contest_contestnotification_path(@contest, contestnotifications) %><%= "(#{l(:label_x_comments, :count => contestnotifications.notificationcomments_count)})" if(contestnotifications.notificationcomments_count >= 0)%></td>
                   </tr>
                 </table>
               </td>
diff --git a/app/views/news/index.html.erb b/app/views/news/index.html.erb
index 4dfa21d52..58b3aa43f 100644
--- a/app/views/news/index.html.erb
+++ b/app/views/news/index.html.erb
@@ -64,7 +64,7 @@
                   <tr>
                     <td align="left"><span class="font_lighter"> <%= l :label_update_time %>
                       ：&nbsp;<%= format_time(news.created_on) %></span></td>
-                    <td width="350" align="right" class="a"><%= link_to l(:label_project_newother), news_path(news) %><%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count >= 0 %></td>
+                    
                   </tr>
                 </table>
               </td>

From 6abdce1e5918869133ef2c29d4bfbf5dc739a653 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Thu, 5 Jun 2014 14:13:27 +0800
Subject: [PATCH 23/62] sdf

---
 db/schema.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index 50d8e823f..7dbc54f02 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -211,9 +211,9 @@ ActiveRecord::Schema.define(:version => 20140605003915) do
     t.string   "summary"
     t.string   "description"
     t.integer  "author_id"
-    t.integer  "comments_count"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
+    t.integer  "notificationcomments_count"
+    t.datetime "created_at",                 :null => false
+    t.datetime "updated_at",                 :null => false
   end
 
   create_table "contests", :force => true do |t|

From f1555bf134a06a202db4e37468515e6f4251f390 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Thu, 5 Jun 2014 14:58:24 +0800
Subject: [PATCH 24/62] dfg

---
 app/controllers/application_controller.rb     | 4 ++--
 app/views/contestnotifications/index.html.erb | 2 +-
 app/views/news/index.html.erb                 | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 27829fa08..9eadda027 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -296,9 +296,9 @@ class ApplicationController < ActionController::Base
   end
   
   def find_contest_from_association
-    render_404 unless @contest.present?
+    render_404 unless @object.present?
 
-    @contest = @contest.contest
+    @contest =@object.contest
   end
 
   def find_model_object
diff --git a/app/views/contestnotifications/index.html.erb b/app/views/contestnotifications/index.html.erb
index f4354a099..195257237 100644
--- a/app/views/contestnotifications/index.html.erb
+++ b/app/views/contestnotifications/index.html.erb
@@ -48,7 +48,7 @@
                   <tr>
                     <td align="left"><span class="font_lighter"> <%= l :label_update_time %>
                       &nbsp;<%= format_time(contestnotifications.created_at) %></span></td>
-                    <td width="350" align="right" class="a"><%= link_to l(:label_project_newother), contest_contestnotification_path(@contest, contestnotifications) %><%= "(#{l(:label_x_comments, :count => contestnotifications.notificationcomments_count)})" if(contestnotifications.notificationcomments_count >= 0)%></td>
+                    <td width="350" align="right" class="a"><%= link_to l(:label_project_newother), contest_contestnotification_path(@contest, contestnotifications) %><%#= "(#{l(:label_x_comments, :count => contestnotifications.notificationcomments_count)})" if contestnotifications.notificationcomments_count >= 0 %></td>
                   </tr>
                 </table>
               </td>
diff --git a/app/views/news/index.html.erb b/app/views/news/index.html.erb
index 58b3aa43f..4dfa21d52 100644
--- a/app/views/news/index.html.erb
+++ b/app/views/news/index.html.erb
@@ -64,7 +64,7 @@
                   <tr>
                     <td align="left"><span class="font_lighter"> <%= l :label_update_time %>
                       ：&nbsp;<%= format_time(news.created_on) %></span></td>
-                    
+                    <td width="350" align="right" class="a"><%= link_to l(:label_project_newother), news_path(news) %><%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count >= 0 %></td>
                   </tr>
                 </table>
               </td>

From 0255a61d2f4d1dba0a1904c50cab613c07e6129d Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Thu, 5 Jun 2014 15:23:58 +0800
Subject: [PATCH 25/62] dfg

---
 app/helpers/application_helper.rb            |  7 +++++++
 app/views/contestnotifications/index.api.rsb | 14 ++++++++++++++
 app/views/contestnotifications/show.html.erb | 14 +++++++-------
 3 files changed, 28 insertions(+), 7 deletions(-)
 create mode 100644 app/views/contestnotifications/index.api.rsb

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index fd1f6f162..f558f1e7a 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -46,6 +46,10 @@ module ApplicationHelper
   def authorize_for(controller, action)
     User.current.allowed_to?({:controller => controller, :action => action}, @project)
   end
+  
+  def authorize_for_contest(controller, action)
+    User.current.allowed_to?({:controller => controller, :action => action}, @contest)
+  end 
 
   # Display a link if user is authorized
   #
@@ -57,6 +61,9 @@ module ApplicationHelper
     link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(options[:controller] || params[:controller], options[:action])
   end
 
+  def link_to_if_authorized_contest(name, options = {}, html_options = nil, *parameters_for_method_reference)
+    link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for_contest(options[:controller] || params[:controller], options[:action])
+  end
   # Displays a link to user's account page if active
   def link_to_user(user, options={})
     if user.is_a?(User)
diff --git a/app/views/contestnotifications/index.api.rsb b/app/views/contestnotifications/index.api.rsb
new file mode 100644
index 000000000..6509d2915
--- /dev/null
+++ b/app/views/contestnotifications/index.api.rsb
@@ -0,0 +1,14 @@
+api.array :contestnotifications, api_meta(:total_count => @contestnotifications_count, :offset => @offset, :limit => @limit) do
+  @contestnotificationss.each do |contestnotifications|
+    api.contestnotifications do
+      api.id contestnotifications.id
+      api.contest(:id => contestnotifications.contest_id, :name => contestnotifications.contest.name) unless contestnotifications.contest.nil?
+      api.author(:id => contestnotifications.author_id, :name => contestnotifications.author.name) unless contestnotifications.author.nil?
+
+      api.title         contestnotifications.title
+      api.summary       contestnotifications.summary
+      api.description   contestnotifications.description
+      api.created_at    contestnotifications.created_at
+    end
+  end
+end
diff --git a/app/views/contestnotifications/show.html.erb b/app/views/contestnotifications/show.html.erb
index bd4c8a4f8..ead40aef7 100644
--- a/app/views/contestnotifications/show.html.erb
+++ b/app/views/contestnotifications/show.html.erb
@@ -38,23 +38,23 @@
 <div class="contextual">
 	<%= watcher_link(@contestnotifications, User.current) %>
 	<%= link_to(l(:button_edit),
-	edit_news_path(@news),
+	edit_contest_contestnotification_path(@contestnotifications),
 	:class => 'icon icon-edit',
 	:accesskey => accesskey(:edit),
-	:onclick => '$("#edit-news").show(); return false;') if User.current.allowed_to?(:manage_contestnotification, @contest) %>
-	<%= delete_link news_path(@contestnotifications) if User.current.allowed_to?(:manage_contestnotification, @contest) %>
+	:onclick => '$("#edit-contestnotifications").show(); return false;') if User.current.allowed_to?(:manage_contestnotifications, @contest) %>
+	<%= delete_link contest_contestnotification_path(@contestnotifications) if User.current.allowed_to?(:manage_contestnotifications, @contest) %>
 </div>
 
 <h3><strong><%=h @contestnotifications.title %></strong></h3>
 
-<% if authorize_for('contestnotifications', 'edit') %>
-<div id="edit-news" style="display:none;">
-	<%= labelled_form_for :contestnotifications, @contestnotifications, :url => contestnotifications_path(@contestnotifications),
+<% if authorize_for_contest('contestnotifications', 'edit') %>
+<div id="edit-contestnotifications" style="display:none;">
+	<%= labelled_form_for :contestnotifications, @contestnotifications, :url => contest_contestnotification_path(@contestnotifications),
 	:html => { :id => 'contestnotifications-form', :multipart => true, :method => :put } do |f| %>
 	<%= render :partial => 'form', :locals => { :f => f } %>
 	<%= submit_tag l(:button_save) %>
 	<%= preview_link preview_contestnotifications_path(:contest_id => @contest, :id => @contestnotifications), 'contestnotifications-form',target='preview',{:class => ''} %> |
-	<%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;' %>
+	<%= link_to l(:button_cancel), "#", :onclick => '$("#edit-contestnotifications").hide(); return false;' %>
 	<% end %>
 	<div id="preview" class="wiki"></div>
 </div>

From 00b1a40345493703bd48ce71f43e9bf4ec9e2950 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Thu, 5 Jun 2014 15:45:17 +0800
Subject: [PATCH 26/62] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E7=AB=9E?=
 =?UTF-8?q?=E8=B5=9B=E9=80=9A=E7=9F=A5=E5=8F=8A=E8=AF=84=E8=AE=BA=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=96=87=E4=BB=B6=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/contestnotifications_controller.rb | 14 +++++++-------
 app/models/contestnotification.rb                  |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/controllers/contestnotifications_controller.rb b/app/controllers/contestnotifications_controller.rb
index 8aea1a6cd..6a1ff23dd 100644
--- a/app/controllers/contestnotifications_controller.rb
+++ b/app/controllers/contestnotifications_controller.rb
@@ -65,7 +65,7 @@ class ContestnotificationsController < ApplicationController
   # GET /contestnotifications/1
   # GET /contestnotifications/1.json
   def show
-    # @contestnotification = Contestnotification.find(params[:id])
+    @contestnotification = Contestnotification.find(params[:id])
     #
     # respond_to do |format|
     # format.html # show.html.erb
@@ -136,12 +136,12 @@ class ContestnotificationsController < ApplicationController
     # format.json { render json: @contestnotification.errors, status: :unprocessable_entity }
     # end
     # end
-    @contestnotifications.safe_attributes = params[:contestnotifications]
-    @contestnotifications.save_attachments(params[:attachments])
-    if @contestnotifications.save
-      render_attachment_warning_if_needed(@contestnotifications)
+    @contestnotification.safe_attributes = params[:contestnotification]
+    @contestnotification.save_attachments(params[:attachments])
+    if @contestnotification.save
+      render_attachment_warning_if_needed(@contestnotification)
       flash[:notice] = l(:notice_successful_update)
-      redirect_to contestnotification_path(@contestnotifications)
+      redirect_to contest_contestnotification_path(@contestnotification)
     else
       render :action => 'edit'
     end
@@ -158,7 +158,7 @@ class ContestnotificationsController < ApplicationController
     # format.json { head :no_content }
     # end
     @contestnotifications.destroy
-    redirect_to contest_contestnotification_index_path(@contest)
+    redirect_to contest_contestnotifications_path(@contest)
   end
 
   private
diff --git a/app/models/contestnotification.rb b/app/models/contestnotification.rb
index 2f09e7f9c..f245e7adc 100644
--- a/app/models/contestnotification.rb
+++ b/app/models/contestnotification.rb
@@ -41,18 +41,18 @@ class Contestnotification < ActiveRecord::Base
   end
 
   def recipients
-    contest.users.select {|user| user.notify_about?(self)}.map(&:mail)
+    #contest.users.select {|user| user.notify_about?(self)}.map(&:mail)
   end
 
   # returns latest news for contests visible by user
   def self.latest(user = User.current, count = 5)
-    visible(user).includes([:author, :contest]).order("#{Contestnotifications.table_name}.created_at DESC").limit(count).all
+    visible(user).includes([:author, :contest]).order("#{Contestnotification.table_name}.created_at DESC").limit(count).all
   end
 
   private
 
   def add_author_as_watcher
-    Watcher.create(:watchable => self, :user => author)
+    #Watcher.create(:watchable => self, :user => author)
   end
   ## fq
   def act_as_activity

From 92cd6f2fddd03ca00c5be14ecadf525325630898 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Thu, 5 Jun 2014 16:24:48 +0800
Subject: [PATCH 27/62] sd

---
 app/controllers/contestnotifications_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/contestnotifications_controller.rb b/app/controllers/contestnotifications_controller.rb
index 6a1ff23dd..ca67ae185 100644
--- a/app/controllers/contestnotifications_controller.rb
+++ b/app/controllers/contestnotifications_controller.rb
@@ -65,7 +65,7 @@ class ContestnotificationsController < ApplicationController
   # GET /contestnotifications/1
   # GET /contestnotifications/1.json
   def show
-    @contestnotification = Contestnotification.find(params[:id])
+    #@contestnotification = Contestnotification.find(params[:id])
     #
     # respond_to do |format|
     # format.html # show.html.erb

From ca01f5c9cc32d706b7ea462fccc2e92322c6f872 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Thu, 5 Jun 2014 16:27:33 +0800
Subject: [PATCH 28/62] rt

---
 app/controllers/contestnotifications_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/contestnotifications_controller.rb b/app/controllers/contestnotifications_controller.rb
index ca67ae185..ecd509f2b 100644
--- a/app/controllers/contestnotifications_controller.rb
+++ b/app/controllers/contestnotifications_controller.rb
@@ -65,7 +65,7 @@ class ContestnotificationsController < ApplicationController
   # GET /contestnotifications/1
   # GET /contestnotifications/1.json
   def show
-    #@contestnotification = Contestnotification.find(params[:id])
+    # @contestnotification = Contestnotification.find(params[:id])
     #
     # respond_to do |format|
     # format.html # show.html.erb

From 8a2e57d6755533b1c47a5259efe18a1a8fc94944 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Thu, 5 Jun 2014 16:38:04 +0800
Subject: [PATCH 29/62] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E8=8B=B1=E6=96=87=E9=A1=B5=E9=9D=A2=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/locales/en.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7236992fd..2609962f3 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1637,6 +1637,7 @@ en:
   label_projects_management_platform: Projects-platform
   label_courses_management_platform: Courses-platform
   label_contests_management_platform: Competitions-platform
+  label_contest_work: Competition work
 #end
 
   # ajax异步验证

From 56ca98ab18b9977a82084b607bd9bf9ba741702e Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Thu, 5 Jun 2014 16:46:06 +0800
Subject: [PATCH 30/62] =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=8B=B1=E6=96=87?=
 =?UTF-8?q?=E7=89=88=E7=AB=9E=E8=B5=9B=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/locales/en.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2609962f3..c0244817f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1638,6 +1638,7 @@ en:
   label_courses_management_platform: Courses-platform
   label_contests_management_platform: Competitions-platform
   label_contest_work: Competition work
+  label_contests_reward_method: Reward method
 #end
 
   # ajax异步验证

From bbf7aca174f9224800424d4579be4d19786095ef Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Thu, 5 Jun 2014 16:57:46 +0800
Subject: [PATCH 31/62] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=86=E8=8B=B1?=
 =?UTF-8?q?=E6=96=87=E7=89=88=E5=8F=82=E8=B5=9B=E4=BD=9C=E5=93=81=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/locales/en.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index c0244817f..e1a6b3fdb 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1639,6 +1639,11 @@ en:
   label_contests_management_platform: Competitions-platform
   label_contest_work: Competition work
   label_contests_reward_method: Reward method
+  label_attendingcontestwork_developers: Developers
+  label_attendingcontestwork_release_time: Release time
+  label_attendingcontestwork_belongs_contest: Contesting
+  label_attendingcontestwork_belongs_type: Work-type
+  label_attendingcontestwork_adaptive_system: Adaptive-system
 #end
 
   # ajax异步验证

From 928d61a3cdb2d6409a5dcda25ea5757ec189a8cd Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Thu, 5 Jun 2014 17:29:03 +0800
Subject: [PATCH 32/62] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E7=AB=9E?=
 =?UTF-8?q?=E8=B5=9B=E5=AD=90=E7=AB=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/locales/en.yml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index e1a6b3fdb..7d971b2a5 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1644,6 +1644,31 @@ en:
   label_attendingcontestwork_belongs_contest: Contesting
   label_attendingcontestwork_belongs_type: Work-type
   label_attendingcontestwork_adaptive_system: Adaptive-system
+  
+  label_upload_files: Files-upload
+  label_upload_softwarepackage: Softwarepackage-upload
+  label_upload_cuttingphoto: Photo-upload
+  label_system_platform: Platform
+  label_nextstep: Next
+  label_participate: Participate
+  label_setting: Setting
+  label_contest_project: Competition-project
+  label_contest_softapplication: Competition-application
+  label_contest_response: Feedback
+  label_contest_watchers: Watchers
+  label_contest_work: Competition-work
+  button_contesting_as_project: Competition(New-project)
+  button_contesting_as_application: Competition(Release-app)
+  label_release_softapplication: Release-application
+  label_upload_softapplication_packets: Upload-apppacket
+  label_upload_softapplication_photo: Upload-appphoto
+  label_upload_softapplication_packets_mustpacketed: Works code and related documentation must be packaged before upload, easy to upload and download.
+  label_upload_softapplication_photo_condition: Need to upload 0~4 works screenshot, each is less than 5M, photo format such as gif,jpg,png etc.
+  label_updated_caution: Note: If you need edit the work, the uploaded screenshot and package will be deleted, please re-upload!
+  
+  
+  
+  
 #end
 
   # ajax异步验证

From 040e469cb2ad5f38dd3a01bed953b6729ae9c7cb Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Thu, 5 Jun 2014 17:40:51 +0800
Subject: [PATCH 33/62] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E5=AD=90=E7=AB=99?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/locales/en.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7d971b2a5..304ceb827 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1662,10 +1662,7 @@ en:
   label_release_softapplication: Release-application
   label_upload_softapplication_packets: Upload-apppacket
   label_upload_softapplication_photo: Upload-appphoto
-  label_upload_softapplication_packets_mustpacketed: Works code and related documentation must be packaged before upload, easy to upload and download.
-  label_upload_softapplication_photo_condition: Need to upload 0~4 works screenshot, each is less than 5M, photo format such as gif,jpg,png etc.
-  label_updated_caution: Note: If you need edit the work, the uploaded screenshot and package will be deleted, please re-upload!
-  
+  label_upload_softapplication_packets_mustpacketed: Works code and ralated-document must be packaged before upload.
   
   
   

From 0e09137b99957cad50efcd99e99df710970cdcb4 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Fri, 6 Jun 2014 09:20:55 +0800
Subject: [PATCH 34/62] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E5=AD=90=E7=AB=99?=
 =?UTF-8?q?=E8=8B=B1=E6=96=87=E7=89=88=E5=AE=9E=E6=96=BD=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/locales/en.yml | 52 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 50 insertions(+), 2 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 304ceb827..05c842a2a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1663,8 +1663,56 @@ en:
   label_upload_softapplication_packets: Upload-apppacket
   label_upload_softapplication_photo: Upload-appphoto
   label_upload_softapplication_packets_mustpacketed: Works code and ralated-document must be packaged before upload.
-  
-  
+  label_upload_softapplication_photo_condition: Need upload 0~4 works screenshot, each is less than 5M, photo format such as gif,jpg,png etc.
+  label_updated_caution: Note:if you edit the work, the uploaded screenshot and package will be deleted, please re-load!
+  label_softapplication_name: App-name
+  label_work_name: Work name
+  label_softapplication_description: App-description
+  label_work_description: Work description
+  label_work_scores: Work score
+  label_work_rating: Work rating
+  label_work_tishi: You can re-scoring, but just record the last scoring result!
+  label_work_scores_proportion: Score porportion
+  label_softapplication_type: App-type
+  label_work_type: Work type
+  label_work_photo: Work photo
+  label_work_comment: Work comment
+  label_softapplication_version_available: Version
+  label_running_platform: Running platform
+  label_softapplication_developer: Upload person
+  label_softapplication_developers: Developers
+  label_work_deposit_project_url: Deposit url
+  label_work_deposit_project: Deposit project
+  label_softapplication_name_condition: Less than 50 characters
+  label_softapplication_description_condition: Less than 250 characters
+  label_user_login_softapplication_board: You are not logged in, please log in and then participate in the evaluation!
+  label_contest_description_no: No description
+  label_no_contest_softapplication: No application
+  label_button_ok: Ok
+  label_tags_contest: Competition tag
+  label_final_scores: Final scores
+  label_rating_person_amount: Rating person
+  label_tags_contest_description: Contest description
+  label_release_add_contest_succeed: The application succeed released and added!
+  label_add_contest_succeed_fail: Added fails, the application has been joined the competition!
+  label_no_ftapplication: No application
+  label_edit_softapplication: Edit application
+  label_edit_work: Edit work
+  label_contest_delete: Delete contest
+  label_noawards_current: No awards
+  label_softapplication: Application software
+  label_attending_contest: Attengding contest
+  label_new_attendingcontest_work: New competition work
+  label_workname_lengthlimit: Less than 50 characters
+  label_workdescription_lengthlimit: Less than 250 characters
+  label_please_input_password: Please input the competition password!
+  label_please_select_project: Please select the project!
+  label_upload_softworkpacket_photo: Upload work package and screenshots
+  label_reward: Reward
+  label_please_select_contestingsoftapplication: Please select the competition application!
+  label_attendingcontest_time: Join-contest time
+  label_attendingcontest_spoksman: Join-contest representive
+  label_wellmeaning_intimation_contentone: Tips: If you are ready to participate in the competition, please click the "New competition work"!
   
 #end
 

From b1b7c19e580bf1735056400db85e8281e72b0fc5 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Fri, 6 Jun 2014 09:26:50 +0800
Subject: [PATCH 35/62] =?UTF-8?q?=E8=8B=B1=E6=96=87=E7=89=88=E5=AE=9E?=
 =?UTF-8?q?=E6=96=BD2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/locales/en.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 05c842a2a..5ab63a21a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1711,8 +1711,11 @@ en:
   label_reward: Reward
   label_please_select_contestingsoftapplication: Please select the competition application!
   label_attendingcontest_time: Join-contest time
-  label_attendingcontest_spoksman: Join-contest representive
-  label_wellmeaning_intimation_contentone: Tips: If you are ready to participate in the competition, please click the "New competition work"!
+  label_attendingcontest_spoksman: Join-contest representive 
+
+  
+  
+  
   
 #end
 

From 6546d107c8971b3a4dae09200197570af2d72b35 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Fri, 6 Jun 2014 09:45:38 +0800
Subject: [PATCH 36/62] =?UTF-8?q?=E8=8B=B1=E6=96=87=E7=89=883?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/locales/en.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5ab63a21a..7413f0a2e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1712,8 +1712,9 @@ en:
   label_please_select_contestingsoftapplication: Please select the competition application!
   label_attendingcontest_time: Join-contest time
   label_attendingcontest_spoksman: Join-contest representive 
-
-  
+  label_wellmeaning_intimation_contentone: Note:if you are ready attenging contest, please click"New competition work"!
+  label_wellmeaning_intimation_contenttwo: if you have already completed the development, and just release your work, you can not select"Deposit project"!
+  label_wellmeaning_intimation_contentthree: if you want to deposit the competition data and code, and want to keep track of the development and code-submission,please selcet a created project from"Deposit project", if you have no project, please click"New project"!
   
   
   

From c31c5d49d13fb1ac375b86a340f90a5caf3379a8 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Fri, 6 Jun 2014 10:01:51 +0800
Subject: [PATCH 37/62] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E5=AD=90=E7=AB=99?=
 =?UTF-8?q?=E8=8B=B1=E6=96=87=E7=89=884?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/locales/en.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7413f0a2e..82a01af1c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1643,7 +1643,12 @@ en:
   label_attendingcontestwork_release_time: Release time
   label_attendingcontestwork_belongs_contest: Contesting
   label_attendingcontestwork_belongs_type: Work-type
+  label_attendingcontestwork_release_person: Release person
   label_attendingcontestwork_adaptive_system: Adaptive-system
+  label_attendingcontestwork_download: Work download
+  label_attendingcontestwork_average_scores: Average score
+  label_attendingcontestwork_deposit_project: Deposit project
+  label_attendingcontestwork_sorting_intimation: You can re-scoring, but just record the last scoring result!
   
   label_upload_files: Files-upload
   label_upload_softwarepackage: Softwarepackage-upload
@@ -1716,6 +1721,14 @@ en:
   label_wellmeaning_intimation_contenttwo: if you have already completed the development, and just release your work, you can not select"Deposit project"!
   label_wellmeaning_intimation_contentthree: if you want to deposit the competition data and code, and want to keep track of the development and code-submission,please selcet a created project from"Deposit project", if you have no project, please click"New project"!
   
+  notice_attendingcontest_work_successfully_created: Congratulations, competition work successfully created!
+  notice_softapplication_was_successfully_updated: Congratulations, competition work successfully updated!
+  
+  label_contest_notification: Competition notification
+  
+  label_user_login_score_and_comment: You are not logged in, please log in and then score and comment the work!
+  label_contest_work_list: Competition work list
+  
   
   
 #end

From 42aba52111922ca46577bfb5e8c496d4566532d6 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Fri, 6 Jun 2014 10:46:56 +0800
Subject: [PATCH 38/62] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E5=AD=90=E7=AB=99?=
 =?UTF-8?q?=E8=8B=B1=E6=96=87=E7=89=885?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...softapplication_index_top_content.html.erb |  2 +-
 ..._base_softapplication_top_content.html.erb |  2 +-
 app/views/layouts/base_contest.html.erb       |  2 +-
 app/views/layouts/base_newcontest.html.erb    |  4 +--
 config/locales/en.yml                         | 31 +++++++++++++------
 config/locales/zh.yml                         |  4 +--
 6 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/app/views/layouts/_base_softapplication_index_top_content.html.erb b/app/views/layouts/_base_softapplication_index_top_content.html.erb
index d029d27e4..7fa65bec4 100644
--- a/app/views/layouts/_base_softapplication_index_top_content.html.erb
+++ b/app/views/layouts/_base_softapplication_index_top_content.html.erb
@@ -1,7 +1,7 @@
 <div class="top-content">
 	<table>
 		<tr>
-			<td class="info_font" style="width: 240px; color: #15bccf">创新竞赛社区</td>
+			<td class="info_font" style="width: 240px; color: #15bccf"><%=l(:label_contest_innovate_community)%></td>
 			<td style="width: 430px; color: #15bccf"><strong><%= l(:label_user_location) %> : </strong></td>
 			<td rowspan="2" width="305px">
 				<div class="project-search" style="float: right">			
diff --git a/app/views/layouts/_base_softapplication_top_content.html.erb b/app/views/layouts/_base_softapplication_top_content.html.erb
index 064e84cf0..71c708d63 100644
--- a/app/views/layouts/_base_softapplication_top_content.html.erb
+++ b/app/views/layouts/_base_softapplication_top_content.html.erb
@@ -1,7 +1,7 @@
 <div class="top-content">
 	<table>
 		<tr>
-			<td class="info_font" style="width: 240px; color: #15bccf">创新竞赛社区</td>
+			<td class="info_font" style="width: 240px; color: #15bccf"><%=l(:label_contest_innovate_community)%></td>
 			<td style="width: 430px; color: #15bccf"><strong><%= l(:label_user_location) %> : </strong></td>
 			<td rowspan="2" width="250px"></td>
 		</tr>
diff --git a/app/views/layouts/base_contest.html.erb b/app/views/layouts/base_contest.html.erb
index 2bda701fe..94d55238a 100644
--- a/app/views/layouts/base_contest.html.erb
+++ b/app/views/layouts/base_contest.html.erb
@@ -26,7 +26,7 @@
 						<div class="top-content">
 									<table>
 										<tr>
-											<td class="info_font" style="width: 240px; color: #15bccf">创新竞赛社区</td>
+											<td class="info_font" style="width: 240px; color: #15bccf"><%=l(:label_contest_innovate_community)%></td>
 											<td style="width: 430px; color: #15bccf"><strong><%= l(:label_user_location) %> : </strong></td>
 											<td rowspan="2" width="250px">
 												<div class="project-search">
diff --git a/app/views/layouts/base_newcontest.html.erb b/app/views/layouts/base_newcontest.html.erb
index 0ac197348..a4522d289 100644
--- a/app/views/layouts/base_newcontest.html.erb
+++ b/app/views/layouts/base_newcontest.html.erb
@@ -27,7 +27,7 @@
 						<div class="top-content">
 									<table>
 										<tr>
-											<td class="info_font" style="width: 240px; color: #15bccf">创新竞赛社区</td>
+											<td class="info_font" style="width: 240px; color: #15bccf"><%=l(:label_contest_innovate_community)%></td>
 											<td style="width: 430px; color: #15bccf"><strong><%= l(:label_user_location) %> : </strong></td>
 											<td rowspan="2" width="250px">
 												<div class="project-search">
@@ -123,7 +123,7 @@
 								<div class="inf_user_image">
 									   <table>
 											<tr>
-												<td><%= l(:lable_contest_user) %><%= link_to(@user.name, user_path(@user))%></td>
+												<td><%= l(:lable_contest_user) %>:&nbsp;<%= link_to(@user.name, user_path(@user))%></td>
 											</tr>			
 											<tr>									
 												<td><%= l(:label_bids_reward_method) %><%= @contest.budget%></td>														
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 82a01af1c..5421db83a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1178,7 +1178,7 @@ en:
   label_message: message board
   field_add: Add before %{time} 
   button_more: More
-  label_user_response: Feedbacks  # modified by bai
+  label_user_response: Feedback  # modified by bai
   label_bidding_project: projects
   button_bidding: I will participate in it
   label_new_call: New call
@@ -1207,9 +1207,9 @@ en:
   label_follow_people: following # modified by bai
   #modify by men
   label_x_follow_people:
-    zero: follower
-    one: follower
-    other: followers 
+    zero: Follower
+    one: Follower
+    other: Followers 
   #end
   label_member_since: joined
   label_contribute_to: Participates %{project_count} projects：
@@ -1250,9 +1250,9 @@ en:
     other: comments
   #end
   label_x_followers: #modified by men
-    zero: follower
-    one: follower
-    other: followers
+    zero: Follower
+    one: Follower
+    other: Followers
   #end
   
   
@@ -1385,7 +1385,7 @@ en:
   label_bid_project: projects
   label_project_no_follow: The project hasn't been followed now！
   label_no_bid_project: has no participate project
-  label_bids_reward_method: reward：
+  label_bids_reward_method: Reward：
   label_bids_reward_what: input what for reward
   label_call_bonus: bonus
   label_bids_form_new_description: Publish a requirement,a competition or a course work.
@@ -1691,6 +1691,7 @@ en:
   label_softapplication_name_condition: Less than 50 characters
   label_softapplication_description_condition: Less than 250 characters
   label_user_login_softapplication_board: You are not logged in, please log in and then participate in the evaluation!
+  label_user_login_attending_contest: You are not logged in, please log in and then join the competition!
   label_contest_description_no: No description
   label_no_contest_softapplication: No application
   label_button_ok: Ok
@@ -1706,7 +1707,7 @@ en:
   label_contest_delete: Delete contest
   label_noawards_current: No awards
   label_softapplication: Application software
-  label_attending_contest: Attengding contest
+  label_attending_contest: Joining
   label_new_attendingcontest_work: New competition work
   label_workname_lengthlimit: Less than 50 characters
   label_workdescription_lengthlimit: Less than 250 characters
@@ -1724,13 +1725,23 @@ en:
   notice_attendingcontest_work_successfully_created: Congratulations, competition work successfully created!
   notice_softapplication_was_successfully_updated: Congratulations, competition work successfully updated!
   
-  label_contest_notification: Competition notification
+  label_contest_notification: Notice
+  lable_contest_user: Release person
+  label_contest_innovate_community: Competition community
   
   label_user_login_score_and_comment: You are not logged in, please log in and then score and comment the work!
   label_contest_work_list: Competition work list
   
   
+  label_borad_project: Project-borad
+  label_search_intimation: please input the searching keywords!
+  label_update_time: Update time
+  label_project_notice: release the notice
   
+  label_user_grade: Individual score
+  label_active_homework: homework
+  label_course_term: Semester
+  label_comment_time: Comment time
 #end
 
   # ajax异步验证
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 6812d6a63..f24d7467a 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -540,7 +540,7 @@ zh:
   label_enterprise_into: 进入企业
   label_college_into: 进入高校
   label_investor: 投资人：
-  lable_contest_user: 竞赛发布人： #huang
+  lable_contest_user: 竞赛发布人 
   label_user_home: 创客空间
   label_user_location: 当前位置
   label_course_term: 开课学期
@@ -1962,7 +1962,7 @@ zh:
   label_attendingcontestwork_sorting_intimation: 您可以重新打分，打分结果以最后一次打分为主！
   
   label_contest_notification: 竞赛通知
-
+  label_contest_innovate_community: 创新竞赛社区
   #english site translation
   label_current_hot_contest: 最新热门竞赛
   label_current_attendingcontest_work: 最新参赛作品

From 372de9932aa5537d50a35e4cd0f42298599f2610 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Fri, 6 Jun 2014 11:24:05 +0800
Subject: [PATCH 39/62] =?UTF-8?q?=E8=8B=B1=E6=96=87=E7=89=88=E7=AB=9E?=
 =?UTF-8?q?=E8=B5=9B=E5=AD=90=E7=AB=99=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_base_footer.html.erb | 12 ++++++------
 config/locales/en.yml                   | 14 +++++++++++++-
 config/locales/zh.yml                   |  7 +++++++
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/app/views/layouts/_base_footer.html.erb b/app/views/layouts/_base_footer.html.erb
index baf438cb2..d0ae0fbfb 100644
--- a/app/views/layouts/_base_footer.html.erb
+++ b/app/views/layouts/_base_footer.html.erb
@@ -7,12 +7,12 @@
 
    <!--gcm-->
    <p>
-    <span>主办单位:</span>
-    <span class="footer_text_link"><%= link_to "国防科学技术大学并行与分布处理国家重点实验室","http://www.nudt.edu.cn/ArticleShow.asp?ID=47",:target=>"_blank"%></span>
-    <span class="footer_text_link"><%= link_to "计算机科学与技术系", "http://www.nudt.edu.cn/ArticleShow.asp?ID=41", :target => "_blank" %></span>
-    <span id="copyright">版权@2007~2014</span>
-    <span id="contact_us" class="footer_text_link"><%= link_to "联系我们","http://forge.trustie.net/projects/2/member", :target=>"_blank" %></span>
-    <span id="record"class="footer_text_link"><%= link_to "湘ICP备09019772","http://www.miibeian.gov.cn/", :target => "_blank" %></span>
+    <span><%=l(:label_organizers)%></span>
+    <span class="footer_text_link"><%= link_to l(:label_organizers_information),"http://www.nudt.edu.cn/ArticleShow.asp?ID=47",:target=>"_blank"%></span>
+    <span class="footer_text_link"><%= link_to l(:label_organizers_information_institute), "http://www.nudt.edu.cn/ArticleShow.asp?ID=41", :target => "_blank" %></span>
+    <span id="copyright"><%=l(:label_copyright)%>@2007~2014</span>
+    <span id="contact_us" class="footer_text_link"><%= link_to l(:label_contact_us),"http://forge.trustie.net/projects/2/member", :target=>"_blank" %></span>
+    <span id="record"class="footer_text_link"><%= link_to l(:label_record),"http://www.miibeian.gov.cn/", :target => "_blank" %></span>
 
   </p>
   <div id="logo_link">
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5421db83a..43c24d30b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1588,7 +1588,7 @@ en:
   label_user_location: Location
   label_requirement_enterprise: Requirements
   label_requirement_enterprise_list: Requirements List
-  label_contest_innovate: Competitions
+  label_contest_innovate: Competition community
   label_software_user: Users
   label_course_practice: Courses
   label_course_all: Teacher
@@ -1737,11 +1737,23 @@ en:
   label_search_intimation: please input the searching keywords!
   label_update_time: Update time
   label_project_notice: release the notice
+  label_no_file_uploaded: No file uploaded
+  label_forum_new: New forum
+  label_memo_new_from_forum: Release memo
   
   label_user_grade: Individual score
   label_active_homework: homework
   label_course_term: Semester
   label_comment_time: Comment time
+  label_bidding_user_studentcode: Student ID
+  
+  label_organizers: Organizer
+  label_organizers_information: National Key Laboratory of Parallel and Distributed Processing, NUDT
+  label_organizers_information_institute: Department of Computer Sciencer and Technology
+  label_copyright: Copyright
+  label_contact_us: Contact us
+  label_record: 湘ICP备09019772
+  
 #end
 
   # ajax异步验证
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index f24d7467a..027fa726b 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1980,6 +1980,13 @@ zh:
   label_projects_management_platform: 项目托管平台
   label_courses_management_platform: 课程实践平台
   label_contests_management_platform: 竞赛托管平台
+  
+  label_organizers: 主办单位
+  label_organizers_information: 国防科学技术大学并行与分布处理国家重点实验室
+  label_organizers_information_institute: 计算机科学与技术系
+  label_copyright: 版权
+  label_contact_us: 联系我们
+  label_record: 湘ICP备09019772
   #end  
 
   #end

From 1c28edd5d478b44c82dcf206018d95fdf4148f49 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Fri, 6 Jun 2014 16:03:47 +0800
Subject: [PATCH 40/62] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AB=9E=E8=B5=9B?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E7=9B=B8=E5=85=B3=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/application_controller.rb     | 18 +++++-----
 .../contestnotifications_controller.rb        |  8 ++---
 app/controllers/documents_controller.rb       |  1 -
 .../issue_categories_controller.rb            |  2 +-
 app/controllers/members_controller.rb         |  2 +-
 app/controllers/versions_controller.rb        |  2 +-
 app/views/contestnotifications/show.html.erb  | 36 -------------------
 7 files changed, 16 insertions(+), 53 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 9eadda027..f05495d21 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -311,15 +311,15 @@ class ApplicationController < ActionController::Base
     render_404
   end
 
-  def find_model_object_contest
-    model = self.class.model_object
-    if model
-      @object = model.find(params[:id])
-      self.instance_variable_set('@' + controller_name.singularize, @object) if @object
-    end
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
+  # def find_model_object_contest
+    # model = self.class.model_object
+    # if model
+      # @object = model.find(params[:id])
+      # self.instance_variable_set('@' + controller_name.singularize, @object) if @object
+    # end
+  # rescue ActiveRecord::RecordNotFound
+    # render_404
+  # end
 
   def self.model_object(model)
     self.model_object = model
diff --git a/app/controllers/contestnotifications_controller.rb b/app/controllers/contestnotifications_controller.rb
index ecd509f2b..574ed389b 100644
--- a/app/controllers/contestnotifications_controller.rb
+++ b/app/controllers/contestnotifications_controller.rb
@@ -3,10 +3,10 @@ class ContestnotificationsController < ApplicationController
   # GET /contestnotifications.json
   layout 'base_newcontest'
   default_search_scope :contestnotifications
-  # model_object Contestnotifications
-  # before_filter :find_model_object_contest, :except => [:new, :create, :index]
+  model_object Contestnotification
+  before_filter :find_model_object, :except => [:new, :create, :index]
   before_filter :find_contest_from_association, :except => [:new, :create, :index]
-  # before_filter :find_contest_by_contest_id, :only => [:new, :create]
+  before_filter :find_contest_by_contest_id, :only => [:new, :create]
   before_filter :find_contest
   before_filter :find_author
   # before_filter :authorize, :except => [:index]
@@ -71,7 +71,7 @@ class ContestnotificationsController < ApplicationController
     # format.html # show.html.erb
     # format.json { render json: @contestnotification }
     # end
-    @notificationcomments = @contestnotifications.notificationcomments
+    @notificationcomments = @contestnotification.notificationcomments
     @notificationcomments.reverse! if User.current.wants_notificationcomments_in_reverse_order?
     render :layout => 'base_newcontest'
 
diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb
index 7e21242cc..51486f252 100644
--- a/app/controllers/documents_controller.rb
+++ b/app/controllers/documents_controller.rb
@@ -21,7 +21,6 @@ class DocumentsController < ApplicationController
   model_object Document
   before_filter :find_project_by_project_id, :only => [:index, :new, :create]
   before_filter :find_model_object, :except => [:index, :new, :create]
-  before_filter :find_model_object_contest, :except => [:index, :new, :create]
   before_filter :find_project_from_association, :except => [:index, :new, :create]
   before_filter :authorize , :except => [:index]#Added by young
 
diff --git a/app/controllers/issue_categories_controller.rb b/app/controllers/issue_categories_controller.rb
index f5ba71def..9803eb789 100644
--- a/app/controllers/issue_categories_controller.rb
+++ b/app/controllers/issue_categories_controller.rb
@@ -19,7 +19,7 @@ class IssueCategoriesController < ApplicationController
   menu_item :settings
   model_object IssueCategory
   before_filter :find_model_object, :except => [:index, :new, :create]
-  before_filter :find_model_object_contest, :except => [:index, :new, :create]
+  #before_filter :find_model_object_contest, :except => [:index, :new, :create]
   before_filter :find_project_from_association, :except => [:index, :new, :create]
   before_filter :find_project_by_project_id, :only => [:index, :new, :create]
   before_filter :authorize
diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index 29c37c09b..751c2e556 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -17,7 +17,7 @@
 class MembersController < ApplicationController
   model_object Member
   before_filter :find_model_object, :except => [:index, :create, :autocomplete]
-  before_filter :find_model_object_contest, :except => [:index, :create, :autocomplete]
+  #before_filter :find_model_object_contest, :except => [:index, :create, :autocomplete]
   before_filter :find_project_from_association, :except => [:index, :create, :autocomplete]
   before_filter :find_project_by_project_id, :only => [:index, :create, :autocomplete]
   before_filter :authorize
diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb
index 72cb5301f..0bbbd1bd6 100644
--- a/app/controllers/versions_controller.rb
+++ b/app/controllers/versions_controller.rb
@@ -20,7 +20,7 @@ class VersionsController < ApplicationController
   menu_item :roadmap
   model_object Version
   before_filter :find_model_object, :except => [:index, :new, :create, :close_completed]
-  before_filter :find_model_object_contest, :except => [:index, :new, :create]
+  #before_filter :find_model_object_contest, :except => [:index, :new, :create]
   before_filter :find_project_from_association, :except => [:index, :new, :create, :close_completed]
   before_filter :find_project_by_project_id, :only => [:index, :new, :create, :close_completed]
   before_filter :authorize
diff --git a/app/views/contestnotifications/show.html.erb b/app/views/contestnotifications/show.html.erb
index ead40aef7..85d81a61d 100644
--- a/app/views/contestnotifications/show.html.erb
+++ b/app/views/contestnotifications/show.html.erb
@@ -1,40 +1,4 @@
-<!-- <p id="notice"><%= notice %></p>
 
-<p>
-  <b>Contest:</b>
-  <%= @contestnotification.contest_id %>
-</p>
-
-<p>
-  <b>Title:</b>
-  <%= @contestnotification.title %>
-</p>
-
-<p>
-  <b>Summary:</b>
-  <%= @contestnotification.summary %>
-</p>
-
-<p>
-  <b>Description:</b>
-  <%= @contestnotification.description %>
-</p>
-
-<p>
-  <b>Author:</b>
-  <%= @contestnotification.author_id %>
-</p>
-
-<p>
-  <b>Comments count:</b>
-  <%= @contestnotification.comments_count %>
-</p>
-
-
-<%= link_to 'Edit', edit_contestnotification_path(@contestnotification) %> |
-<%= link_to 'Back', contestnotifications_path %> -->
-
-<!--begin-->
 <div class="contextual">
 	<%= watcher_link(@contestnotifications, User.current) %>
 	<%= link_to(l(:button_edit),

From 391d4df3d1b9187205674b1b35b6a43dac5f8f4c Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Fri, 6 Jun 2014 16:33:00 +0800
Subject: [PATCH 41/62] sdf

---
 app/views/contestnotifications/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/contestnotifications/show.html.erb b/app/views/contestnotifications/show.html.erb
index 85d81a61d..ec73b9c4c 100644
--- a/app/views/contestnotifications/show.html.erb
+++ b/app/views/contestnotifications/show.html.erb
@@ -76,7 +76,7 @@
 				</tr>
 				<tr>
 					<td align="left"><span class="font_lighter"> <%= format_time(notificationcomment.created_at) %></span></td>
-					<td width="200" align="right" class="a"><%= link_to_if_authorized image_tag('delete.png'), {:controller => 'notificationcomments', :action => 'destroy', :id => @contestnotifications, :notificationcomment_id => notificationcomment},
+					<td width="200" align="right" class="a"><%= link_to_if_authorized_contest image_tag('delete.png'), {:controller => 'notificationcomments', :action => 'destroy', :id => @contestnotifications, :notificationcomment_id => notificationcomment},
 					:data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %></td>
 				</tr>
 			</table></td>

From 7f5fa8b9b82bce11d285989c274dc057edd6bcef Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Fri, 6 Jun 2014 21:40:58 +0800
Subject: [PATCH 42/62] dfd

---
 .../contestnotifications_controller.rb        |  3 ++-
 app/models/contestnotification.rb             |  1 +
 ...tioncomments.rb => notificationcomment.rb} |  2 +-
 app/views/contestnotifications/show.html.erb  | 24 +++++++++----------
 4 files changed, 16 insertions(+), 14 deletions(-)
 rename app/models/{notificationcomments.rb => notificationcomment.rb} (89%)

diff --git a/app/controllers/contestnotifications_controller.rb b/app/controllers/contestnotifications_controller.rb
index 574ed389b..5e935ff4d 100644
--- a/app/controllers/contestnotifications_controller.rb
+++ b/app/controllers/contestnotifications_controller.rb
@@ -65,7 +65,8 @@ class ContestnotificationsController < ApplicationController
   # GET /contestnotifications/1
   # GET /contestnotifications/1.json
   def show
-    # @contestnotification = Contestnotification.find(params[:id])
+     @contestnotification = Contestnotification.find(params[:id])
+   
     #
     # respond_to do |format|
     # format.html # show.html.erb
diff --git a/app/models/contestnotification.rb b/app/models/contestnotification.rb
index f245e7adc..e9f6c9a67 100644
--- a/app/models/contestnotification.rb
+++ b/app/models/contestnotification.rb
@@ -2,6 +2,7 @@ class Contestnotification < ActiveRecord::Base
   #attr_accessible :author_id, :notificationcomments_count, :contest_id, :description, :summary, :title
 
   include Redmine::SafeAttributes
+  #Contestnotification::Notificationcomment
   belongs_to :contest
   belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
   has_many :notificationcomments, :as => :notificationcommented, :dependent => :delete_all, :order => "created_at"
diff --git a/app/models/notificationcomments.rb b/app/models/notificationcomment.rb
similarity index 89%
rename from app/models/notificationcomments.rb
rename to app/models/notificationcomment.rb
index 1aad7c7e3..f8eb7020e 100644
--- a/app/models/notificationcomments.rb
+++ b/app/models/notificationcomment.rb
@@ -1,4 +1,4 @@
-class Notificationcomments < ActiveRecord::Base
+class Notificationcomment < ActiveRecord::Base
   attr_accessible :author_id, :notificationcommented_id, :notificationcommented_type, :notificationcomments
 
   include Redmine::SafeAttributes
diff --git a/app/views/contestnotifications/show.html.erb b/app/views/contestnotifications/show.html.erb
index ec73b9c4c..f333e0a4e 100644
--- a/app/views/contestnotifications/show.html.erb
+++ b/app/views/contestnotifications/show.html.erb
@@ -1,23 +1,23 @@
 
 <div class="contextual">
-	<%= watcher_link(@contestnotifications, User.current) %>
+	<%= watcher_link(@contestnotification, User.current) %>
 	<%= link_to(l(:button_edit),
-	edit_contest_contestnotification_path(@contestnotifications),
+	edit_contest_contestnotification_path(@contestnotification),
 	:class => 'icon icon-edit',
 	:accesskey => accesskey(:edit),
 	:onclick => '$("#edit-contestnotifications").show(); return false;') if User.current.allowed_to?(:manage_contestnotifications, @contest) %>
-	<%= delete_link contest_contestnotification_path(@contestnotifications) if User.current.allowed_to?(:manage_contestnotifications, @contest) %>
+	<%= delete_link contest_contestnotification_path(@contestnotification) if User.current.allowed_to?(:manage_contestnotifications, @contest) %>
 </div>
 
-<h3><strong><%=h @contestnotifications.title %></strong></h3>
+<h3><strong><%=h @contestnotification.title %></strong></h3>
 
 <% if authorize_for_contest('contestnotifications', 'edit') %>
 <div id="edit-contestnotifications" style="display:none;">
-	<%= labelled_form_for :contestnotifications, @contestnotifications, :url => contest_contestnotification_path(@contestnotifications),
+	<%= labelled_form_for :contestnotifications, @contestnotification, :url => contest_contestnotification_path(@contestnotification),
 	:html => { :id => 'contestnotifications-form', :multipart => true, :method => :put } do |f| %>
 	<%= render :partial => 'form', :locals => { :f => f } %>
 	<%= submit_tag l(:button_save) %>
-	<%= preview_link preview_contestnotifications_path(:contest_id => @contest, :id => @contestnotifications), 'contestnotifications-form',target='preview',{:class => ''} %> |
+	<%= preview_link preview_contestnotifications_path(:contest_id => @contest, :id => @contestnotification), 'contestnotifications-form',target='preview',{:class => ''} %> |
 	<%= link_to l(:button_cancel), "#", :onclick => '$("#edit-contestnotifications").hide(); return false;' %>
 	<% end %>
 	<div id="preview" class="wiki"></div>
@@ -27,16 +27,16 @@
 <div id="notificationcomments" style="margin-bottom:16px;">
 
 	<div style="margin:15px">
-		<span class="font_description"> <%= textilizable(@contestnotifications, :description) %> </span>
+		<span class="font_description"> <%= textilizable(@contestnotification, :description) %> </span>
 		<br/>
-		<%= link_to_attachments @contestnotifications %>
+		
 		<br/>
 		<!--add comment-->
-		<% if @contestnotifications.notificationcommentable? %>
+		<% if @contestnotification.notificationcommentable? %>
 		<p>
 			<%= toggle_link l(:label_comment_add), "add_notificationcomment_form", :focus => "notificationcomment_notificationcomments" %>
 		</p>
-		<%= form_tag({:controller => 'notificationcomments', :action => 'create', :id => @contestnotifications}, :id => "add_notificationcomment_form", :style => "display:none;") do %>
+		<%= form_tag({:controller => 'notificationcomments', :action => 'create', :id => @contestnotification}, :id => "add_notificationcomment_form", :style => "display:none;") do %>
 		<div class="box">
 			<%= text_area 'notificationcomment', 'notificationcomments', :cols => 80, :rows => 15, :class => 'wiki-edit' %>
 			<%= wikitoolbar_for 'notificationcomment_notificationcomments' %>
@@ -47,7 +47,7 @@
 		<% end %>
 		<% end %>
 
-		<% html_title @contestnotifications.title -%>
+		<% html_title @contestnotification.title -%>
 
 		<% content_for :header_tags do %>
 		<%= stylesheet_link_tag 'scm' %>
@@ -57,7 +57,7 @@
 		<div  class="line_heng"></div>
 	</div>
 	<h3 class="notificationcomments"><%= l(:label_comment_plural) %></h3>
-	<% notificationcomments = @notificationcomments.reverse %>
+	<% notificationcomments = @contestnotification.notificationcomments.reverse %>
 	<% notificationcomments.each do |notificationcomment| %>
 	<% next if notificationcomment.new_record? %>
 	<table width="660px" border="0" align="center">

From 545e5c59412377e1a069e7f222453abb124e4d67 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Sat, 7 Jun 2014 09:22:13 +0800
Subject: [PATCH 43/62] ert

---
 app/controllers/notificationcomments_controller.rb | 14 +++++++-------
 app/views/contestnotifications/show.html.erb       |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/controllers/notificationcomments_controller.rb b/app/controllers/notificationcomments_controller.rb
index e0c5adf72..53563a530 100644
--- a/app/controllers/notificationcomments_controller.rb
+++ b/app/controllers/notificationcomments_controller.rb
@@ -6,12 +6,12 @@ class NotificationcommentsController < ApplicationController
   before_filter :authorize
 
   def create
-    raise Unauthorized unless @contestnotifications.notificationcommentable?
+    #raise Unauthorized unless @contestnotifications.notificationcommentable?
 
-    @notificaioncomment = Notificaioncomment.new
-    @notificaioncomment.safe_attributes = params[:notificaioncomment]
-    @notificaioncomment.author = User.current
-    if @contestnotifications.notificaioncomments << @notificaioncomment
+    @notificationcomment = Notificationcomment.new
+    @notificationcomment.safe_attributes = params[:notificationcomment]
+    @notificationcomment.author = User.current
+    if @contestnotifications.notificationcomments << @notificationcomment
       flash[:notice] = l(:label_comment_added)
     end
 
@@ -19,7 +19,7 @@ class NotificationcommentsController < ApplicationController
   end
 
   def destroy
-    @contestnotifications.notificaioncomments.find(params[:notificaioncomment_id]).destroy
+    @contestnotifications.notificationcomments.find(params[:notificationcomment_id]).destroy
     redirect_to contest_contestnotification_path(@contestnotifications)
   end
 
@@ -28,7 +28,7 @@ class NotificationcommentsController < ApplicationController
   def find_model_object
     super
     @contestnotifications = @object
-    @notificaioncomment = nil
+    @notificationcomment = nil
     @contestnotifications
   end
   
diff --git a/app/views/contestnotifications/show.html.erb b/app/views/contestnotifications/show.html.erb
index f333e0a4e..1a30a93e0 100644
--- a/app/views/contestnotifications/show.html.erb
+++ b/app/views/contestnotifications/show.html.erb
@@ -29,10 +29,10 @@
 	<div style="margin:15px">
 		<span class="font_description"> <%= textilizable(@contestnotification, :description) %> </span>
 		<br/>
-		
+		<%#= link_to_attachments @contestnotification %>
 		<br/>
 		<!--add comment-->
-		<% if @contestnotification.notificationcommentable? %>
+		
 		<p>
 			<%= toggle_link l(:label_comment_add), "add_notificationcomment_form", :focus => "notificationcomment_notificationcomments" %>
 		</p>
@@ -45,7 +45,7 @@
 			<%= submit_tag l(:button_add) %>
 		</p>
 		<% end %>
-		<% end %>
+		
 
 		<% html_title @contestnotification.title -%>
 
@@ -57,7 +57,7 @@
 		<div  class="line_heng"></div>
 	</div>
 	<h3 class="notificationcomments"><%= l(:label_comment_plural) %></h3>
-	<% notificationcomments = @contestnotification.notificationcomments.reverse %>
+	<% notificationcomments = @notificationcomments.reverse %>
 	<% notificationcomments.each do |notificationcomment| %>
 	<% next if notificationcomment.new_record? %>
 	<table width="660px" border="0" align="center">

From 45e12c4bef8a9c2e9b5fd8614491daad03b710f5 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Sat, 7 Jun 2014 10:02:00 +0800
Subject: [PATCH 44/62] xx

---
 .../notificationcomments_controller.rb        |  32 ++--
 app/models/contestnotification.rb             | 126 ++++++-------
 app/models/notificationcomment.rb             |   4 +-
 app/views/contestnotifications/show.html.erb  | 176 +++++++++---------
 config/routes.rb                              |  11 +-
 5 files changed, 172 insertions(+), 177 deletions(-)

diff --git a/app/controllers/notificationcomments_controller.rb b/app/controllers/notificationcomments_controller.rb
index 53563a530..6e4b12eb8 100644
--- a/app/controllers/notificationcomments_controller.rb
+++ b/app/controllers/notificationcomments_controller.rb
@@ -1,35 +1,27 @@
 class NotificationcommentsController < ApplicationController
-  default_search_scope :contestnotifications
-  model_object Contestnotifications
-  before_filter :find_model_object 
-  before_filter :find_contest_from_association
-  before_filter :authorize
+  # default_search_scope :contestnotifications
+  # model_object Contestnotifications
+  # before_filter :authorize
 
   def create
     #raise Unauthorized unless @contestnotifications.notificationcommentable?
+    @contest = Contest.find(params[:contest_id])
+    @contestnotification = Contestnotification.find(params[:contestnotification_id])
 
-    @notificationcomment = Notificationcomment.new
-    @notificationcomment.safe_attributes = params[:notificationcomment]
-    @notificationcomment.author = User.current
-    if @contestnotifications.notificationcomments << @notificationcomment
+    @notificaioncomment = Notificationcomment.new
+    @notificaioncomment.safe_attributes = params[:notificaioncomment]
+    @notificaioncomment.author = User.current
+    if @contestnotification.notificationcomments << @notificaioncomment
       flash[:notice] = l(:label_comment_added)
     end
 
-    redirect_to contest_contestnotification_path(@contestnotifications)
+    #redirect_to contest_contestnotification_notificationcomment_path(@contest, @contestnotification, @notificaioncomment)
+    redirect_to contest_contestnotification_path(@contest, @contestnotification)
   end
 
   def destroy
-    @contestnotifications.notificationcomments.find(params[:notificationcomment_id]).destroy
+    @contestnotifications.notificaioncomments.find(params[:notificaioncomment_id]).destroy
     redirect_to contest_contestnotification_path(@contestnotifications)
   end
-
-  private
-
-  def find_model_object
-    super
-    @contestnotifications = @object
-    @notificationcomment = nil
-    @contestnotifications
-  end
   
 end
diff --git a/app/models/contestnotification.rb b/app/models/contestnotification.rb
index e9f6c9a67..c96a61d92 100644
--- a/app/models/contestnotification.rb
+++ b/app/models/contestnotification.rb
@@ -1,63 +1,63 @@
-class Contestnotification < ActiveRecord::Base
-  #attr_accessible :author_id, :notificationcomments_count, :contest_id, :description, :summary, :title
-
-  include Redmine::SafeAttributes
-  #Contestnotification::Notificationcomment
-  belongs_to :contest
-  belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
-  has_many :notificationcomments, :as => :notificationcommented, :dependent => :delete_all, :order => "created_at"
-  # fq
-  has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
-  
-  validates_presence_of :title, :description
-  validates_length_of :title, :maximum => 60
-  validates_length_of :summary, :maximum => 255
-
-  acts_as_attachable :delete_permission => :manage_contestnotifications
-  acts_as_searchable :columns => ['title', 'summary', "#{table_name}.description"], :include => :contest
-  acts_as_event :url => Proc.new {|o| {:controller => 'contestnotifications', :action => 'show', :id => o.id}}
-  acts_as_activity_provider :find_options => {:include => [:contest, :author]},
-                            :author_key => :author_id
-  acts_as_watchable
-
-  after_create :add_author_as_watcher
- 
-  after_create :act_as_activity
- 
-  
-  scope :visible, lambda {|*args|
-    nil
-    #includes(:contest).where(Contest.allowed_to_condition(args.shift || User.current, :view_contestnotifications, *args))
-  }
-
-  safe_attributes 'title', 'summary', 'description'
-
-  def visible?(user=User.current)
-    !user.nil? && user.allowed_to?(:view_contestnotifications, contest)
-  end
-
-  # Returns true if the news can be commented by user
-  def notificationcommentable?(user=User.current)
-    user.allowed_to?(:notificationcomment_contestnotifications, contest)
-  end
-
-  def recipients
-    #contest.users.select {|user| user.notify_about?(self)}.map(&:mail)
-  end
-
-  # returns latest news for contests visible by user
-  def self.latest(user = User.current, count = 5)
-    visible(user).includes([:author, :contest]).order("#{Contestnotification.table_name}.created_at DESC").limit(count).all
-  end
-
-  private
-
-  def add_author_as_watcher
-    #Watcher.create(:watchable => self, :user => author)
-  end
-  ## fq
-  def act_as_activity
-    self.acts << Activity.new(:user_id => self.author_id)
-  end    
-   
-end
+class Contestnotification < ActiveRecord::Base
+  #attr_accessible :author_id, :notificationcomments_count, :contest_id, :description, :summary, :title
+
+  include Redmine::SafeAttributes
+  #Contestnotification::Notificationcomment
+  belongs_to :contest
+  belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
+  has_many :notificationcomments, :dependent => :delete_all, :order => "created_at"
+  # fq
+  has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
+  
+  validates_presence_of :title, :description
+  validates_length_of :title, :maximum => 60
+  validates_length_of :summary, :maximum => 255
+
+  acts_as_attachable :delete_permission => :manage_contestnotifications
+  acts_as_searchable :columns => ['title', 'summary', "#{table_name}.description"], :include => :contest
+  acts_as_event :url => Proc.new {|o| {:controller => 'contestnotifications', :action => 'show', :id => o.id}}
+  acts_as_activity_provider :find_options => {:include => [:contest, :author]},
+                            :author_key => :author_id
+  acts_as_watchable
+
+  after_create :add_author_as_watcher
+ 
+  after_create :act_as_activity
+ 
+  
+  scope :visible, lambda {|*args|
+    nil
+    #includes(:contest).where(Contest.allowed_to_condition(args.shift || User.current, :view_contestnotifications, *args))
+  }
+
+  safe_attributes 'title', 'summary', 'description'
+
+  def visible?(user=User.current)
+    !user.nil? && user.allowed_to?(:view_contestnotifications, contest)
+  end
+
+  # Returns true if the news can be commented by user
+  def notificationcommentable?(user=User.current)
+    user.allowed_to?(:notificationcomment_contestnotifications, contest)
+  end
+
+  def recipients
+    #contest.users.select {|user| user.notify_about?(self)}.map(&:mail)
+  end
+
+  # returns latest news for contests visible by user
+  def self.latest(user = User.current, count = 5)
+    visible(user).includes([:author, :contest]).order("#{Contestnotification.table_name}.created_at DESC").limit(count).all
+  end
+
+  private
+
+  def add_author_as_watcher
+    #Watcher.create(:watchable => self, :user => author)
+  end
+  ## fq
+  def act_as_activity
+    self.acts << Activity.new(:user_id => self.author_id)
+  end    
+   
+end
diff --git a/app/models/notificationcomment.rb b/app/models/notificationcomment.rb
index f8eb7020e..9cc658f22 100644
--- a/app/models/notificationcomment.rb
+++ b/app/models/notificationcomment.rb
@@ -2,10 +2,10 @@ class Notificationcomment < ActiveRecord::Base
   attr_accessible :author_id, :notificationcommented_id, :notificationcommented_type, :notificationcomments
 
   include Redmine::SafeAttributes
-  belongs_to :notificationcommented, :polymorphic => true, :counter_cache => true
+  belongs_to :notificationcommented, :polymorphic => true#, :counter_cache => true
   belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
 
   validates_presence_of :notificationcommented, :author, :notificationcomments
 
-  safe_attributes 'notificationcomments'
+  # safe_attributes 'notificationcomments'
 end
diff --git a/app/views/contestnotifications/show.html.erb b/app/views/contestnotifications/show.html.erb
index 1a30a93e0..dab3761bd 100644
--- a/app/views/contestnotifications/show.html.erb
+++ b/app/views/contestnotifications/show.html.erb
@@ -1,88 +1,88 @@
-
-<div class="contextual">
-	<%= watcher_link(@contestnotification, User.current) %>
-	<%= link_to(l(:button_edit),
-	edit_contest_contestnotification_path(@contestnotification),
-	:class => 'icon icon-edit',
-	:accesskey => accesskey(:edit),
-	:onclick => '$("#edit-contestnotifications").show(); return false;') if User.current.allowed_to?(:manage_contestnotifications, @contest) %>
-	<%= delete_link contest_contestnotification_path(@contestnotification) if User.current.allowed_to?(:manage_contestnotifications, @contest) %>
-</div>
-
-<h3><strong><%=h @contestnotification.title %></strong></h3>
-
-<% if authorize_for_contest('contestnotifications', 'edit') %>
-<div id="edit-contestnotifications" style="display:none;">
-	<%= labelled_form_for :contestnotifications, @contestnotification, :url => contest_contestnotification_path(@contestnotification),
-	:html => { :id => 'contestnotifications-form', :multipart => true, :method => :put } do |f| %>
-	<%= render :partial => 'form', :locals => { :f => f } %>
-	<%= submit_tag l(:button_save) %>
-	<%= preview_link preview_contestnotifications_path(:contest_id => @contest, :id => @contestnotification), 'contestnotifications-form',target='preview',{:class => ''} %> |
-	<%= link_to l(:button_cancel), "#", :onclick => '$("#edit-contestnotifications").hide(); return false;' %>
-	<% end %>
-	<div id="preview" class="wiki"></div>
-</div>
-<% end %>
-
-<div id="notificationcomments" style="margin-bottom:16px;">
-
-	<div style="margin:15px">
-		<span class="font_description"> <%= textilizable(@contestnotification, :description) %> </span>
-		<br/>
-		<%#= link_to_attachments @contestnotification %>
-		<br/>
-		<!--add comment-->
-		
-		<p>
-			<%= toggle_link l(:label_comment_add), "add_notificationcomment_form", :focus => "notificationcomment_notificationcomments" %>
-		</p>
-		<%= form_tag({:controller => 'notificationcomments', :action => 'create', :id => @contestnotification}, :id => "add_notificationcomment_form", :style => "display:none;") do %>
-		<div class="box">
-			<%= text_area 'notificationcomment', 'notificationcomments', :cols => 80, :rows => 15, :class => 'wiki-edit' %>
-			<%= wikitoolbar_for 'notificationcomment_notificationcomments' %>
-		</div>
-		<p>
-			<%= submit_tag l(:button_add) %>
-		</p>
-		<% end %>
-		
-
-		<% html_title @contestnotification.title -%>
-
-		<% content_for :header_tags do %>
-		<%= stylesheet_link_tag 'scm' %>
-		<% end %>
-
-		<!--dispaly comments-->
-		<div  class="line_heng"></div>
-	</div>
-	<h3 class="notificationcomments"><%= l(:label_comment_plural) %></h3>
-	<% notificationcomments = @notificationcomments.reverse %>
-	<% notificationcomments.each do |notificationcomment| %>
-	<% next if notificationcomment.new_record? %>
-	<table width="660px" border="0" align="center">
-		<tr>
-			<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(notificationcomment.author), :class => "avatar")%></td>
-			<td>
-			<table width="580px" border="0">
-				<tr>
-					<td colspan="2" valign="top"><strong><%= link_to_user(notificationcomment.author) if notificationcomment.respond_to?(:author) %> </strong><span class="font_lighter"><%= l(:label_project_newadd) %></span><%= l(:label_comment_plural) %></td>
-				</tr>
-				<tr>
-					<td colspan="2" width="580px" >
-					<p class="font_description">
-						<%= textilizable(notificationcomment.notificationcomments) %>
-					</p></td>
-				</tr>
-				<tr>
-					<td align="left"><span class="font_lighter"> <%= format_time(notificationcomment.created_at) %></span></td>
-					<td width="200" align="right" class="a"><%= link_to_if_authorized_contest image_tag('delete.png'), {:controller => 'notificationcomments', :action => 'destroy', :id => @contestnotifications, :notificationcomment_id => notificationcomment},
-					:data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %></td>
-				</tr>
-			</table></td>
-		</tr>
-	</table>
-	<% end if @notificationcomments.any? %>
-</div>
-
-<!--end-->
+
+<div class="contextual">
+	<%= watcher_link(@contestnotification, User.current) %>
+	<%= link_to(l(:button_edit),
+	edit_contest_contestnotification_path(@contestnotification),
+	:class => 'icon icon-edit',
+	:accesskey => accesskey(:edit),
+	:onclick => '$("#edit-contestnotifications").show(); return false;') if User.current.allowed_to?(:manage_contestnotifications, @contest) %>
+	<%= delete_link contest_contestnotification_path(@contestnotification) if User.current.allowed_to?(:manage_contestnotifications, @contest) %>
+</div>
+
+<h3><strong><%=h @contestnotification.title %></strong></h3>
+
+<% if authorize_for_contest('contestnotifications', 'edit') %>
+<div id="edit-contestnotifications" style="display:none;">
+	<%= labelled_form_for :contestnotifications, @contestnotification, :url => contest_contestnotification_path(@contestnotification),
+	:html => { :id => 'contestnotifications-form', :multipart => true, :method => :put } do |f| %>
+	<%= render :partial => 'form', :locals => { :f => f } %>
+	<%= submit_tag l(:button_save) %>
+	<%= preview_link preview_contestnotifications_path(:contest_id => @contest, :id => @contestnotification), 'contestnotifications-form',target='preview',{:class => ''} %> |
+	<%= link_to l(:button_cancel), "#", :onclick => '$("#edit-contestnotifications").hide(); return false;' %>
+	<% end %>
+	<div id="preview" class="wiki"></div>
+</div>
+<% end %>
+
+<div id="notificationcomments" style="margin-bottom:16px;">
+
+	<div style="margin:15px">
+		<span class="font_description"> <%= textilizable(@contestnotification, :description) %> </span>
+		<br/>
+		<%#= link_to_attachments @contestnotification %>
+		<br/>
+		<!--add comment-->
+		
+		<p>
+			<%= toggle_link l(:label_comment_add), "add_notificationcomment_form", :focus => "notificationcomment_notificationcomments" %>
+		</p>
+		<%= form_tag( contest_contestnotification_notificationcomments_path(@contest, @contestnotification) , :id => "add_notificationcomment_form", :style => "display:none;") do %>
+		<div class="box">
+			<%= text_area 'notificationcomment', 'notificationcomments', :cols => 80, :rows => 15, :class => 'wiki-edit' %>
+			<%= wikitoolbar_for 'notificationcomment_notificationcomments' %>
+		</div>
+		<p>
+			<%= submit_tag l(:button_add) %>
+		</p>
+		<% end %>
+		
+
+		<% html_title @contestnotification.title -%>
+
+		<% content_for :header_tags do %>
+		<%= stylesheet_link_tag 'scm' %>
+		<% end %>
+
+		<!--dispaly comments-->
+		<div  class="line_heng"></div>
+	</div>
+	<h3 class="notificationcomments"><%= l(:label_comment_plural) %></h3>
+	<% notificationcomments = @notificationcomments.reverse %>
+	<% notificationcomments.each do |notificationcomment| %>
+	<% next if notificationcomment.new_record? %>
+	<table width="660px" border="0" align="center">
+		<tr>
+			<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(notificationcomment.author), :class => "avatar")%></td>
+			<td>
+			<table width="580px" border="0">
+				<tr>
+					<td colspan="2" valign="top"><strong><%= link_to_user(notificationcomment.author) if notificationcomment.respond_to?(:author) %> </strong><span class="font_lighter"><%= l(:label_project_newadd) %></span><%= l(:label_comment_plural) %></td>
+				</tr>
+				<tr>
+					<td colspan="2" width="580px" >
+					<p class="font_description">
+						<%= textilizable(notificationcomment.notificationcomments) %>
+					</p></td>
+				</tr>
+				<tr>
+					<td align="left"><span class="font_lighter"> <%= format_time(notificationcomment.created_at) %></span></td>
+					<td width="200" align="right" class="a"><%= link_to_if_authorized_contest image_tag('delete.png'), {:controller => 'notificationcomments', :action => 'destroy', :id => @contestnotifications, :notificationcomment_id => notificationcomment},
+					:data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %></td>
+				</tr>
+			</table></td>
+		</tr>
+	</table>
+	<% end if @notificationcomments.any? %>
+</div>
+
+<!--end-->
diff --git a/config/routes.rb b/config/routes.rb
index a93d17242..3ba384a89 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -71,12 +71,15 @@ RedmineApp::Application.routes.draw do
   end
 
   #resources :contestnotifications, :only => [:index, :show, :edit, :update, :destroy]
-  match '/contestnotifications/:id/notificationcomments', :to => 'notificationcomments#create', :via => :post
-  match '/contestnotifications/:id/notificationcomments/:notificationcomment_id', :to => 'notificationcomments#destroy', :via => :delete
-  match '/contestnotifications/preview', :controller => 'previews', :action => 'contestnotifications', :as => 'preview_contestnotifications', :via => [:get, :post, :put]  
+  # match '/contestnotifications/:id/notificationcomments', :to => 'notificationcomments#create', :via => :post
+  # match '/contestnotifications/:id/notificationcomments/:notificationcomment_id', :to => 'notificationcomments#destroy', :via => :delete
+  # match '/contestnotifications/preview', :controller => 'previews', :action => 'contestnotifications', :as => 'preview_contestnotifications', :via => [:get, :post, :put]  
   ## new added by linchun #新竞赛相关
   resources :contests, only: [:index] do
-    resources :contestnotifications
+    resources :contestnotifications do
+      resources :notificationcomments
+    end
+
     collection do
       match 'new_contest'        , via: :get
       match 'join_in_contest'    , via: :post

From c3865ab319341b505b34c369cc6e5e5a2625a39b Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Sat, 7 Jun 2014 10:45:57 +0800
Subject: [PATCH 45/62] notificationcomments

---
 app/controllers/notificationcomments_controller.rb | 12 ++++++------
 app/models/contestnotification.rb                  |  2 +-
 app/views/contestnotifications/new.html.erb        |  2 +-
 config/routes.rb                                   |  1 +
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/controllers/notificationcomments_controller.rb b/app/controllers/notificationcomments_controller.rb
index 6e4b12eb8..80500ab10 100644
--- a/app/controllers/notificationcomments_controller.rb
+++ b/app/controllers/notificationcomments_controller.rb
@@ -8,14 +8,14 @@ class NotificationcommentsController < ApplicationController
     @contest = Contest.find(params[:contest_id])
     @contestnotification = Contestnotification.find(params[:contestnotification_id])
 
-    @notificaioncomment = Notificationcomment.new
-    @notificaioncomment.safe_attributes = params[:notificaioncomment]
-    @notificaioncomment.author = User.current
-    if @contestnotification.notificationcomments << @notificaioncomment
-      flash[:notice] = l(:label_comment_added)
+    # @notificaioncomment = Notificationcomment.new
+    # @notificaioncomment.safe_attributes = params[:notificationcomment]
+    # @notificaioncomment.author = User.current
+    comment = @contestnotification.notificationcomments.new(params[:notificationcomment].merge(author_id: User.current.id))
+    if comment.save
+      flash[:notice] = l(:label_comment_added) 
     end
 
-    #redirect_to contest_contestnotification_notificationcomment_path(@contest, @contestnotification, @notificaioncomment)
     redirect_to contest_contestnotification_path(@contest, @contestnotification)
   end
 
diff --git a/app/models/contestnotification.rb b/app/models/contestnotification.rb
index c96a61d92..0bda49548 100644
--- a/app/models/contestnotification.rb
+++ b/app/models/contestnotification.rb
@@ -5,7 +5,7 @@ class Contestnotification < ActiveRecord::Base
   #Contestnotification::Notificationcomment
   belongs_to :contest
   belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
-  has_many :notificationcomments, :dependent => :delete_all, :order => "created_at"
+  has_many :notificationcomments, as: :notificationcommented, :dependent => :delete_all, :order => "created_at"
   # fq
   has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy
   
diff --git a/app/views/contestnotifications/new.html.erb b/app/views/contestnotifications/new.html.erb
index c4e322ec8..634cf64c4 100644
--- a/app/views/contestnotifications/new.html.erb
+++ b/app/views/contestnotifications/new.html.erb
@@ -2,6 +2,6 @@
 <%= labelled_form_for @contestnotification, :url => contest_contestnotifications_path(@contest), :html => { :id => 'contestnotifications-form', :multipart => true } do |f| %>
   <%= render :partial => 'contestnotifications/form', :locals => { :f => f } %>
   <%= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %>
-  <%= preview_link preview_contestnotifications_path(:contest_id => @contest), 'contestnotifications-form' ,target='preview',{:class => 'whiteButton m3p10'}%>
+  <%= preview_link preview_contest_contestnotifications_path(:contest_id => @contest), 'contestnotifications-form' ,target='preview',{:class => 'whiteButton m3p10'}%>
 <% end %>
 <div id="preview" class="wiki"></div>
diff --git a/config/routes.rb b/config/routes.rb
index 3ba384a89..3937a2e20 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -77,6 +77,7 @@ RedmineApp::Application.routes.draw do
   ## new added by linchun #新竞赛相关
   resources :contests, only: [:index] do
     resources :contestnotifications do
+      get 'preview', on: :collection
       resources :notificationcomments
     end
 

From 467f8f54e16bfebf48e6cbff694c3ed9b02a1706 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Sat, 7 Jun 2014 11:15:58 +0800
Subject: [PATCH 46/62] sdf

---
 app/controllers/contestnotifications_controller.rb | 2 +-
 app/views/contestnotifications/show.html.erb       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/contestnotifications_controller.rb b/app/controllers/contestnotifications_controller.rb
index 5e935ff4d..47d85fe2b 100644
--- a/app/controllers/contestnotifications_controller.rb
+++ b/app/controllers/contestnotifications_controller.rb
@@ -158,7 +158,7 @@ class ContestnotificationsController < ApplicationController
     # format.html { redirect_to contestnotifications_url }
     # format.json { head :no_content }
     # end
-    @contestnotifications.destroy
+    @contestnotification.destroy
     redirect_to contest_contestnotifications_path(@contest)
   end
 
diff --git a/app/views/contestnotifications/show.html.erb b/app/views/contestnotifications/show.html.erb
index dab3761bd..17de4a85c 100644
--- a/app/views/contestnotifications/show.html.erb
+++ b/app/views/contestnotifications/show.html.erb
@@ -5,8 +5,8 @@
 	edit_contest_contestnotification_path(@contestnotification),
 	:class => 'icon icon-edit',
 	:accesskey => accesskey(:edit),
-	:onclick => '$("#edit-contestnotifications").show(); return false;') if User.current.allowed_to?(:manage_contestnotifications, @contest) %>
-	<%= delete_link contest_contestnotification_path(@contestnotification) if User.current.allowed_to?(:manage_contestnotifications, @contest) %>
+	:onclick => '$("#edit-contestnotifications").show(); return false;') if User.current%>
+	<%= delete_link contest_contestnotification_path(@contestnotification) if User.current%>
 </div>
 
 <h3><strong><%=h @contestnotification.title %></strong></h3>

From 53ded67d9d8f11b50d33bf0db4531021a693f600 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Sat, 7 Jun 2014 11:46:01 +0800
Subject: [PATCH 47/62] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BDok?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/contestnotifications/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/contestnotifications/show.html.erb b/app/views/contestnotifications/show.html.erb
index 17de4a85c..4a200d457 100644
--- a/app/views/contestnotifications/show.html.erb
+++ b/app/views/contestnotifications/show.html.erb
@@ -6,7 +6,7 @@
 	:class => 'icon icon-edit',
 	:accesskey => accesskey(:edit),
 	:onclick => '$("#edit-contestnotifications").show(); return false;') if User.current%>
-	<%= delete_link contest_contestnotification_path(@contestnotification) if User.current%>
+	<%= delete_link contest_contestnotification_path(@contest, @contestnotification) if User.current%>
 </div>
 
 <h3><strong><%=h @contestnotification.title %></strong></h3>

From 1393aebace1c6e3ebb833bfd9e2e54d2d58249c2 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Mon, 9 Jun 2014 11:30:18 +0800
Subject: [PATCH 48/62] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=86=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/contestnotifications/_form.html.erb | 4 ++--
 app/views/contestnotifications/index.html.erb | 6 +++---
 app/views/contestnotifications/new.html.erb   | 4 +++-
 app/views/contestnotifications/show.html.erb  | 2 +-
 app/views/layouts/base_courses.html.erb       | 2 +-
 app/views/layouts/base_newcontest.html.erb    | 9 ++++-----
 config/locales/en.yml                         | 8 ++++++--
 config/locales/zh.yml                         | 6 ++++++
 8 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/app/views/contestnotifications/_form.html.erb b/app/views/contestnotifications/_form.html.erb
index acfa20a7c..7e7b10a23 100644
--- a/app/views/contestnotifications/_form.html.erb
+++ b/app/views/contestnotifications/_form.html.erb
@@ -1,11 +1,11 @@
 <%= error_messages_for @contestnotifications %>
 <div class="add_frame_header" >
-	<%= l(:label_news_new) %>
+	<%= l(:bale_news_notice) %>
 </div>
 <div class="box tabular">
 <p><%= f.text_field :title, :required => true, :size => 60, :style => "width:488px;" %></p>
 <p><%= f.text_area :description, :required => true, :cols => 60, :rows => 11, :class => 'wiki-edit', :style => "width:490px;" %></p>
-<p id="attachments_form" style="margin-left:-10px;"><label style="padding-right: 15px;"><%= l(:label_attachment_plural) %></label><%= render :partial => 'attachments/form', :locals => {:container => @contestnotifications} %></p>
+
 </div>
 
 <%= wikitoolbar_for 'news_description' %>
diff --git a/app/views/contestnotifications/index.html.erb b/app/views/contestnotifications/index.html.erb
index 195257237..563b2d3e1 100644
--- a/app/views/contestnotifications/index.html.erb
+++ b/app/views/contestnotifications/index.html.erb
@@ -1,8 +1,8 @@
 <span style="font-size: 16px; border-bottom:1px solid #f0f0f0; margin-right: 15px;">
-	<%= l(:label_news) %>
+	<%= l(:label_notification) %>
 </span>
 
-<%= link_to(l(:label_news_new),
+<%= link_to(l(:bale_news_notice),
             new_contest_contestnotification_path(@contest),
             :class => 'icon icon-add',
             :onclick => 'showAndScrollTo("add-contestnotifications", "contestnotifications_title"); return false;') %>
@@ -48,7 +48,7 @@
                   <tr>
                     <td align="left"><span class="font_lighter"> <%= l :label_update_time %>
                       &nbsp;<%= format_time(contestnotifications.created_at) %></span></td>
-                    <td width="350" align="right" class="a"><%= link_to l(:label_project_newother), contest_contestnotification_path(@contest, contestnotifications) %><%#= "(#{l(:label_x_comments, :count => contestnotifications.notificationcomments_count)})" if contestnotifications.notificationcomments_count >= 0 %></td>
+                    <td width="350" align="right" class="a"><%= link_to l(:label_check_comment), contest_contestnotification_path(@contest, contestnotifications) %><%#= "(#{l(:label_x_comments, :count => contestnotifications.notificationcomments_count)})" if contestnotifications.notificationcomments_count >= 0 %></td>
                   </tr>
                 </table>
               </td>
diff --git a/app/views/contestnotifications/new.html.erb b/app/views/contestnotifications/new.html.erb
index 634cf64c4..42235dc83 100644
--- a/app/views/contestnotifications/new.html.erb
+++ b/app/views/contestnotifications/new.html.erb
@@ -2,6 +2,8 @@
 <%= labelled_form_for @contestnotification, :url => contest_contestnotifications_path(@contest), :html => { :id => 'contestnotifications-form', :multipart => true } do |f| %>
   <%= render :partial => 'contestnotifications/form', :locals => { :f => f } %>
   <%= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %>
-  <%= preview_link preview_contest_contestnotifications_path(:contest_id => @contest), 'contestnotifications-form' ,target='preview',{:class => 'whiteButton m3p10'}%>
+  <%#= preview_link preview_contest_contestnotifications_path(:contest_id => @contest), 'contestnotifications-form' ,target='preview',{:class => 'whiteButton m3p10'}%>
+  <%= submit_tag l(:button_cancel), :comfirm=> "are you sure", :class => "whiteButton m3p10 h30",:onclick => "cancel();" %>
+
 <% end %>
 <div id="preview" class="wiki"></div>
diff --git a/app/views/contestnotifications/show.html.erb b/app/views/contestnotifications/show.html.erb
index 4a200d457..5aedbf011 100644
--- a/app/views/contestnotifications/show.html.erb
+++ b/app/views/contestnotifications/show.html.erb
@@ -1,6 +1,6 @@
 
 <div class="contextual">
-	<%= watcher_link(@contestnotification, User.current) %>
+	<%#= watcher_link(@contestnotification, User.current) %>
 	<%= link_to(l(:button_edit),
 	edit_contest_contestnotification_path(@contestnotification),
 	:class => 'icon icon-edit',
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 4e0135eaa..dfdf0a102 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -234,7 +234,7 @@
   <div class="tabs_new">
     <ul>
       <li>
-        <%= link_to l(:label_course_overview), project_path(@project), :class => link_class(:overview) %>
+        <%= link_to l(:label_course_overview), project_path(@project), :class => link_class(:overviews) %>
       </li>
       <li>
         <%= link_to l(:label_homework), homework_project_path(@project), :class => link_class(:homework), :project_type => 1 %>
diff --git a/app/views/layouts/base_newcontest.html.erb b/app/views/layouts/base_newcontest.html.erb
index a4522d289..e1706b00c 100644
--- a/app/views/layouts/base_newcontest.html.erb
+++ b/app/views/layouts/base_newcontest.html.erb
@@ -213,12 +213,11 @@
 						
 						<div id="content">
 							<% if display_main_menu?(@contest) %>
-							<div class="tabs_new">
-								<%#= render_menu :contest_menu %>
+							<div class="tabs_new">			
 								<ul>								
-									<li><a><%= link_to l(:label_user_response), show_contest_contest_path(@contest)%></a></li>
-									<li><a><%= link_to l(:label_attending_contest), show_attendingcontest_contest_path(@contest)%></a></li>
-									<li><a><%= link_to l(:label_contest_notification),  contest_contestnotifications_path(@contest)%></a></li>
+									<li ><%= link_to l(:label_contest_userresponse), show_contest_contest_path(@contest), :class => link_class(:respond) %></li>
+									<li><%= link_to l(:label_contest_joincontest), show_attendingcontest_contest_path(@contest), :class => link_class(:attendingcontests) %></li>
+									<li><%= link_to l(:label_contest_notification),  contest_contestnotifications_path(@contest), :class => link_class(:contestnotifications) %></li>
 								</ul>								
 							</div>
 							<% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 43c24d30b..121810072 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1560,7 +1560,11 @@ en:
   label_course_file: File
   label_stores_index: Resource search
   label_course_news: News
-  
+  #wang
+  label_contest_userresponse: Userresponse
+  label_contest_joincontest: Joincontest
+  label_contest_notification: Notification
+  #end
   label_x_base_courses_member: 
     zero: member
     one: member
@@ -1753,7 +1757,7 @@ en:
   label_copyright: Copyright
   label_contact_us: Contact us
   label_record: 湘ICP备09019772
-  
+  label_check_comment: Check comment
 #end
 
   # ajax异步验证
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 027fa726b..ad500d46c 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1698,6 +1698,11 @@ zh:
   label_course_homework_list: 作业列表
   label_course_homework_new: 发布作业
   label_fork_homework_new: 选为作业
+  #wang
+  label_contest_userresponse: 用户留言
+  label_contest_joincontest: 参入竞赛
+  label_contest_notification: 竞赛通知
+  #end
   
   label_x_course_data: 
     zero: 资料
@@ -1987,6 +1992,7 @@ zh:
   label_copyright: 版权
   label_contact_us: 联系我们
   label_record: 湘ICP备09019772
+  label_check_comment: 查看通知评论
   #end  
 
   #end

From ca62bcd5c8bdd9c8b245b898737616d2f3ed9f1e Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Mon, 9 Jun 2014 16:08:35 +0800
Subject: [PATCH 49/62] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=86=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E7=AB=9E=E8=B5=9B=E9=80=9A=E7=9F=A5=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/contestnotifications/new.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/contestnotifications/new.html.erb b/app/views/contestnotifications/new.html.erb
index 42235dc83..30d5f0106 100644
--- a/app/views/contestnotifications/new.html.erb
+++ b/app/views/contestnotifications/new.html.erb
@@ -2,8 +2,8 @@
 <%= labelled_form_for @contestnotification, :url => contest_contestnotifications_path(@contest), :html => { :id => 'contestnotifications-form', :multipart => true } do |f| %>
   <%= render :partial => 'contestnotifications/form', :locals => { :f => f } %>
   <%= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %>
-  <%#= preview_link preview_contest_contestnotifications_path(:contest_id => @contest), 'contestnotifications-form' ,target='preview',{:class => 'whiteButton m3p10'}%>
-  <%= submit_tag l(:button_cancel), :comfirm=> "are you sure", :class => "whiteButton m3p10 h30",:onclick => "cancel();" %>
+  <%= submit_tag l(:button_cancel), :class => "whiteButton m3p10 h30",:onclick => "cancel();" %>
+
 
 <% end %>
 <div id="preview" class="wiki"></div>

From c7cecdeceac327c709258ed8145c74fc00212c76 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Mon, 9 Jun 2014 16:11:54 +0800
Subject: [PATCH 50/62] =?UTF-8?q?=E7=BB=99=E7=AB=9E=E8=B5=9B=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E8=AF=84=E8=AE=BA=E6=B7=BB=E5=8A=A0=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/contestnotifications/show.html.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/contestnotifications/show.html.erb b/app/views/contestnotifications/show.html.erb
index 5aedbf011..2a2123867 100644
--- a/app/views/contestnotifications/show.html.erb
+++ b/app/views/contestnotifications/show.html.erb
@@ -43,6 +43,7 @@
 		</div>
 		<p>
 			<%= submit_tag l(:button_add) %>
+			<%= submit_tag l(:button_cancel), :onclick => "cancel();" %>
 		</p>
 		<% end %>
 		

From a5b688399440d2b5665b771f69d912070ffba46c Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Mon, 9 Jun 2014 17:32:18 +0800
Subject: [PATCH 51/62] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E9=80=9A=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/contestnotifications/show.html.erb | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/views/contestnotifications/show.html.erb b/app/views/contestnotifications/show.html.erb
index 2a2123867..0a0d6ce67 100644
--- a/app/views/contestnotifications/show.html.erb
+++ b/app/views/contestnotifications/show.html.erb
@@ -1,23 +1,21 @@
 
 <div class="contextual">
-	<%#= watcher_link(@contestnotification, User.current) %>
 	<%= link_to(l(:button_edit),
-	edit_contest_contestnotification_path(@contestnotification),
+	edit_contest_contestnotification_path(@contest, @contestnotification),
 	:class => 'icon icon-edit',
 	:accesskey => accesskey(:edit),
-	:onclick => '$("#edit-contestnotifications").show(); return false;') if User.current%>
-	<%= delete_link contest_contestnotification_path(@contest, @contestnotification) if User.current%>
+	:onclick => '$("#edit-contestnotifications").show(); return true;') if User.current %>
+	<%= delete_link contest_contestnotification_path(@contest, @contestnotification) if User.current %>
 </div>
 
 <h3><strong><%=h @contestnotification.title %></strong></h3>
 
 <% if authorize_for_contest('contestnotifications', 'edit') %>
 <div id="edit-contestnotifications" style="display:none;">
-	<%= labelled_form_for :contestnotifications, @contestnotification, :url => contest_contestnotification_path(@contestnotification),
+	<%= labelled_form_for :contestnotifications, @contestnotifications, :url => contest_contestnotification_path(@contestnotifications),
 	:html => { :id => 'contestnotifications-form', :multipart => true, :method => :put } do |f| %>
 	<%= render :partial => 'form', :locals => { :f => f } %>
 	<%= submit_tag l(:button_save) %>
-	<%= preview_link preview_contestnotifications_path(:contest_id => @contest, :id => @contestnotification), 'contestnotifications-form',target='preview',{:class => ''} %> |
 	<%= link_to l(:button_cancel), "#", :onclick => '$("#edit-contestnotifications").hide(); return false;' %>
 	<% end %>
 	<div id="preview" class="wiki"></div>

From a40db3dc4b9249b2898448a292d81bb54b56dad4 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Tue, 10 Jun 2014 17:17:31 +0800
Subject: [PATCH 52/62] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BA=86=E7=AB=9E=E8=B5=9B=E6=89=80=E8=8E=B7=E5=A5=96=E9=A1=B9?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/welcome/contest.html.erb | 90 ++++++++++++++++++++----------
 config/locales/en.yml              |  1 +
 config/locales/zh.yml              |  1 +
 public/stylesheets/application.css |  6 ++
 4 files changed, 67 insertions(+), 31 deletions(-)

diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb
index e65e25304..e1578f673 100644
--- a/app/views/welcome/contest.html.erb
+++ b/app/views/welcome/contest.html.erb
@@ -138,7 +138,7 @@
 	<div style="clear:both"></div>
 
 
-<div id="J_Slide" class="d-p-index-box d-p-index-hotproject">
+<div id="J_Slide" class="d-p-index-box d-p-index-hotproject" >
 <h3 style="margin-left: 5px; color: #e8770d;"><strong><%=l(:label_current_hot_contest)%></strong></h3>
 	<span style="margin-top: -20px;float: right; display: block;"><%= link_to l(:label_more_information), {:controller => 'contests', :action => 'index', :host => Setting.contest_domain}, :target => "_blank" %></span>
 	<div class="d-p-projectlist-box">
@@ -179,37 +179,28 @@
 
 <div id="J_Slide" class="d-p-index-box d-p-index-hotproject" style="float: right;">
 <h3 style="margin-left: 5px; color: #e8770d;">
-	<strong><%=l(:label_issue_feedback_activities)%></strong>
-	<%= link_to l(:label_my_question), newbie_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%>
-	<%= link_to l(:label_my_feedback), suggestion_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%>
+	<strong><%=l(:label_notification)%></strong>
 </h3>
-	<span style="margin-top: -20px;float: right; display: block;"><%= link_to l(:label_more_information), forums_path %></span>
-	<div class="d-p-projectlist-box">
-		<ul class="d-p-projectlist">
-			<% find_new_forum_topics(11).each do |topic|%>
-			<li class="message-brief-intro" style="height: auto; line-height:2em; padding-bottom: 1px ">
-				<div  style="display: inline-block; width: 100%;">
-				  <span class="memo_activity text_nowrap"  style="color:gray; display: inline-block;  margin-bottom:6px; background: url('/images/list-icon.png') no-repeat scroll ;background-position: left center;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                    <%= link_to '['+topic.forum.name + ']',forum_path(topic.forum),:class => 'memo_Bar_title' %><%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url, :class => "gray" , :style => "font-size: 10pt !important;" %>
-				  </span>
-                  <div class='memo_activity memo_attr'>
-					<span class='memo_timestamp'>
-						<%= "#{l(:label_updated_time, value: time_tag_welcome(topic_last_time topic))}".html_safe %>
-					</span>
-					<span class="memo_author">
-						<%=l(:label_question_sponsor)%>:&nbsp;<%= link_to_user(topic.author) %>
-					</span>
-					<span class="memo_last_person">
-						<%=l(:label_final_reply)%>:&nbsp;<%=link_to_user topic.last_reply.try(:author) %>
-					</span>
-					<span class="memo_reply">
-						<%=l(:label_reply)%>(<%= link_to topic.try(:replies_count), topic.event_url %>)
-					</span>
-                  </div>
-                </div>
-			</li>
-			<% end %>
-		</ul>
+	<span style="margin-top: -20px;float: right; display: block;"><%#= link_to l(:label_more_information), forums_path %></span>
+	<div style="height: 400px; padding-top:6px;">
+		<fieldset style="padding-left: 36px; margin-left: 15px; height: 200px; width:380px; border-radius:5px;">
+			<div style="font-size:14px; color: #1166AD; padding-left:53px; ">2014年Android程序设计大赛获奖名单</div>
+			<div class="underline-contests_four"></div>
+			<marquee scrollamount=3 direction=up height=150 >
+				<div><span style="color: red">一等奖:</span>&nbsp<span style="color: blue">日记本</span></div>
+				<div><span style="color: red">二等奖:</span><span style="color: blue">笔记本</span></div>
+				<div><span style="color: red">三等奖:</span><span style="color: blue">钢笔</span></div>
+				<div><span style="color: red">一等奖:</span><span style="color: blue">日记本</span></div>
+				<div><span style="color: red">二等奖:</span><span style="color: blue">笔记本</span></div>
+				<div><span style="color: red">三等奖:</span><span style="color: blue">钢笔</span></div>
+				<div><span style="color: red">一等奖:</span><span style="color: blue">日记本</span></div>
+				<div><span style="color: red">二等奖:</span><span style="color: blue">笔记本</span></div>
+				<div><span style="color: red">三等奖:</span><span style="color: blue">钢笔</span></div>
+				<div><span style="color: red">一等奖:</span><span style="color: blue">日记本</span></div>
+				<div><span style="color: red">二等奖:</span><span style="color: blue">笔记本</span></div>
+				<div><span style="color: red">三等奖:</span><span style="color: blue">钢笔</span></div>
+			</marquee>
+		</fieldset>
 	</div>
 </div>
 
@@ -249,6 +240,43 @@
 	</div>
 </div>
 
+<div id="J_Slide" class="d-p-index-box d-p-index-hotproject" style="float: right;">
+<h3 style="margin-left: 5px; color: #e8770d;">
+	<strong><%=l(:label_issue_feedback_activities)%></strong>
+	<%= link_to l(:label_my_question), newbie_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%>
+	<%= link_to l(:label_my_feedback), suggestion_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%>
+</h3>
+	<span style="margin-top: -20px;float: right; display: block;"><%= link_to l(:label_more_information), forums_path %></span>
+	<div class="d-p-projectlist-box">
+		<ul class="d-p-projectlist">
+			<% find_new_forum_topics(11).each do |topic|%>
+			<li class="message-brief-intro" style="height: auto; line-height:2em; padding-bottom: 1px ">
+				<div  style="display: inline-block; width: 100%;">
+				  <span class="memo_activity text_nowrap"  style="color:gray; display: inline-block;  margin-bottom:6px; background: url('/images/list-icon.png') no-repeat scroll ;background-position: left center;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                    <%= link_to '['+topic.forum.name + ']',forum_path(topic.forum),:class => 'memo_Bar_title' %><%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url, :class => "gray" , :style => "font-size: 10pt !important;" %>
+				  </span>
+                  <div class='memo_activity memo_attr'>
+					<span class='memo_timestamp'>
+						<%= "#{l(:label_updated_time, value: time_tag_welcome(topic_last_time topic))}".html_safe %>
+					</span>
+					<span class="memo_author">
+						<%=l(:label_question_sponsor)%>:&nbsp;<%= link_to_user(topic.author) %>
+					</span>
+					<span class="memo_last_person">
+						<%=l(:label_final_reply)%>:&nbsp;<%=link_to_user topic.last_reply.try(:author) %>
+					</span>
+					<span class="memo_reply">
+						<%=l(:label_reply)%>(<%= link_to topic.try(:replies_count), topic.event_url %>)
+					</span>
+                  </div>
+                </div>
+			</li>
+			<% end %>
+		</ul>
+	</div>
+</div>
+
+
 <div class="clearfix"></div>
 <%= render partial: 'link_to_another' %>
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 121810072..237ca03ee 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1758,6 +1758,7 @@ en:
   label_contact_us: Contact us
   label_record: 湘ICP备09019772
   label_check_comment: Check comment
+  label_notification: Notification
 #end
 
   # ajax异步验证
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index ad500d46c..30fbfe7f2 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1993,6 +1993,7 @@ zh:
   label_contact_us: 联系我们
   label_record: 湘ICP备09019772
   label_check_comment: 查看通知评论
+  label_notification: 通知公告
   #end  
 
   #end
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index ba077555a..170c02186 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -2751,6 +2751,12 @@ div.repos_explain{
 	border-bottom: 1px dashed rgb(204, 204, 204);
 	width: 688px;	
 }
+.underline-contests_four{
+	margin-bottom: 10px;
+	border-bottom: 1px dashed rgb(204, 204, 204);
+	width: 349px;
+	padding-bottom:5px	
+}
 .contest-star{
 	color: #bb0000;
 }

From 5ef8626d71dab43daa462cbf8523cf6c58806ff6 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Wed, 11 Jun 2014 09:11:05 +0800
Subject: [PATCH 53/62] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=86=E7=AB=9E?=
 =?UTF-8?q?=E8=B5=9B=E5=AD=90=E7=AB=99=E9=A6=96=E9=A1=B5=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=AE=89=E5=8D=93=E7=AB=9E=E8=B5=9B=E7=BB=93=E6=9E=9C=E7=9A=84?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=8F=8A=E5=B8=83=E5=B1=80=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/welcome/contest.html.erb | 106 +++++++++++++++--------------
 1 file changed, 54 insertions(+), 52 deletions(-)

diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb
index e1578f673..d0b9789fe 100644
--- a/app/views/welcome/contest.html.erb
+++ b/app/views/welcome/contest.html.erb
@@ -177,34 +177,71 @@
 </div>
 
 
-<div id="J_Slide" class="d-p-index-box d-p-index-hotproject" style="float: right;">
+<div id="J_Slide" class="d-p-index-box d-p-index-hotproject" style="padding-left: 32px">
 <h3 style="margin-left: 5px; color: #e8770d;">
 	<strong><%=l(:label_notification)%></strong>
 </h3>
 	<span style="margin-top: -20px;float: right; display: block;"><%#= link_to l(:label_more_information), forums_path %></span>
-	<div style="height: 400px; padding-top:6px;">
-		<fieldset style="padding-left: 36px; margin-left: 15px; height: 200px; width:380px; border-radius:5px;">
+	<div style="height: 167px; padding-top:6px;">
+		<fieldset style="padding-left: 36px; margin-left: 13px; height: 150px; width:380px; border-radius:10px;">
 			<div style="font-size:14px; color: #1166AD; padding-left:53px; ">2014年Android程序设计大赛获奖名单</div>
 			<div class="underline-contests_four"></div>
-			<marquee scrollamount=3 direction=up height=150 >
-				<div><span style="color: red">一等奖:</span>&nbsp<span style="color: blue">日记本</span></div>
-				<div><span style="color: red">二等奖:</span><span style="color: blue">笔记本</span></div>
-				<div><span style="color: red">三等奖:</span><span style="color: blue">钢笔</span></div>
-				<div><span style="color: red">一等奖:</span><span style="color: blue">日记本</span></div>
-				<div><span style="color: red">二等奖:</span><span style="color: blue">笔记本</span></div>
-				<div><span style="color: red">三等奖:</span><span style="color: blue">钢笔</span></div>
-				<div><span style="color: red">一等奖:</span><span style="color: blue">日记本</span></div>
-				<div><span style="color: red">二等奖:</span><span style="color: blue">笔记本</span></div>
-				<div><span style="color: red">三等奖:</span><span style="color: blue">钢笔</span></div>
-				<div><span style="color: red">一等奖:</span><span style="color: blue">日记本</span></div>
-				<div><span style="color: red">二等奖:</span><span style="color: blue">笔记本</span></div>
-				<div><span style="color: red">三等奖:</span><span style="color: blue">钢笔</span></div>
+			<marquee scrollamount=3 direction=up height=100 >
+				<div><span style="color: red">一等奖:</span>&nbsp<span style="color: #1166AD">基于移动终端多种传感器数据研究的安全保密通讯软件 </span></div>
+				<div><span style="color: red">二等奖:</span>&nbsp<span style="color: #1166AD">消灭那怪兽 </span></div>
+				<div><span style="color: red">三等奖:</span>&nbsp<span style="color: #1166AD">疯狂猜图 </span></div>
+				<div><span style="color: red">一等奖:</span>&nbsp<span style="color: #1166AD">兄弟向前冲 </span></div>
+				<div><span style="color: red">二等奖:</span>&nbsp<span style="color: #1166AD">愉快的定向越野 </span></div>
+				<div><span style="color: red">三等奖:</span>&nbsp<span style="color: #1166AD">Lovecall </span></div>
+				<div><span style="color: red">一等奖:</span>&nbsp<span style="color: #1166AD">体能训练助手 </span></div>
+				<div><span style="color: red">二等奖:</span>&nbsp<span style="color: #1166AD">永齐飞机大战 </span></div>
+				<div><span style="color: red">三等奖:</span>&nbsp<span style="color: #1166AD">我要背单词-wordroid </span></div>
+				<div><span style="color: red">一等奖:</span>&nbsp<span style="color: #1166AD">迷你日记本 </span></div>
+				<div><span style="color: red">二等奖:</span>&nbsp<span style="color: #1166AD">克拉索夫越野导航 </span></div>
+				<div><span style="color: red">三等奖:</span>&nbsp<span style="color: #1166AD">高数小帮手 </span></div>
 			</marquee>
 		</fieldset>
 	</div>
 </div>
 
-<div id="J_Slide" class="d-p-index-box d-p-index-hotproject">
+<div id="J_Slide" class="d-p-index-box d-p-index-hotproject" style="float: right;">
+<h3 style="margin-left: 5px; color: #e8770d;">
+	<strong><%=l(:label_issue_feedback_activities)%></strong>
+	<%= link_to l(:label_my_question), newbie_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%>
+	<%= link_to l(:label_my_feedback), suggestion_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%>
+</h3>
+	<span style="margin-top: -20px;float: right; display: block;"><%= link_to l(:label_more_information), forums_path %></span>
+	<div class="d-p-projectlist-box">
+		<ul class="d-p-projectlist">
+			<% find_new_forum_topics(8).each do |topic|%>
+			<li class="message-brief-intro" style="height: auto; line-height:2em; padding-bottom: 1px ">
+				<div  style="display: inline-block; width: 100%;">
+				  <span class="memo_activity text_nowrap"  style="color:gray; display: inline-block;  margin-bottom:6px; background: url('/images/list-icon.png') no-repeat scroll ;background-position: left center;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                    <%= link_to '['+topic.forum.name + ']',forum_path(topic.forum),:class => 'memo_Bar_title' %><%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url, :class => "gray" , :style => "font-size: 10pt !important;" %>
+				  </span>
+                  <div class='memo_activity memo_attr'>
+					<span class='memo_timestamp'>
+						<%= "#{l(:label_updated_time, value: time_tag_welcome(topic_last_time topic))}".html_safe %>
+					</span>
+					<span class="memo_author">
+						<%=l(:label_question_sponsor)%>:&nbsp;<%= link_to_user(topic.author) %>
+					</span>
+					<span class="memo_last_person">
+						<%=l(:label_final_reply)%>:&nbsp;<%=link_to_user topic.last_reply.try(:author) %>
+					</span>
+					<span class="memo_reply">
+						<%=l(:label_reply)%>(<%= link_to topic.try(:replies_count), topic.event_url %>)
+					</span>
+                  </div>
+                </div>
+			</li>
+			<% end %>
+		</ul>
+	</div>
+</div>
+
+
+<div id="J_Slide" class="d-p-index-box d-p-index-hotproject" style="float: left;">
 <h3 style="margin-left: 5px; color: #e8770d;"><strong><%=l(:label_current_attendingcontest_work)%></strong></h3>
 	<span style="margin-top: -20px;float: right; display: block;"><%= link_to l(:label_more_information), {:controller => 'softapplications', :action => 'index', :host => Setting.contest_domain}, :target => "_blank" %></span>
 	<div class="d-p-projectlist-box">
@@ -240,41 +277,6 @@
 	</div>
 </div>
 
-<div id="J_Slide" class="d-p-index-box d-p-index-hotproject" style="float: right;">
-<h3 style="margin-left: 5px; color: #e8770d;">
-	<strong><%=l(:label_issue_feedback_activities)%></strong>
-	<%= link_to l(:label_my_question), newbie_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%>
-	<%= link_to l(:label_my_feedback), suggestion_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%>
-</h3>
-	<span style="margin-top: -20px;float: right; display: block;"><%= link_to l(:label_more_information), forums_path %></span>
-	<div class="d-p-projectlist-box">
-		<ul class="d-p-projectlist">
-			<% find_new_forum_topics(11).each do |topic|%>
-			<li class="message-brief-intro" style="height: auto; line-height:2em; padding-bottom: 1px ">
-				<div  style="display: inline-block; width: 100%;">
-				  <span class="memo_activity text_nowrap"  style="color:gray; display: inline-block;  margin-bottom:6px; background: url('/images/list-icon.png') no-repeat scroll ;background-position: left center;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                    <%= link_to '['+topic.forum.name + ']',forum_path(topic.forum),:class => 'memo_Bar_title' %><%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url, :class => "gray" , :style => "font-size: 10pt !important;" %>
-				  </span>
-                  <div class='memo_activity memo_attr'>
-					<span class='memo_timestamp'>
-						<%= "#{l(:label_updated_time, value: time_tag_welcome(topic_last_time topic))}".html_safe %>
-					</span>
-					<span class="memo_author">
-						<%=l(:label_question_sponsor)%>:&nbsp;<%= link_to_user(topic.author) %>
-					</span>
-					<span class="memo_last_person">
-						<%=l(:label_final_reply)%>:&nbsp;<%=link_to_user topic.last_reply.try(:author) %>
-					</span>
-					<span class="memo_reply">
-						<%=l(:label_reply)%>(<%= link_to topic.try(:replies_count), topic.event_url %>)
-					</span>
-                  </div>
-                </div>
-			</li>
-			<% end %>
-		</ul>
-	</div>
-</div>
 
 
 <div class="clearfix"></div>

From 877d8f84399094f829cbdfa7b6a38b8bf63c8f5a Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Wed, 11 Jun 2014 11:06:37 +0800
Subject: [PATCH 54/62] etr

---
 app/views/contestnotifications/edit.html.erb | 22 +++++---------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/app/views/contestnotifications/edit.html.erb b/app/views/contestnotifications/edit.html.erb
index a86a50419..eed11c1fe 100644
--- a/app/views/contestnotifications/edit.html.erb
+++ b/app/views/contestnotifications/edit.html.erb
@@ -1,19 +1,7 @@
-<!-- <h1>Editing contestnotification</h1>
+<%= labelled_form_for @contestnotification, :url => contest_contestnotification_path(@contest), :html => { :id => 'contestnotifications-form', :multipart => true } do |f| %>
+  <%= render :partial => 'contestnotifications/form', :locals => { :f => f } %>
+  <%= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %>
+  <%= submit_tag l(:button_cancel), :class => "whiteButton m3p10 h30",:onclick => "cancel();" %>
 
-<%= render 'form' %>
 
-<%= link_to 'Show', @contestnotification %> |
-<%= link_to 'Back', contestnotifications_path %> -->
-
-<h3><%=l(:label_news)%></h3>
-
-<%= labelled_form_for @contestnotifications, :html => { :id => 'contestnotifications-form', :multipart => true, :method => :put } do |f| %>
-<%= render :partial => 'form', :locals => { :f => f } %>
-<%= submit_tag l(:button_save) %>
-<%= preview_link preview_contestnotifications_path(:project_id => @contest, :id => @contestnotifications), 'contestnotifications-form' %>
-<% end %>
-<div id="preview" class="wiki"></div>
-
-<% content_for :header_tags do %>
-  <%= stylesheet_link_tag 'scm' %>
-<% end %>
+<% end %>
\ No newline at end of file

From 734d24661842ecec632828b7db82fa1fd0d66c5d Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Wed, 11 Jun 2014 11:13:10 +0800
Subject: [PATCH 55/62] sdf

---
 app/views/contestnotifications/edit.html.erb | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/views/contestnotifications/edit.html.erb b/app/views/contestnotifications/edit.html.erb
index eed11c1fe..f0b5fdfe9 100644
--- a/app/views/contestnotifications/edit.html.erb
+++ b/app/views/contestnotifications/edit.html.erb
@@ -1,7 +1,12 @@
-<%= labelled_form_for @contestnotification, :url => contest_contestnotification_path(@contest), :html => { :id => 'contestnotifications-form', :multipart => true } do |f| %>
-  <%= render :partial => 'contestnotifications/form', :locals => { :f => f } %>
-  <%= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %>
-  <%= submit_tag l(:button_cancel), :class => "whiteButton m3p10 h30",:onclick => "cancel();" %>
+<h3><%=l(:label_news)%></h3>
 
+<%= labelled_form_for @contestnotifications, :html => { :id => 'contestnotifications-form', :multipart => true, :method => :put } do |f| %>
+<%= render :partial => 'form', :locals => { :f => f } %>
+<%= submit_tag l(:button_save) %>
+<%= preview_link preview_contestnotifications_path(:project_id => @contest, :id => @contestnotifications), 'contestnotifications-form' %>
+<% end %>
+<div id="preview" class="wiki"></div>
 
+<% content_for :header_tags do %>
+  <%= stylesheet_link_tag 'scm' %>
 <% end %>
\ No newline at end of file

From bb06ee921a57446912ebb2cb00f1524d85ea0560 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Thu, 12 Jun 2014 09:35:34 +0800
Subject: [PATCH 56/62] sdf

---
 app/views/contestnotifications/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/contestnotifications/show.html.erb b/app/views/contestnotifications/show.html.erb
index 0a0d6ce67..016de36ca 100644
--- a/app/views/contestnotifications/show.html.erb
+++ b/app/views/contestnotifications/show.html.erb
@@ -1,6 +1,6 @@
 
 <div class="contextual">
-	<%= link_to(l(:button_edit),
+	<%#= link_to(l(:button_edit),
 	edit_contest_contestnotification_path(@contest, @contestnotification),
 	:class => 'icon icon-edit',
 	:accesskey => accesskey(:edit),

From 60bdff86a154d96f7b1d512cc56f3e15f2252e38 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Thu, 12 Jun 2014 10:59:05 +0800
Subject: [PATCH 57/62] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/contestnotifications/index.html.erb | 2 +-
 app/views/contestnotifications/show.html.erb  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/contestnotifications/index.html.erb b/app/views/contestnotifications/index.html.erb
index 563b2d3e1..a9ab5b775 100644
--- a/app/views/contestnotifications/index.html.erb
+++ b/app/views/contestnotifications/index.html.erb
@@ -38,7 +38,7 @@
                     <td colspan="2" valign="top">
                       <strong><%= link_to_user(contestnotifications.author) if contestnotifications.respond_to?(:author) %></strong><span style="margin-left: 4px;" class="font_lighter">
                       <%= l(:label_project_notice) %></span><span><%= link_to h(contestnotifications.title), contest_contestnotification_path(@contest, contestnotifications) %></span>
-                      <span style="float: right"><%= delete_link contest_contestnotification_path(@contest, contestnotifications) if true || User.current.allowed_to?(:manage_contestnotifications, @contest) %> </span>
+                      <span style="float: right"><%= delete_link contest_contestnotification_path(@contest, contestnotifications) if (User.current.admin? && User.current.logged? )||(User.current == @contest.author && User.current.logged?) %> </span>
                     </td>
                   </tr>
                   <tr>
diff --git a/app/views/contestnotifications/show.html.erb b/app/views/contestnotifications/show.html.erb
index 016de36ca..8cc9c8adb 100644
--- a/app/views/contestnotifications/show.html.erb
+++ b/app/views/contestnotifications/show.html.erb
@@ -5,7 +5,7 @@
 	:class => 'icon icon-edit',
 	:accesskey => accesskey(:edit),
 	:onclick => '$("#edit-contestnotifications").show(); return true;') if User.current %>
-	<%= delete_link contest_contestnotification_path(@contest, @contestnotification) if User.current %>
+	<%= delete_link contest_contestnotification_path(@contest, @contestnotification) if (User.current.admin? && User.current.logged? )||(User.current == @contest.author && User.current.logged?) %>
 </div>
 
 <h3><strong><%=h @contestnotification.title %></strong></h3>

From d76eec27cce25671b0be7b81c99d475dfe59c954 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Thu, 12 Jun 2014 11:11:12 +0800
Subject: [PATCH 58/62] =?UTF-8?q?=E4=B8=BA=E7=AB=9E=E8=B5=9B=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E8=AF=84=E8=AE=BA=E6=B7=BB=E5=8A=A0=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/contestnotifications/index.html.erb |  9 +++++++++
 app/views/contestnotifications/show.html.erb  | 12 +++++++++---
 config/locales/en.yml                         |  1 +
 config/locales/zh.yml                         |  1 +
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/app/views/contestnotifications/index.html.erb b/app/views/contestnotifications/index.html.erb
index a9ab5b775..434b71ce8 100644
--- a/app/views/contestnotifications/index.html.erb
+++ b/app/views/contestnotifications/index.html.erb
@@ -2,10 +2,19 @@
 	<%= l(:label_notification) %>
 </span>
 
+<% if User.current.logged? %>
 <%= link_to(l(:bale_news_notice),
             new_contest_contestnotification_path(@contest),
             :class => 'icon icon-add',
             :onclick => 'showAndScrollTo("add-contestnotifications", "contestnotifications_title"); return false;') %>
+<% else %>
+ 
+      <%= l(:label_user_login_attending_contest) %>
+      <%= link_to l(:label_user_login_new), signin_path %>
+
+<% end %>
+
+
 
 <% if @contest && User.current.allowed_to?(:manage_contestnotifications, @contest) %>
     <div id="add-contestnotifications" class="add_frame" style="display:none;">
diff --git a/app/views/contestnotifications/show.html.erb b/app/views/contestnotifications/show.html.erb
index 8cc9c8adb..d2c3ff13f 100644
--- a/app/views/contestnotifications/show.html.erb
+++ b/app/views/contestnotifications/show.html.erb
@@ -30,10 +30,16 @@
 		<%#= link_to_attachments @contestnotification %>
 		<br/>
 		<!--add comment-->
+
+		<% if User.current.logged? %>
+			<p>
+				<%= toggle_link l(:label_comment_add), "add_notificationcomment_form", :focus => "notificationcomment_notificationcomments" %>
+			</p>
+		<% else %> 
+      		<%= l(:label_user_login_notificationcomment) %>
+      		<%= link_to l(:label_user_login_new), signin_path %>
+		<% end %>
 		
-		<p>
-			<%= toggle_link l(:label_comment_add), "add_notificationcomment_form", :focus => "notificationcomment_notificationcomments" %>
-		</p>
 		<%= form_tag( contest_contestnotification_notificationcomments_path(@contest, @contestnotification) , :id => "add_notificationcomment_form", :style => "display:none;") do %>
 		<div class="box">
 			<%= text_area 'notificationcomment', 'notificationcomments', :cols => 80, :rows => 15, :class => 'wiki-edit' %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 237ca03ee..6e42d7800 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1734,6 +1734,7 @@ en:
   label_contest_innovate_community: Competition community
   
   label_user_login_score_and_comment: You are not logged in, please log in and then score and comment the work!
+  label_user_login_notificationcomment: You are not logged in, please log in and then comment the notification!
   label_contest_work_list: Competition work list
   
   
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 30fbfe7f2..643706da9 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -563,6 +563,7 @@ zh:
   label_user_login_project_board: 您还没有登录，请登录后参与项目讨论
   label_user_login_attending_contest: 您还没有登录，请登录后参赛
   label_user_login_score_and_comment: 您还没有登录，请登录后对作品进行打分评价
+  label_user_login_notificationcomment: 您还没有登录，请登录后参加评论
   #end
   #by huang    # modified by bai
   label_college: 高校进入

From 15c88df72d2cd07c15703009edf5df3b6a55a803 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Thu, 12 Jun 2014 11:17:09 +0800
Subject: [PATCH 59/62] =?UTF-8?q?=E4=B8=BA=E5=8F=91=E5=B8=83=E7=AB=9E?=
 =?UTF-8?q?=E8=B5=9B=E9=80=9A=E7=9F=A5=E6=B7=BB=E5=8A=A0=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/contestnotifications/index.html.erb | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/views/contestnotifications/index.html.erb b/app/views/contestnotifications/index.html.erb
index 434b71ce8..c71c9703d 100644
--- a/app/views/contestnotifications/index.html.erb
+++ b/app/views/contestnotifications/index.html.erb
@@ -2,16 +2,11 @@
 	<%= l(:label_notification) %>
 </span>
 
-<% if User.current.logged? %>
+<% if User.current.logged? && User.current == @contest.author %>
 <%= link_to(l(:bale_news_notice),
             new_contest_contestnotification_path(@contest),
             :class => 'icon icon-add',
             :onclick => 'showAndScrollTo("add-contestnotifications", "contestnotifications_title"); return false;') %>
-<% else %>
- 
-      <%= l(:label_user_login_attending_contest) %>
-      <%= link_to l(:label_user_login_new), signin_path %>
-
 <% end %>
 
 

From 52e7be1b1d768099b82c73eb4c0cbd613cfad2d9 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Thu, 12 Jun 2014 15:37:45 +0800
Subject: [PATCH 60/62] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E4=B8=AD=E8=AF=84=E5=A5=96=E7=BB=93=E6=9E=9C=E7=9A=84=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=AD=97=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/welcome/contest.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb
index d0b9789fe..deb6c166a 100644
--- a/app/views/welcome/contest.html.erb
+++ b/app/views/welcome/contest.html.erb
@@ -184,7 +184,7 @@
 	<span style="margin-top: -20px;float: right; display: block;"><%#= link_to l(:label_more_information), forums_path %></span>
 	<div style="height: 167px; padding-top:6px;">
 		<fieldset style="padding-left: 36px; margin-left: 13px; height: 150px; width:380px; border-radius:10px;">
-			<div style="font-size:14px; color: #1166AD; padding-left:53px; ">2014年Android程序设计大赛获奖名单</div>
+			<div style="font-size:14px; color: #1166AD; padding-left:52px; "><strong>2014年Android程序设计大赛获奖名单</strong></div>
 			<div class="underline-contests_four"></div>
 			<marquee scrollamount=3 direction=up height=100 >
 				<div><span style="color: red">一等奖:</span>&nbsp<span style="color: #1166AD">基于移动终端多种传感器数据研究的安全保密通讯软件 </span></div>

From 8618b73a8c2b44a525b7b18be5a1d5bf8a0a8d40 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Thu, 12 Jun 2014 16:58:01 +0800
Subject: [PATCH 61/62] =?UTF-8?q?=E6=9C=AC=E6=AC=A1=E5=AE=89=E5=8D=93?=
 =?UTF-8?q?=E6=A0=A1=E5=9B=AD=E7=AB=9E=E8=B5=9B=E8=8E=B7=E5=A5=96=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E6=9B=B4=E6=96=B0=EF=BC=8C=E9=A6=96=E9=A1=B5=E6=AD=A3?=
 =?UTF-8?q?=E5=B8=B8=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/welcome/contest.html.erb | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb
index deb6c166a..c87cc13e1 100644
--- a/app/views/welcome/contest.html.erb
+++ b/app/views/welcome/contest.html.erb
@@ -187,18 +187,14 @@
 			<div style="font-size:14px; color: #1166AD; padding-left:52px; "><strong>2014年Android程序设计大赛获奖名单</strong></div>
 			<div class="underline-contests_four"></div>
 			<marquee scrollamount=3 direction=up height=100 >
-				<div><span style="color: red">一等奖:</span>&nbsp<span style="color: #1166AD">基于移动终端多种传感器数据研究的安全保密通讯软件 </span></div>
-				<div><span style="color: red">二等奖:</span>&nbsp<span style="color: #1166AD">消灭那怪兽 </span></div>
-				<div><span style="color: red">三等奖:</span>&nbsp<span style="color: #1166AD">疯狂猜图 </span></div>
-				<div><span style="color: red">一等奖:</span>&nbsp<span style="color: #1166AD">兄弟向前冲 </span></div>
-				<div><span style="color: red">二等奖:</span>&nbsp<span style="color: #1166AD">愉快的定向越野 </span></div>
-				<div><span style="color: red">三等奖:</span>&nbsp<span style="color: #1166AD">Lovecall </span></div>
-				<div><span style="color: red">一等奖:</span>&nbsp<span style="color: #1166AD">体能训练助手 </span></div>
-				<div><span style="color: red">二等奖:</span>&nbsp<span style="color: #1166AD">永齐飞机大战 </span></div>
-				<div><span style="color: red">三等奖:</span>&nbsp<span style="color: #1166AD">我要背单词-wordroid </span></div>
-				<div><span style="color: red">一等奖:</span>&nbsp<span style="color: #1166AD">迷你日记本 </span></div>
-				<div><span style="color: red">二等奖:</span>&nbsp<span style="color: #1166AD">克拉索夫越野导航 </span></div>
-				<div><span style="color: red">三等奖:</span>&nbsp<span style="color: #1166AD">高数小帮手 </span></div>
+				<div><span style="color: red">一等奖:</span>&nbsp<span style="color: #1166AD">消灭那怪兽</span></div>
+				<div><span style="color: red">二等奖:</span>&nbsp<span style="color: #1166AD">兄弟向前冲 </span></div>
+				<div><span style="color: red">二等奖:</span>&nbsp<span style="color: #1166AD">鸟鸟文件管理器（银河之光版）</span></div>
+				<div><span style="color: red">三等奖:</span>&nbsp<span style="color: #1166AD">疯狂猜图</span></div>
+				<div><span style="color: red">三等奖:</span>&nbsp<span style="color: #1166AD">愉快的定向越野 </span></div>
+				<div><span style="color: red">三等奖:</span>&nbsp<span style="color: #1166AD">体能训练助手 </span></div>
+				<div><span style="color: red">三等奖:</span>&nbsp<span style="color: #1166AD">迷你日记本 </span></div>
+				<div><span style="color: red">三等奖:</span>&nbsp<span style="color: #1166AD">永齐飞机大战</span></div>
 			</marquee>
 		</fieldset>
 	</div>

From 362570e34bd2a183f4ec983cbbbd995124b07707 Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmail.com>
Date: Fri, 13 Jun 2014 09:38:51 +0800
Subject: [PATCH 62/62] contestnotification_edit function

---
 .../contestnotifications_controller.rb        | 19 +++++++++++++++----
 app/controllers/previews_controller.rb        |  8 +++++++-
 app/views/contestnotifications/edit.html.erb  |  4 ++--
 app/views/contestnotifications/index.html.erb |  5 ++++-
 app/views/contestnotifications/show.html.erb  |  4 ++--
 config/routes.rb                              |  4 ++--
 6 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/app/controllers/contestnotifications_controller.rb b/app/controllers/contestnotifications_controller.rb
index 47d85fe2b..0d05d6ca1 100644
--- a/app/controllers/contestnotifications_controller.rb
+++ b/app/controllers/contestnotifications_controller.rb
@@ -4,8 +4,8 @@ class ContestnotificationsController < ApplicationController
   layout 'base_newcontest'
   default_search_scope :contestnotifications
   model_object Contestnotification
-  before_filter :find_model_object, :except => [:new, :create, :index]
-  before_filter :find_contest_from_association, :except => [:new, :create, :index]
+  # before_filter :find_model_object, :except => [:new, :create, :index]
+  # before_filter :find_contest_from_association, :except => [:new, :create, :index]
   before_filter :find_contest_by_contest_id, :only => [:new, :create]
   before_filter :find_contest
   before_filter :find_author
@@ -14,6 +14,8 @@ class ContestnotificationsController < ApplicationController
   accept_rss_auth :index
   accept_api_auth :index
 
+  before_filter :access_edit_destroy, only: [:edit ,:update, :destroy]
+
   def find_author
     @user = @contest.author
     render_404 if @user.nil?
@@ -93,7 +95,7 @@ class ContestnotificationsController < ApplicationController
 
   # GET /contestnotifications/1/edit
   def edit
-    # @contestnotification = Contestnotification.find(params[:id])
+    @contestnotification = Contestnotification.find(params[:id])
   end
 
   # POST /contestnotifications
@@ -137,12 +139,13 @@ class ContestnotificationsController < ApplicationController
     # format.json { render json: @contestnotification.errors, status: :unprocessable_entity }
     # end
     # end
+    @contestnotification = Contestnotification.find(params[:id])
     @contestnotification.safe_attributes = params[:contestnotification]
     @contestnotification.save_attachments(params[:attachments])
     if @contestnotification.save
       render_attachment_warning_if_needed(@contestnotification)
       flash[:notice] = l(:notice_successful_update)
-      redirect_to contest_contestnotification_path(@contestnotification)
+      redirect_to contest_contestnotification_path(@contestnotification.contest, @contestnotification)
     else
       render :action => 'edit'
     end
@@ -172,4 +175,12 @@ class ContestnotificationsController < ApplicationController
     render_404
   end
 
+  def access_edit_destroy
+    if (User.current.admin? && User.current.logged? )||(User.current == @contest.author && User.current.logged?)
+      return true
+    else
+      render_403
+    end
+  end
+
 end
diff --git a/app/controllers/previews_controller.rb b/app/controllers/previews_controller.rb
index 2ca2cef9e..579f8caa8 100644
--- a/app/controllers/previews_controller.rb
+++ b/app/controllers/previews_controller.rb
@@ -16,7 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class PreviewsController < ApplicationController
-  before_filter :find_project, :find_attachments, :find_contest
+  before_filter :find_project, :find_attachments, :find_contest, except: [:contestnotification]
 
   def issue
     @issue = @project.issues.find_by_id(params[:id]) unless params[:id].blank?
@@ -42,6 +42,12 @@ class PreviewsController < ApplicationController
     render :partial => 'common/preview'
   end
 
+  def contestnotification
+    @previewed = Contestnotification.find(params[:id])
+    @text = (params[:contestnotification] ? params[:contestnotification][:description] : nil)
+    render :partial => 'common/preview'
+  end
+
   private
 
   def find_project
diff --git a/app/views/contestnotifications/edit.html.erb b/app/views/contestnotifications/edit.html.erb
index f0b5fdfe9..7b91d922c 100644
--- a/app/views/contestnotifications/edit.html.erb
+++ b/app/views/contestnotifications/edit.html.erb
@@ -1,9 +1,9 @@
 <h3><%=l(:label_news)%></h3>
 
-<%= labelled_form_for @contestnotifications, :html => { :id => 'contestnotifications-form', :multipart => true, :method => :put } do |f| %>
+<%= labelled_form_for @contestnotification, url:  contest_contestnotification_path, :html => { :id => 'contestnotifications-form', :multipart => true, :method => :put } do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
 <%= submit_tag l(:button_save) %>
-<%= preview_link preview_contestnotifications_path(:project_id => @contest, :id => @contestnotifications), 'contestnotifications-form' %>
+<%= preview_link preview_contestnotifications_path(id: @contestnotification), 'contestnotifications-form' %>
 <% end %>
 <div id="preview" class="wiki"></div>
 
diff --git a/app/views/contestnotifications/index.html.erb b/app/views/contestnotifications/index.html.erb
index c71c9703d..e05abbdc8 100644
--- a/app/views/contestnotifications/index.html.erb
+++ b/app/views/contestnotifications/index.html.erb
@@ -42,7 +42,10 @@
                     <td colspan="2" valign="top">
                       <strong><%= link_to_user(contestnotifications.author) if contestnotifications.respond_to?(:author) %></strong><span style="margin-left: 4px;" class="font_lighter">
                       <%= l(:label_project_notice) %></span><span><%= link_to h(contestnotifications.title), contest_contestnotification_path(@contest, contestnotifications) %></span>
-                      <span style="float: right"><%= delete_link contest_contestnotification_path(@contest, contestnotifications) if (User.current.admin? && User.current.logged? )||(User.current == @contest.author && User.current.logged?) %> </span>
+                      <span style="float: right">
+                        <%= link_to l(:button_edit), edit_contest_contestnotification_path(@contest, contestnotifications) if (User.current.admin? && User.current.logged? )||(User.current == @contest.author && User.current.logged?) %> 
+                        <%= delete_link contest_contestnotification_path(@contest, contestnotifications) if (User.current.admin? && User.current.logged? )||(User.current == @contest.author && User.current.logged?) %> 
+                      </span>
                     </td>
                   </tr>
                   <tr>
diff --git a/app/views/contestnotifications/show.html.erb b/app/views/contestnotifications/show.html.erb
index d2c3ff13f..152d0d02a 100644
--- a/app/views/contestnotifications/show.html.erb
+++ b/app/views/contestnotifications/show.html.erb
@@ -1,10 +1,10 @@
 
 <div class="contextual">
-	<%#= link_to(l(:button_edit),
+	<%= link_to(l(:button_edit),
 	edit_contest_contestnotification_path(@contest, @contestnotification),
 	:class => 'icon icon-edit',
 	:accesskey => accesskey(:edit),
-	:onclick => '$("#edit-contestnotifications").show(); return true;') if User.current %>
+	:onclick => '$("#edit-contestnotifications").show(); return true;') if (User.current.admin? && User.current.logged? )||(User.current == @contest.author && User.current.logged?)%>
 	<%= delete_link contest_contestnotification_path(@contest, @contestnotification) if (User.current.admin? && User.current.logged? )||(User.current == @contest.author && User.current.logged?) %>
 </div>
 
diff --git a/config/routes.rb b/config/routes.rb
index 3937a2e20..ce75eafd7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -73,11 +73,11 @@ RedmineApp::Application.routes.draw do
   #resources :contestnotifications, :only => [:index, :show, :edit, :update, :destroy]
   # match '/contestnotifications/:id/notificationcomments', :to => 'notificationcomments#create', :via => :post
   # match '/contestnotifications/:id/notificationcomments/:notificationcomment_id', :to => 'notificationcomments#destroy', :via => :delete
-  # match '/contestnotifications/preview', :controller => 'previews', :action => 'contestnotifications', :as => 'preview_contestnotifications', :via => [:get, :post, :put]  
+  match '/contestnotifications/preview', :controller => 'previews', :action => 'contestnotification', :as => 'preview_contestnotifications', :via => [:get, :post, :put]  
   ## new added by linchun #新竞赛相关
   resources :contests, only: [:index] do
     resources :contestnotifications do
-      get 'preview', on: :collection
+      # get 'preview', on: :collection
       resources :notificationcomments
     end