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

Conflicts:
	db/schema.rb

app/controllers/admin_controller.rb

@@ -234,4 +234,96 @@ class AdminController < ApplicationController
       format.api
     end
   end
+
+  #首页定制
+  def first_page_made
+    if request.get?
+      @first_page = FirstPage.where("page_type = 'project'").first
+    elsif request.post?
+      @first_page = FirstPage.where("page_type = 'project'").first
+      @first_page.web_title = params[:web_title]
+      @first_page.description = params[:description]
+      @first_page.title = params[:title]
+      if @first_page.save
+        respond_to do |format|
+          format.html {
+            flash[:notice] = l(:notice_successful_update)
+            redirect_to admin_first_page_made_path
+          }
+          format.api  { render_api_ok }
+        end
+      else
+        respond_to do |format|
+          format.html {
+            first_page_made
+            render :action => 'first_page_made'
+          }
+          format.api  { render_validation_errors(@first_page) }
+        end
+      end
+    end
+  end
+
+  def course_page_made
+    if request.get?
+      @course_page = FirstPage.where("page_type = 'course'").first
+      @first_page = FirstPage.where("page_type = 'project'").first
+    elsif request.post?
+      @first_page = FirstPage.where("page_type = 'project'").first
+      @course_page = FirstPage.where("page_type = 'course'").first
+      @first_page.web_title = params[:web_title]
+      @course_page.title = params[:course_title]
+      @course_page.description = params[:course_description]
+      if @first_page.save && @course_page.save
+        respond_to do |format|
+          format.html {
+            flash[:notice] = l(:notice_successful_update)
+            redirect_to admin_course_page_made_path
+          }
+          format.api  { render_api_ok }
+        end
+      else
+        respond_to do |format|
+          format.html {
+            course_page_made
+            render :action => 'course_page_made'
+          }
+          format.api  { render_validation_errors(@first_page) }
+          format.api  { render_validation_errors(@course_page) }
+        end
+      end
+    end
+  end
+
+  def contest_page_made
+    if request.get?
+      @contest_page = FirstPage.where("page_type = 'contest'").first
+      @first_page = FirstPage.where("page_type = 'project'").first
+    elsif request.post?
+      @first_page = FirstPage.where("page_type = 'project'").first
+      @contest_page = FirstPage.where("page_type = 'contest'").first
+      @first_page.web_title = params[:web_title]
+      @contest_page.title = params[:contest_title]
+      @contest_page.description = params[:contest_description]
+      if @first_page.save && @contest_page.save
+        respond_to do |format|
+          format.html {
+            flash[:notice] = l(:notice_successful_update)
+            redirect_to admin_contest_page_made_path
+          }
+          format.api  { render_api_ok }
+        end
+      else
+        respond_to do |format|
+          format.html {
+            contest_page_made
+            render :action => 'contest_page_made'
+          }
+          format.api  { render_validation_errors(@first_page) }
+          format.api  { render_validation_errors(@contest_page) }
+        end
+      end
+    end
+  end
+
 end

app/controllers/bids_controller.rb

@@ -449,7 +449,7 @@ class BidsController < ApplicationController
   # 显示作业课程
   # add by nwb
   def show_courseEx
-    if (User.current.logged? && User.current.member_of_course?(@bid.courses.first))
+    if (User.current.logged? && (User.current.member_of_course?(@bid.courses.first) || User.current.admin?))
       # flash[:notice] = ""
       @membership = User.current.coursememberships.all(:conditions => Course.visible_condition(User.current))
 

app/controllers/welcome_controller.rb

@@ -16,12 +16,13 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class WelcomeController < ApplicationController
+  include ApplicationHelper
   caches_action :robots
   # before_filter :fake, :only => [:index, :course]
   before_filter :entry_select, :only => [:index]
  
   def index
-
+    @first_page = FirstPage.where("page_type = 'project'").first
   end
 
   def robots
@@ -30,6 +31,7 @@ class WelcomeController < ApplicationController
   end
   
   def course
+    @course_page = FirstPage.where("page_type = 'course'").first
     if params[:school_id]
       @school_id = params[:school_id]
     elsif User.current.logged?  && User.current.user_extensions.school
@@ -41,13 +43,24 @@ class WelcomeController < ApplicationController
   
   
  def logolink()
+   @course_page = FirstPage.where("page_type = 'course'").first
+   logo = get_avatar?(@course_page)
     id = params[:school_id]
     logo_link = ""
-    if id.nil? and User.current.user_extensions.school.nil?
-      logo_link = '/images/transparent.png'
+    if id.nil? && User.current.user_extensions.school.nil?
+      if logo
+        logo_link = url_to_avatar(@course_page)
+      else
+        logo_link = '/images/transparent.png'
+      end
+
     else
       if id == "0"
-        logo_link = '/images/transparent.png'
+        if logo
+          logo_link = url_to_avatar(@course_page)
+        else
+          logo_link = '/images/transparent.png'
+        end
       else
         if id.nil?
           if School.find(User.current.user_extensions.school.id).logo_link.nil?
@@ -66,7 +79,7 @@ class WelcomeController < ApplicationController
   
   
   def contest
-
+    @contest_page = FirstPage.where("page_type = 'contest'").first
   end
 
   def search

app/helpers/application_helper.rb

@@ -256,8 +256,8 @@ module ApplicationHelper
   end
 
   def format_activity_description(text)
-    h(truncate(text.to_s, :length => 120).gsub(%r{[\r\n]*<(pre|code)>.*$}m, '...')
-       ).gsub(/[\r\n]+/, "<br />").html_safe
+    h(truncate(text.to_s, :length => 120).gsub(%r{[\r\n]*<(pre|code)>.*$}m, '...')).gsub(/[\r\n]+/, "<br />").html_safe
+    #h(truncate(text.to_s, :length => 120).gsub(/<\/?.*?>/,"")).html_safe
   end
 
   def format_version_name(version)
@@ -625,10 +625,15 @@ module ApplicationHelper
   end
 
   def html_title(*args)
+    first_page = FirstPage.where("page_type = 'project'").first
     if args.empty?
       title = @html_title || []
       title << @project.name if @project
-      title << Setting.app_title unless Setting.app_title == title.last
+      if first_page.nil? || first_page.web_title.nil?
+        title << Setting.app_title unless Setting.app_title == title.last
+      else
+        title << first_page.web_title unless  first_page.web_title == title.last
+      end
       title.select {|t| !t.blank? }.join(' - ')
     else
       @html_title ||= []

app/models/course.rb

@@ -104,7 +104,19 @@ class Course < ActiveRecord::Base
 
   # 课程的短描述信息
   def short_description(length = 255)
-    description.gsub(/^(.{#{length}}[^\n\r]*).*$/m, '\1...').strip if description
+    description.gsub(/<\/?.*?>/,"").html_safe if description
+    #description.gsub(/^(.{#{length}}[^\n\r]*).*$/m, '\1...').strip if description
+  end
+
+  def strip_html(html)
+    return html if html.empty? || !html.include?('<')
+    output = ""
+    tokenizer = HTML::Tokenizer.new(html)
+    while token = tokenizer.next
+      node = HTML::Node.parse(nil, 0, 0, token, false)
+      output += token unless (node.kind_of? HTML::Tag) or (token =~ /^<!/)
+    end
+    return output
   end
 
   def extra_frozen?

app/models/first_page.rb

@@ -0,0 +1,3 @@
+class FirstPage < ActiveRecord::Base
+  attr_accessible :description, :title, :web_title,:page_type
+end

app/models/issue.rb

@@ -562,6 +562,12 @@ class Issue < ActiveRecord::Base
     @workflow_rule_by_attribute = result if user.nil?
     result
   end
+  # 缺陷的短描述信息
+  def short_description(length = 255)
+    description.gsub(/<\/?.*?>/,"").html_safe if description
+    #description.gsub(/^(.{#{length}}[^\n\r]*).*$/m, '\1...').strip if description
+  end
+
   private :workflow_rule_by_attribute
 
   def done_ratio
@@ -1513,4 +1519,6 @@ class Issue < ActiveRecord::Base
   def be_user_score_new_issue
     UserScore.project(:post_issue, User.current,self, { issue_id: self.id })
   end
+
+
 end

app/models/news.rb

@@ -74,6 +74,12 @@ class News < ActiveRecord::Base
     visible(user).includes([:author, :project]).order("#{News.table_name}.created_on DESC").limit(count).all
   end
 
+  # 新闻的短描述信息
+  def short_description(length = 255)
+    description.gsub(/<\/?.*?>/,"").html_safe if description
+    #description.gsub(/^(.{#{length}}[^\n\r]*).*$/m, '\1...').strip if description
+  end
+
   private
 
   def add_author_as_watcher

app/models/open_source_project.rb

@@ -84,7 +84,8 @@ class OpenSourceProject < ActiveRecord::Base
   # end
 
   def short_description(length = 255)
-    description.gsub(/^(.{#{length}}[^\n\r]*).*$/m, '\1...').strip if description
+    #description.gsub(/^(.{#{length}}[^\n\r]*).*$/m, '\1...').strip if description
+    description.gsub(/<\/?.*?>/,"").html_safe if description
   end
 
   def applied_by?(user)

app/models/project.rb

@@ -629,7 +629,8 @@ class Project < ActiveRecord::Base
 
   # Returns a short description of the projects (first lines)
   def short_description(length = 255)
-    description.gsub(/^(.{#{length}}[^\n\r]*).*$/m, '\1...').strip if description
+    #description.gsub(/^(.{#{length}}[^\n\r]*).*$/m, '\1...').strip if description
+    description.gsub(/<\/?.*?>/,"").html_safe if description
   end
 
   def css_classes

app/views/admin/contest_page_made.html.erb

@@ -0,0 +1,39 @@
+<h3><%=l(:label_first_page_made)%></h3>
+
+<%= form_tag(:controller => 'admin', :action => 'contest_page_made') do %>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='web_title'><%= l(:label_web_title) %>:</label>
+      <%= text_field_tag 'web_title', params[:wbe_title],:value => @first_page.web_title, :size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+    </p>
+    <div class="tabs">
+      <ul>
+        <li><%= link_to l(:label_project_first_page), {:action => 'first_page_made'} %></li>
+        <li><%= link_to l(:label_course_first_page), {:action => 'course_page_made'} %></li>
+        <li><%= link_to l(:label_contest_first_page), {:action => 'contest_page_made'} , :class => 'selected'%></li>
+      </ul>
+    </div>
+
+    <h4><%=l(:label_contest_first_page)%></h4>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='attachments_fields'>&nbsp;&nbsp;&nbsp;<%= l(:label_site_image) %>:</label>
+    </p>
+    <div style="margin-left: 82px;">
+      <%= render :partial=>"avatar/avatar_form",:style => "display:inline",:locals=> {source:@contest_page} %>
+    </div>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='contest_title'>&nbsp;&nbsp;&nbsp;<%= l(:label_site_title) %>:</label>
+      <%= text_field_tag 'contest_title', params[:label_site_title], :value => @contest_page.title,:size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+    </p>
+
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='contest_description' style="vertical-align: top">&nbsp;&nbsp;&nbsp;<%= l(:label_site_description)%>:</label>
+      <%= text_area_tag 'contest_description',@contest_page.description,:rows => 8, :size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+    </p>
+
+    <%= submit_tag l(:button_save), :class => "small", :name => nil %>
+<% end %>
+<div>
+
+
+
+</div>

app/views/admin/course_page_made.html.erb

@@ -0,0 +1,37 @@
+<h3><%=l(:label_first_page_made)%></h3>
+
+<%= form_tag(:controller => 'admin', :action => 'course_page_made') do %>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='web_title'><%= l(:label_web_title) %>:</label>
+      <%= text_field_tag 'web_title', params[:wbe_title],:value => @first_page.web_title, :size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+    </p>
+    <div class="tabs">
+      <ul>
+        <li><%= link_to l(:label_project_first_page), {:action => 'first_page_made'} %></li>
+        <li><%= link_to l(:label_course_first_page), {:action => 'course_page_made'}, :class => 'selected' %></li>
+        <li><%= link_to l(:label_contest_first_page), {:action => 'contest_page_made'} %></li>
+      </ul>
+    </div>
+    <h4><%=l(:label_course_first_page)%></h4>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='attachments_fields'>&nbsp;&nbsp;&nbsp;<%= l(:label_site_image) %>:</label>
+    </p>
+    <div style="margin-left: 82px;">
+      <%= render :partial=>"avatar/avatar_form",:style => "display:inline",:locals=> {source:@course_page} %>
+    </div>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='course_title'>&nbsp;&nbsp;&nbsp;<%= l(:label_site_title) %>:</label>
+      <%= text_field_tag 'course_title', params[:label_site_title], :value => @course_page.title,:size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+    </p>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='course_description' style="vertical-align: top">&nbsp;&nbsp;&nbsp;<%= l(:label_site_description)%>:</label>
+      <%= text_area_tag 'course_description',@course_page.description,:rows => 8, :size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+    </p>
+
+    <%= submit_tag l(:button_save), :class => "small", :name => nil %>
+<% end %>
+<div>
+
+
+
+</div>

app/views/admin/first_page_made.html.erb

@@ -0,0 +1,38 @@
+<h3><%=l(:label_first_page_made)%></h3>
+
+<%= form_tag(:controller => 'admin', :action => 'first_page_made') do %>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='web_title'><%= l(:label_web_title) %>:</label>
+      <%= text_field_tag 'web_title', params[:wbe_title],:value => @first_page.web_title, :size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+    </p>
+    <div class="tabs">
+      <ul>
+        <li><%= link_to l(:label_project_first_page), {:action => 'first_page_made'}, :class => 'selected' %></li>
+        <li><%= link_to l(:label_course_first_page), {:action => 'course_page_made'} %></li>
+        <li><%= link_to l(:label_contest_first_page), {:action => 'contest_page_made'} %></li>
+      </ul>
+    </div>
+    <h4><%=l(:label_project_first_page)%></h4>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='attachments_fields'>&nbsp;&nbsp;&nbsp;<%= l(:label_site_image) %>:</label>
+     </p>
+    <div style="margin-left: 82px;">
+        <%= render :partial=>"avatar/avatar_form",:style => "display:inline",:locals=> {source:@first_page} %>
+    </div>
+
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='title'>&nbsp;&nbsp;&nbsp;<%= l(:label_site_title) %>:</label>
+      <%= text_field_tag 'title', params[:label_site_title], :value => @first_page.title,:size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+      </p>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='description' style="vertical-align: top">&nbsp;&nbsp;&nbsp;<%= l(:label_site_description)%>:</label>
+      <%= text_area_tag 'description',@first_page.description,:rows => 8, :size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+    </p>
+
+      <%= submit_tag l(:button_save), :class => "small", :name => nil %>
+<% end %>
+<div>
+
+
+
+</div>

app/views/admin/project_page_made.html.erb

@@ -0,0 +1,31 @@
+<h3><%=l(:label_first_page_made)%></h3>
+
+<%= form_tag(:controller => 'admin', :action => 'first_page_made') do %>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='web_title'><%= l(:label_web_title) %>:</label>
+      <%= text_field_tag 'web_title', params[:wbe_title],:value => @first_page.web_title, :size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+    </p>
+    <h4><%=l(:label_project_first_page)%></h4>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='attachments_fields'>&nbsp;&nbsp;&nbsp;<%= l(:label_site_image) %>:</label>
+    </p>
+    <div style="margin-left: 82px;">
+      <%= render :partial=>"avatar/avatar_form",:style => "display:inline",:locals=> {source:@first_page} %>
+    </div>
+
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='title'>&nbsp;&nbsp;&nbsp;<%= l(:label_site_title) %>:</label>
+      <%= text_field_tag 'title', params[:label_site_title], :value => @first_page.title,:size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+    </p>
+    <p style="margin-left:60px;padding-right: 20px;">
+      <label for='description' style="vertical-align: top">&nbsp;&nbsp;&nbsp;<%= l(:label_site_description)%>:</label>
+      <%= text_area_tag 'description',@first_page.description,:rows => 8, :size => 30,:style => "font-size:small;width:490px;margin-left:10px;" %>
+    </p>
+
+    <%= submit_tag l(:button_save), :class => "small", :name => nil %>
+<% end %>
+<div>
+
+
+
+</div>

app/views/avatar/_avatar_form.html.erb

@@ -45,6 +45,7 @@
 <a href="javascript:void(0);" class="btn_addPic" style="text-decoration:none;">
 	<span><%= l(:button_upload_photo) %></span>
 </a>
+  <!--         :accept => 'image/png,image/gif,image/jpeg', -->
 <span class="add_avatar" style="margin-left: -55px;width: 70px">
 	<%= file_field_tag 'avatar[image]',
       	:id => nil,
@@ -57,6 +58,8 @@
         	:max_file_size => Setting.attachment_max_size.to_i.kilobytes,
         	:max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
         	:max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
+            :file_type => Redmine::Configuration['pic_types'].to_s,
+            :type_support_message => l(:error_pic_type),
         	:upload_path => upload_avatar_path(:format => 'js'),
         	:description_placeholder => nil ,# l(:label_optional_description)
         	:source_type => source.class.to_s,

app/views/contests/_contest_list.html.erb

@@ -2,11 +2,19 @@
 <% contests.each do |contest|%>
 <table width="95%" border="0" style="padding-left: 10px; padding-top: 10px;">
 	<tr>
-		<td colspan="2" valign="top" width="50" ><%= link_to(image_tag(url_to_avatar(contest.author), :class => 'avatar'), user_path(contest.author), :class => "avatar") %></td>
+		<td colspan="2" valign="top" width="50" >
+            <% unless contest.author.nil? %>
+                <%= link_to(image_tag(url_to_avatar(contest.author), :class => 'avatar'), user_path(contest.author), :class => "avatar") %>
+          <% end %>
+        </td>
 		<td>
 		<table width="100%" border="0">
 			<tr>
-				<td colspan="2" valign="top"><strong><%= link_to(contest.author, user_path(contest.author), :class => 'bid_user') %>: &nbsp;<%= link_to(contest.name, show_contest_contest_path(contest), :class => 'bid_path', :target => "_blank") %></strong></td>
+				<td colspan="2" valign="top"><strong>
+                  <% unless contest.author.nil? %>
+                      <%= link_to(contest.author, user_path(contest.author), :class => 'bid_user') %>:
+                  <% end %>
+                     &nbsp;<%= link_to(contest.name, show_contest_contest_path(contest), :class => 'bid_path', :target => "_blank") %></strong></td>
 			</tr>
 			<tr>
 				<td width="500">

app/views/courses/_course.html.erb

@@ -16,7 +16,7 @@
 		<%= content_tag('span', "#{l(:label_institution_name)}:", :class => "course-font")%>
 		<% @admin = @course.course_infos%>
 		<%if @admin&&@admin.first&&@admin.first.user&&@admin.first.user.user_extensions%>
-		   <!-- <%= @admin.first.user.user_extensions.occupation %> -->
+		   <!-- <%#= @admin.first.user.user_extensions.occupation %> -->
 		   <% unless @course.teacher.user_extensions.school.nil? %>
 		   <%= link_to @course.teacher.user_extensions.school.try(:name), school_course_list_path(@course.teacher.user_extensions.school) %>
 		   <% end %>
@@ -28,7 +28,7 @@
 		   <%= content_tag('a', @admin.collect{|u| link_to(u.user.lastname+u.user.firstname, user_path(u.user_id))}.join(", ").html_safe)  %>
 		<% end %>
 	</p>
-	
+
 </div>
 
 <div class="information_for_course" >
@@ -76,6 +76,10 @@
 
 <div class="add-info" style="margin-left: 30px; margin-top: -20px">
 	<%= content_tag "span", "#{l(:label_course_brief_introduction)}:", :class => "course-font" %>
+    <%# desc =  course.short_description.nil? ? "" : course.short_description%>
+    <!--<#div class="brief_introduction" title="<%#= desc.html_safe%>">
+      <%#= desc.html_safe%>
+    </div>-->
 	<%= content_tag "div", course.short_description, :class => "brief_introduction", :title => course.short_description %>
 </div>
 

app/views/courses/index.html.erb

@@ -35,6 +35,8 @@
 <div id="courses-index">
   <%if @courses%>
       <%= render_course_hierarchy(@courses)%>
+      <%#= render :partial => 'course', :locals => {:course => @courses.first}%>
+      <%#= "<a herf = 'aaa'>hello</a>".html_safe  %>
   <%end%>
 </div>
 

app/views/forums/_forum_list.html.erb

@@ -3,7 +3,11 @@
 <% if forums.any? %>
 	<% forums.each do |forum| %>
 	<div class="forums-index">
-		<div class="forums-inex-avatar"><%= link_to image_tag(url_to_avatar(forum.creator), :class => "avatar"), user_path(forum.creator) %></div>
+		<div class="forums-inex-avatar">
+          <% unless forum.creator.nil? %>
+              <%= link_to image_tag(url_to_avatar(forum.creator), :class => "avatar"), user_path(forum.creator) %>
+          <% end %>
+          </div>
 		<div class="forums-index-content">
 			<p ><%= link_to h(forum.name), forum_path(forum) %></p>
 			<p ><%= forum.description%></p>

app/views/issues/_list.html.erb

@@ -38,7 +38,7 @@
 				<% end -%>
 				<ul class="list-group-item-meta">
 					<div class="issue-list-description">
-						<%= l(:field_description)%>:&nbsp;<%= issue.description %>
+						<%= l(:field_description)%>:&nbsp;<%= issue.short_description %>
 					</div>
 				</ul>
 				<ul class="list-group-item-meta">

app/views/projects/_project.html.erb

@@ -18,18 +18,40 @@
 
 	<div class="information">
 		<p class="stats">
-			<strong><span style="font-size: 17px;margin-left: 145px"><%= link_to @project.watcher_users.count, project_watcherlist_path(project)%></span></strong>
-			<%= content_tag('span',  l(:label_x_follow_people,:count =>@project.watcher_users.count)) %>
-		</p>
-		<p class="stats">
-			<strong><span style="font-size: 17px;margin-left: 145px"><%= link_to "#{@project.members.count}", project_member_path(@project)%></span></strong>
-			<%= content_tag('span',  l(:label_x_current_contributors, :count => @project.users.count)) %>
-		</p>
-		<p class="stats">
-			<%= content_tag('span',  "#{(@project.repository.nil? || @project.repository.changesets[0].nil?) ? '0' : distance_of_time_in_words(Time.now, @project.repository.changesets[0].committed_on)}", :class => "info") %><%= content_tag('span',  l(:label_since_last_commits)) %>
-		</p>
-		<p class="stats">
-			<%= content_tag('span',  "#{@project.repository.nil? || @project.project_status.nil?  ? '0' : @project.project_status.changesets_count }", :class => "info") %><%= content_tag('span',  l(:label_commit_on)) %>
+            <table style="padding-left: 100px">
+              <tr>
+                <td style="width: 40%;text-align: right;font-size: 17px;">
+                  <strong><%= link_to @project.watcher_users.count, project_watcherlist_path(project)%></strong>
+                </td>
+                <td style="width: 60%;text-align: left">
+                  <%= content_tag('span',  l(:label_x_follow_people,:count =>@project.watcher_users.count)) %>
+                </td>
+              </tr>
+              <tr>
+                <td style="width: 40%;text-align: right;font-size: 17px;">
+                  <strong><%= link_to "#{@project.members.count}", project_member_path(@project)%></strong>
+                </td>
+                <td style="width: 60%;text-align: left">
+                  <%= content_tag('span',  l(:label_x_current_contributors, :count => @project.users.count)) %>
+                </td>
+              </tr>
+              <tr>
+                <td style="width: 40%;text-align: right;font-size: 17px;color: rgb(17, 102, 153)">
+                  <strong><%= content_tag('span',  "#{(@project.repository.nil? || @project.repository.changesets[0].nil?) ? '0' : distance_of_time_in_words(Time.now, @project.repository.changesets[0].committed_on)}", :class => "info") %></strong>
+                </td>
+                <td style="width: 60%;text-align: left">
+                  <%= content_tag('span',  l(:label_since_last_commits)) %>
+                </td>
+              </tr>
+              <tr>
+                <td style="width: 40%;text-align: right;font-size: 17px;color: rgb(17, 102, 153)">
+                  <strong><%= content_tag('span',  "#{@project.repository.nil? || @project.project_status.nil?  ? '0' : @project.project_status.changesets_count }", :class => "info") %></strong>
+                </td>
+                <td style="width: 60%;text-align: left">
+                  <%= content_tag('span',  l(:label_commit_on)) %>
+                </td>
+              </tr>
+            </table>
 		</p>
 	</div>
 	<% end %>
@@ -120,9 +142,9 @@
 			<%= l(:label_project_grade)%>: 
 			<span >
 				<%= link_to(format("%.2f" , finall_project_score ).to_f, 
-																	   {:controller => 'projects', 
-																		:action => 'show_projects_score', 
-			                                 							:remote => true, :id => @project.id}, :style=>"color: #EC6300;") %>
+                   {:controller => 'projects',
+                    :action => 'show_projects_score',
+                    :remote => true, :id => @project.id}, :style=>"color: #EC6300;") %>
 			</span>
 	    <% end %>
 	</div>

app/views/school/index.html.erb

@@ -71,7 +71,9 @@
 	<p>
 
 		<%= link_to "全部学校",school_index_path  %>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-        <a href="http://course.trustie.net">我的学校</a>
+        <% if User.current.logged? %>
+          <a href="http://course.trustie.net">我的学校</a>
+        <% end %>
 	</p>
 		<ul>
 			<li style="width: 40%; float: left">请选择省份:

app/views/users/_course_form.html.erb

@@ -32,7 +32,7 @@
                   <tr>
                     <td colspan="2" width="580">
                       <p class="font_description">
-                        <%= membership.course.description %>
+                        <%= membership.course.short_description %>
                       </p></td>
                   </tr>
                   <tr>

app/views/users/_score_new_index.html.erb

@@ -28,7 +28,7 @@
 <div> = <%= l(:label_user_score_of_collaboration) %> + <%= l(:label_user_score_of_influence) %> +
   <%= l(:label_user_score_of_skill)%> + <%= l(:label_user_score_of_active) %></div>
 <!-- <div>&nbsp;&nbsp;&nbsp;+ <%= l(:label_user_score_of_influence) %></div> -->
-<div> = <%= format("%.2f" ,@user.user_score_attr.collaboration.nil? ? 0:@user.user_score_attr.collaboration).to_f %> +  <%= format("%.2f" , @user.user_score_attr.influence.nil? ? 0:@user.user_score_attr.influence ).to_f %>
-   + <%= format("%.2f" , @user.user_score_attr.skill.nil? ? 0:@user.user_score_attr.skill).to_f %> + <%= format("%.2f" , @user.user_score_attr.active.nil? ? 0:@user.user_score_attr.active).to_f %></div>
-<div> = <%= format("%.2f" ,@user.user_score_attr.total_score.nil? ? 0:@user.user_score_attr.total_score).to_f %></div>
+<div> = <%= format("%.2f" ,@user.user_score_attr.collaboration.nil? ? 0:@user.user_score_attr.collaboration).to_i %> +  <%= format("%.2f" , @user.user_score_attr.influence.nil? ? 0:@user.user_score_attr.influence ).to_i %>
+   + <%= format("%.2f" , @user.user_score_attr.skill.nil? ? 0:@user.user_score_attr.skill).to_i %> + <%= format("%.2f" , @user.user_score_attr.active.nil? ? 0:@user.user_score_attr.active).to_i %></div>
+<div> = <%= format("%.2f" ,@user.user_score_attr.total_score.nil? ? 0:@user.user_score_attr.total_score).to_i %></div>
 <!-- end -->

app/views/users/_show_new_score.html.erb

@@ -38,7 +38,7 @@
       <td>
         <table>
           <tr class="info_font"><td><%= l(:label_user_score) %></td></tr>
-          <tr class="buttons_for_score" style="margin-top:30px;margin-left:144px"><td><span style="color:#ec6300"><%= format("%.2f" , @user.user_score_attr.total_score).to_f %></span></td></tr>
+          <tr class="buttons_for_score" style="margin-top:30px;margin-left:144px"><td><span style="color:#ec6300"><%= format("%.2f" , @user.user_score_attr.total_score).to_i %></span></td></tr>
         </table>
       </td>
     </tr>
@@ -49,23 +49,23 @@
   <table style="border-bottom: solid 0px #80a6d2;" width="100%">
     <tr>
       <%= link_to l(:label_user_score) , {:controller => 'users', :action => 'score_new_index', :remote => true} %> :
-      <%= format("%.2f" , @user.user_score_attr.total_score).to_f %>
+      <%= format("%.2f" , @user.user_score_attr.total_score).to_i %>
     </tr><br>
     <tr>
       <%= link_to l(:label_user_score_of_collaboration), {:controller => 'users',:action => 'topic_new_score_index', :remote => true} %> :
-      <%= format("%.2f" , @user.user_score_attr.collaboration.nil? ? 0:@user.user_score_attr.collaboration).to_f %>
+      <%= format("%.2f" , @user.user_score_attr.collaboration.nil? ? 0:@user.user_score_attr.collaboration).to_i %>
     </tr><br>
     <tr>
       <%= link_to l(:label_user_score_of_influence), {:controller => 'users',:action => 'project_new_score_index', :remote => true} %> :
-      <%= format("%.2f" ,  @user.user_score_attr.influence.nil? ? 0:@user.user_score_attr.influence).to_f %>
+      <%= format("%.2f" ,  @user.user_score_attr.influence.nil? ? 0:@user.user_score_attr.influence).to_i %>
     </tr><br>
     <tr>
       <%= link_to l(:label_user_score_of_skill), {:controller => 'users',:action => 'activity_new_score_index', :remote => true} %> :
-      <%= format("%.2f" , @user.user_score_attr.skill.nil? ? 0:@user.user_score_attr.skill).to_f %>
+      <%= format("%.2f" , @user.user_score_attr.skill.nil? ? 0:@user.user_score_attr.skill).to_i %>
     </tr><br>
     <tr>
       <%= link_to l(:label_user_score_of_active), {:controller => 'users',:action => 'influence_new_score_index', :remote => true} %> ：
-      <%= format("%.2f" , @user.user_score_attr.active.nil? ? 0:@user.user_score_attr.active).to_f %>
+      <%= format("%.2f" , @user.user_score_attr.active.nil? ? 0:@user.user_score_attr.active).to_i %>
     </tr><br>
   </table>