Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

.gitignore

@@ -2,7 +2,7 @@
 /.project
 /.idea
 /.bundle
-
+*.swp
 /config/database.yml
 /files/*
 /log/*

app/controllers/activities_controller.rb

@@ -49,7 +49,7 @@ class ActivitiesController < ApplicationController
     @activity_pages = Paginator.new @activity_count, @limit, params['page']
     @offset ||= @activity_pages.offset 
     
-    @project_base_tag = params[:id]?'base_projects':'base'
+    @project_base_tag = params[:id] ? 'base_projects' : 'base'
     if events.empty? || stale?(:etag => [@activity.scope, @date_to, @date_from, @with_subprojects, @author, events.first, events.size, User.current, current_language])
       respond_to do |format|
         format.html {

app/controllers/auto_completes_controller.rb

@@ -30,6 +30,7 @@ class AutoCompletesController < ApplicationController
       @issues.compact!
     end
     render :layout => false
+    
   end
 
   private

app/controllers/contests_controller.rb

@@ -74,7 +74,7 @@ class ContestsController < ApplicationController
 
   def show_contest
     @user = @contest.author
-    @jours = @contest.journals_for_messages.order('created_on DESC')
+    @jours = @contest.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
     @limit =  10
     @feedback_count = @jours.count
     @feedback_pages = Paginator.new @feedback_count, @limit, params['page']

app/controllers/projects_controller.rb

@@ -983,16 +983,17 @@ class ProjectsController < ApplicationController
   end
 # end
 
+  before_filter :toggleCourse, only: [:finishcourse, :restartcourse]
   # TODO:#finishcourse and #restartcourse 没有设置权限，也就是说，任何人的调用都会关闭or重启课程。
   # 最好通过用户与项目的权限解决这种事情。还没写
   def finishcourse
-    course_prefs = Course.find_by_extra(@project.identifier)
+    #course_prefs = Course.find_by_extra(@project.identifier)
     # setup_time = Time.parse(course_prefs.setup_time)
     # end_time = Time.parse(course_prefs.endup_time)
     yesterday = Date.today.prev_day.to_time
 
-    course_prefs.endup_time = yesterday
-    @save_flag = course_prefs.save
+    @course_prefs.endup_time = yesterday
+    @save_flag = @course_prefs.save
 
     respond_to do |format|
       format.js
@@ -1000,11 +1001,11 @@ class ProjectsController < ApplicationController
   end
 
   def restartcourse
-    course_prefs = Course.find_by_extra(@project.identifier)
+    #course_prefs = Course.find_by_extra(@project.identifier)
     day = Time.parse("3000-01-01")
 
-    course_prefs.endup_time = day
-    @save_flag = course_prefs.save
+    @course_prefs.endup_time = day
+    @save_flag = @course_prefs.save
 
     respond_to do |format|
       format.js {
@@ -1014,6 +1015,13 @@ class ProjectsController < ApplicationController
   end
 
   private
+  def toggleCourse
+    @course_prefs = Course.find_by_extra(@project.identifier)
+    unless (@course_prefs.teacher == User.current || User.current.admin?)
+      render_403
+    end
+  end
+
 
   def select_project_layout
     project = Project.find_by_id(params[:id])

app/helpers/issues_helper.rb

@@ -59,7 +59,13 @@ module IssuesHelper
 
   def issue_heading(issue)
     #h("#{issue.tracker} ##{issue.id}")
-    h("#{issue.tracker} #{issue.source_from}")
+    #h("#{issue.tracker} #{issue.source_from}")
+    s = ''
+    s << ">>"
+    s << link_to(@issue.project.name+l(:issue_list), project_issues_path(@issue.project))
+    s << " >"
+    s << @issue.source_from
+    s.html_safe
   end
 
   def render_issue_subject_with_tree(issue)

app/helpers/no_uses_helper.rb

@@ -8,7 +8,7 @@ module NoUsesHelper
     css = no_use_css(objects) << options[0].to_s
     # ([watcher_css(objects), watched ? 'icon icon-fav ' : 'icon icon-fav-off '].join(' ') << options[0].to_s)
 
-    text = clicked ? l(:no_use) : l(:cancel_no_use)
+    text = clicked ? l(:cancel_no_use) : l(:no_use)
 
     url = no_uses_path(
       :object_type => objects.first.class.to_s.underscore,

app/models/forum.rb

@@ -1,7 +1,7 @@
 class Forum < ActiveRecord::Base
   include Redmine::SafeAttributes
   has_many :topics, :class_name => 'Memo', :conditions => "#{Memo.table_name}.parent_id IS NULL", :order => "#{Memo.table_name}.created_at DESC", :dependent => :destroy
-  has_many :memos, :dependent => :destroy
+  has_many :memos, :dependent => :destroy, conditions: "parent_id IS NULL"
   belongs_to :creator, :class_name => "User", :foreign_key => 'creator_id' 
   safe_attributes 'name',
   'description',

app/models/issue_query.rb

@@ -52,7 +52,12 @@ class IssueQuery < Query
 
   def initialize(attributes=nil, *args)
     super attributes
-    self.filters ||= { 'status_id' => {:operator => "o", :values => [""]} }
+#    self.filters ||= { 'status_id' => {:operator => "o", :values => [""]} }
+
+    #gcm
+    self.filters ||= { 'subject' => {:operator => "~" , :values => [""] } }
+    #gcmend
+
   end
 
   # Returns true if the query is visible to +user+ or the current user.

app/models/mailer.rb

@@ -28,20 +28,32 @@ class Mailer < ActionMailer::Base
   end
   
   # Builds a Mail::Message object used to email recipients of the added journals for message.
-  #
+
+  # 留言分为直接留言，和对留言人留言的回复
+  # 字段说明在JournalsForMessage.rb
+  # 直接留言后 reply_id,m_parent_id 为空，相对应的at_user取值为nil
+
   def journals_for_message_add(user, journals_for_message)
-     @user = journals_for_message.user
-     if journals_for_message.jour_type!="Project"&&journals_for_message.jour_type!="Bid"
-       if(journals_for_message.reply_id==0)
-         @mail = journals_for_message.jour
-       else
-         @mail = journals_for_message.at_user
-       end  
-     @message = journals_for_message.notes
-     @url = url_for(:controller => 'users', :action => 'user_newfeedback', :id => journals_for_message.jour)
-     str = "#{@user} #{t(:label_leave_your_message, :locale => 'zh')}"
-     mail :to => @mail.mail, :subject => str
-     end
+    @user = journals_for_message.user # 留言人
+    @mail = journals_for_message.jour if journals_for_message.at_user.nil? # 留言
+    @mail = journals_for_message.at_user if journals_for_message.at_user
+    @message = journals_for_message.notes
+    @title = "#@user #{t(:label_leave_your_message, :locale => 'zh')}"
+
+    @url = case journals_for_message.jour.class.to_s.to_sym # 判断留言的对象所属类型
+             when :Bid
+               respond_url(journals_for_message.jour, anchor: "word_li_#{journals_for_message.id}")
+             when :Project
+               project_feedback_url(journals_for_message.jour, anchor: "word_li_#{journals_for_message.id}")
+             when :Contest
+               show_contest_contest_url(journals_for_message.jour, anchor: "word_li_#{journals_for_message.id}")
+             when :User
+               user_newfeedback_user_url(journals_for_message.jour, anchor: "word_li_#{journals_for_message.id}")
+             else
+               logger.error "[Builds a Mail::Message ERROR] journalsForMessage's jour is unkown type, journalsForMessage.id = #{journals_for_message.id}"
+               return -1
+           end
+    mail :to => @mail.mail, :subject => @title
   end
 
   # Builds a Mail::Message object used to email recipients of the added issue.

app/models/query.rb

@@ -233,7 +233,13 @@ class Query < ActiveRecord::Base
           # filter requires one or more values
           (values_for(field) and !values_for(field).first.blank?) or
           # filter doesn't require any value
-          ["o", "c", "!*", "*", "t", "ld", "w", "lw", "l2w", "m", "lm", "y"].include? operator_for(field)
+          ["o", "c", "!*", "*", "t", "ld", "w", "lw", "l2w", "m", "lm", "y"].include? operator_for(field) or
+
+          #gcm
+          #subject could be null
+          (field.eql?"subject")
+          #gcmend
+          
     end if filters
   end
 

app/views/auto_completes/issues.html.erb

@@ -3,5 +3,5 @@
       'label' => "#{issue.tracker} ##{issue.id}: #{truncate issue.subject.to_s, :length => 60}",
       'value' => issue.id
       }
-    }.to_json
+    }.to_json   
 %>

app/views/contests/show_contest.html.erb

@@ -29,6 +29,6 @@
 <div class="pagination" style="float:left;">
 	<ul>
 		<%= pagination_links_full @feedback_pages %>
-	<ul>
+	</ul>
 </div>
 

app/views/courses/_set_course_time.html.erb

@@ -1,10 +1,13 @@
 <% 
 	id = "finish_course_#{project.id}"
-	display = (project.course_extra.teacher.id == User.current.id )
+	display = (project.course_extra.teacher.id == User.current.id || User.current.admin?)
 %>
 
-<% if display && course_endTime_timeout?(project) #如果课程已结束%>
-	<%= link_to '重启课程', restartcourse_project_path(project), :remote => true, :method => :post, :id => id, :confirm => ('确定要重启课程？') %>
+<% if display #如果课程已结束%>
+	<% linkPath = course_endTime_timeout?(project) ? restartcourse_project_path(project) :  finishcourse_project_path(project, format: :js) %>
+	<% desc = course_endTime_timeout?(project) ? '重启' :  '关闭' %>
+
+	<%= link_to "#{desc}课程", linkPath, :remote => true, :method => :post, :id => id, :confirm => ("确定要#{desc}课程？") %>
 <% else %>
-	<%= link_to '关闭课程', finishcourse_project_path(project), :remote => true, :method => :post, :id => id, :confirm => ('确定要关闭课程？') %>
+	<!-- 关闭课程block -->
 <% end %>

app/views/forums/_show_topics.html.erb

@@ -1,6 +1,6 @@
 <!-- added by fq -->
 <!--display the board-->
-<div class="borad-topic-count">共有 <%=link_to memos.count %> 个贴子</div>
+<div class="borad-topic-count">共有 <%=link_to @forum.memos.count %> 个贴子</div>
 <div style="padding-top: 10px">
 <% if memos.any? %>
 	<% memos.each do |topic| %>

app/views/issues/_form.html.erb

@@ -14,7 +14,8 @@
 
 <% if @issue.safe_attribute? 'tracker_id' %>
 <p><%= f.select :tracker_id, @issue.project.trackers.collect {|t| [t.name, t.id]}, {:required => true},
-                :onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')" %></p>
+                :onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')" %></p>             
+                               
 <% end %>
 
 

app/views/issues/show.html.erb

@@ -1,4 +1,5 @@
 <%# html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
+
 <% html_title "#{@issue.tracker.name} #{@issue.source_from}: #{@issue.subject}" %>
 
 <%= render :partial => 'action_menu' %>

app/views/layouts/_base_footer.html.erb

@@ -11,16 +11,16 @@
     <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/"%></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>
 
   </p>
   <div id="logo_link">
-   <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/nudt.png',:size=>'100x30',:alt=>"国防科学技术大学计算机学院"),"http://www.nudt.edu.cn/special.asp?classid=12"%></span>
-   <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/peking_eecs.png',:size=>'100x30',:alt=>"北京大学信息科学技术学院软件研究所"), "http://eecs.pku.edu.cn"%></span>
-   <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/buaa_scse.png',:size=>'100x30',:alt=>"北京航空航天大学计算机学院"), "http://scse.buaa.edu.cn/"%></span>
-   <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/iscas.png',:size=>'100x30',:alt=>"中国科学院软件研究所"), "http://www.iscas.ac.cn"%></span>
-   <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/inforbus.png',:size=>'100x30',:alt=>"山东中创软件商用中间件股份有限公司"), "http://www.inforbus.com"%></span>		
+   <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/nudt.png',:size=>'100x30',:alt=>"国防科学技术大学计算机学院"),"http://www.nudt.edu.cn/special.asp?classid=12", :target => "_blank" %></span>
+   <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/peking_eecs.png',:size=>'100x30',:alt=>"北京大学信息科学技术学院软件研究所"), "http://eecs.pku.edu.cn", :target => "_blank" %></span>
+   <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/buaa_scse.png',:size=>'100x30',:alt=>"北京航空航天大学计算机学院"), "http://scse.buaa.edu.cn/", :target => "_blank" %></span>
+   <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/iscas.png',:size=>'100x30',:alt=>"中国科学院软件研究所"), "http://www.iscas.ac.cn", :target => "_blank" %></span>
+   <span class="footer_logo_link"><%= link_to image_tag('/images/footer_logo/inforbus.png',:size=>'100x30',:alt=>"山东中创软件商用中间件股份有限公司"), "http://www.inforbus.com", :target => "_blank" %></span>		
  </div>
  <!--gcm-->
 

app/views/projects/finishcourse.js.erb

@@ -4,5 +4,5 @@
 	<% end %>
 	$('#finish_course_<%=@project.id%>').replaceWith("<%= j(render partial: 'courses/set_course_time', :locals => {:project => @project} )%>")
 <% else %>
-	alert('设置失败，请在论坛提交问题，等待管理员处理。');
+	alert('权限不足，设置失败，请在论坛提交问题，等待管理员处理。');
 <% end  %>

app/views/school/index.html.erb

@@ -76,6 +76,7 @@
 		</ul>
 
 </div>
+<div style="clear: both"></div>
 <div>
 	<ul id="schoollist" style="line-height: 25px">
 		

app/views/welcome/index.html.erb

@@ -96,22 +96,28 @@
 			<%= link_to "我要反馈" , suggestion_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%></h3>
 			<span style="margin-top: -30px;float: right; display: block;"><%= link_to "更多>>", forums_path %></span>
 		</div>
-		<div class="welcome-box-list-new">
-			<% find_new_forum_topics(7).each do |topic|%>
-			<li class="message-brief-intro" style="line-height: 1.63em;padding-bottom:3px;">
-				<div  style="display: inline-block; width: 100%;">
-				  <span 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.subject.truncate(30, omission: '...'), topic.event_url, :class => "gray" , :style => "font-size: 10pt !important;", :target => "_blank" %>
-				  </span>
-				<br>
-				<span style="margin-left: 24px; color: rgb(172, 174, 177); white-space: nowrap; font-size：　9pt !important;;"><%= l(:field_updated_on) %><%=time_tag_welcome(topic_last_time topic)%>前</span>
-				<span style="margin-left: 8px; margin-bottom: 0px; color: rgb(172, 174, 177) !important; white-space: nowrap;">
-					由&nbsp;<%= link_to topic.author ? topic.author : 'Anonymous', user_path(topic.author_id), :style => "font-size: 9pt !important; color: rgb(17, 102, 173);", :target => "_blank" %>&nbsp;发表
-				</span>
-				<span style="float: right; color: rgb(172, 174, 177); white-space: nowrap; font-size：　9pt !important;;">回复(<%= link_to (topic.parent ? topic.parent.replies_count : topic.replies_count), topic.event_url, :target => "_blank"  %>)</span>
+		<div class="welcome-box-list-new memo_activity">
+		<% find_new_forum_topics(7).each do |topic|%>
+			<li class="message-brief-intro">
+				<div class='memo_title'>
+					<%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url,title: topic.subject %>
+				</div>
+				<div class='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">
+						楼主： <%= link_to_user(topic.author) %>
+					</span>
+					<span class="memo_last_person">
+						最后回复：<%=link_to_user topic.last_reply.try(:author) %>
+					</span>
+					<span class="memo_reply">
+						回复(<%= link_to topic.try(:replies_count), topic.event_url %>)
+					</span>
 				</div>
 			</li>
-			<% end %>
+		<% end %>
 		</div>
 	</ul>
 </div> 

public/javascripts/application.js

@@ -476,12 +476,16 @@ function observeAutocompleteField(fieldId, url, options) {
   $(document).ready(function() {
     $('#'+fieldId).autocomplete($.extend({
       source: url,
+      select: function(e,ui){self.location="/issues/"+ui.item.value;},
       minLength: 2,
       search: function(){$('#'+fieldId).addClass('ajax-loading');},
-      response: function(){$('#'+fieldId).removeClass('ajax-loading');}
+      response: function(){$('#'+fieldId).removeClass('ajax-loading');
+      }
     }, options));
     $('#'+fieldId).addClass('autocomplete');
+  
   });
+  
 }
 
 function observeSearchfield(fieldId, targetId, url) {

public/stylesheets/application.css

@@ -37,7 +37,7 @@ div.position-f{
 }
 
 div.position-f p.font{	
-	font-family: 微软雅黑;
+	font-family: "Microsoft YaHei";
 	font-weight: bold;
 	font-size: 16px;
 	color: #15bccf;		
@@ -57,7 +57,7 @@ div.position-s p.font{
 div.position-t{
 	padding-top: 13px;
 	float: left;
-	width: width: 238px;
+	width: 238px;
 	line-height: 0.5em;
 }
 
@@ -83,7 +83,7 @@ div.sidebar-user{
 	border: 1px solid #e5dfc7;
 	float: left;
 	display: block;
-	height：80px;
+	height:80px;
 	width: 80px;
 	
 }
@@ -100,7 +100,7 @@ div.sidebar-user{
 div.sidebar-f div.name{
 	float: left;
 	padding-left: 8px;
-	font-family:微软雅黑;
+	font-family:"Microsoft YaHei";
 	font-weight:bold;
 	font-size:16px;
 	color:#4d4d4d;
@@ -228,7 +228,7 @@ div.forums-info{
 }
 
 div.forums-title{	
-	font-family: 微软雅黑;
+	font-family: "Microsoft YaHei";
 	font-weight: bold;
 	font-size: 16px;
 	color: rgb(237, 137, 36);
@@ -251,7 +251,7 @@ span.forums-avatar-right{
 }
 
 .formus-first-title{
-	font-family:微软雅黑;
+	font-family: "Microsoft YaHei";
 	font-weight:bold;	
 	padding-top:3px;
 	padding-bottom:3px;	
@@ -262,7 +262,7 @@ span.forums-avatar-right{
 	width: 290px; 	
 	white-space: nowrap;
 	overflow: hidden;
-	-o-text-overflow: ellisis;
+	-o-text-overflow: ellipsis;
 	text-overflow: ellipsis;
 }	
 .contextual-borad{
@@ -374,7 +374,7 @@ span.forums-avatar-right{
 	width: 430px; 	
 	white-space: nowrap;
 	overflow: hidden;
-	-o-text-overflow: ellisis;
+	-o-text-overflow: ellipsis;
 	text-overflow: ellipsis;	
 }
 
@@ -382,7 +382,7 @@ span.forums-avatar-right{
 	width: 650px; 	
 	white-space: nowrap;
 	overflow: hidden;
-	-o-text-overflow: ellisis;
+	-o-text-overflow: ellipsis;
 	text-overflow: ellipsis;	
 }
 
@@ -468,7 +468,7 @@ span.forums-avatar-right{
 }	
 	
 a.bids_user {
-	font-family:微软雅黑;
+	font-family:"Microsoft YaHei";
 	color:#15bccf;
 	font-size:14px;
 	font-weight: bold;
@@ -519,23 +519,23 @@ ul.tool li{list-style-type:none;
 				height:auto;}
 .font_index{
 	font-size:22px;
-	font-family: 微软雅黑;
+	font-family: "Microsoft YaHei";
 	color:#068d9c;
 }
 .font_aram{
 	font-size: 14px;
-	font-family: 微软雅黑;
+    font-family: "Microsoft YaHei";
 	font-weight: bold;
 }
 .font_content{
 	font-size:14px;
-	font-family: 微软雅黑;
+    font-family: "Microsoft YaHei";
 	color:#FFFFFF;
 }
 
 .time_project{
 	font-size:12px;
-	font-family:微软雅黑;
+    font-family: "Microsoft YaHei";
 }
 .line_bottom{
 	 margin-top: 1px;
@@ -548,7 +548,7 @@ ul.tool li{list-style-type:none;
 	/*white-space:nowrap;*/
 	overflow: hidden;
 	height:35px;
-	width：200px;		
+	width:200px;
 	text-align: left;	
 	font-family: arial;
 	font-size:12px;	
@@ -573,7 +573,7 @@ ul.tool li{list-style-type:none;
 }
 
 .font_title_tag{
-	font-family:微软雅黑;
+    font-family: "Microsoft YaHei";
 	font-weight:bold;	
 	padding-top:3px;
 	padding-bottom:3px;	
@@ -582,7 +582,7 @@ ul.tool li{list-style-type:none;
 }
 
 .font_title_left{
-	font-family:微软雅黑;
+    font-family: "Microsoft YaHei";
 	font-weight:bold;
 	padding-left: 10px;
 	padding-top:3px;
@@ -591,7 +591,7 @@ ul.tool li{list-style-type:none;
 	/*color:#05a8bb;*/	
 }
 .font_small_watch{
-	font-family:微软雅黑;
+    font-family: "Microsoft YaHei";
 	font-weight:bold;
 	color:#15bccf;
 }
@@ -607,7 +607,7 @@ ul.tool li{list-style-type:none;
 	
 }
 .font_welcome{
-	font-family:微软雅黑;
+    font-family: "Microsoft YaHei";
 	font-weight: bold;
 	font-size: 16px;
 	color:#6d6e6e;
@@ -628,13 +628,13 @@ ul.tool li{list-style-type:none;
 }
 
 .font_welcome_Cdescription{
-	font-family: 微软雅黑; 
+    font-family: "Microsoft YaHei";
 	font-size: 16px;		
 	color: #5c5c5c; 	
 }
 
 .font_welcome_tdescription{
-	font-family: '微软雅黑'; 
+    font-family: "Microsoft YaHei";
 	font-size: 16px;		
 	color: #5c5c5c; 
 	text-align: justify;
@@ -654,7 +654,7 @@ ul.tool li{list-style-type:none;
 	border: 1px solid #e5dfc7;
 	float: left;
 	display: block;
-	height：80px;
+	height:80px;
 	width: 80px;
 	
 }
@@ -675,7 +675,7 @@ ul.tool li{list-style-type:none;
 }
 
 .font_welcome_feature{
-	font-family:微软雅黑;
+    font-family: "Microsoft YaHei";
 	font-weight: bold;
 	font-size: 16px;
 	color:#09b2c8;
@@ -684,7 +684,7 @@ ul.tool li{list-style-type:none;
 
 .info-course{
 	padding-left: 8px;
-	font-family:微软雅黑;
+    font-family: "Microsoft YaHei";
 	font-weight:bold;
 	font-size:16px;
 	color:#4d4d4d;
@@ -699,7 +699,7 @@ ul.tool li{list-style-type:none;
 
 .info_font{
 	padding-left: 8px;
-	font-family:微软雅黑;
+    font-family: "Microsoft YaHei";
 	font-weight:bold;
 	font-size:16px;
 	color:#4d4d4d;
@@ -707,7 +707,7 @@ ul.tool li{list-style-type:none;
 	word-break: break-all;	
 }
 .font_lighter{
-	font-family:微软雅黑;
+    font-family: "Microsoft YaHei";
 	color:#acaeb1;
 	font-size:13px;
 }
@@ -717,7 +717,7 @@ ul.tool li{list-style-type:none;
 	font-size:13px;
 }
 .font_lighter2{
-	font-family:'微软雅黑';
+    font-family: "Microsoft YaHei";
 	color:#9a9a9a;
 	font-size:14px;
 }
@@ -725,7 +725,7 @@ ul.tool li{list-style-type:none;
 .font_lighter_welcome{
 	color:#acaeb1;
 	font-size:12px;
-	font-family:微软雅黑;
+    font-family: "Microsoft YaHei";
 }
 .justify_side > span{
 	text-align: justify;
@@ -754,7 +754,7 @@ ul.tool li{list-style-type:none;
 	padding-left: 10px;
 }
 .font_tool{
-	font-family:微软雅黑;
+    font-family: "Microsoft YaHei";
 	font-size:14px;
 	color: #1a1a1a;
 	padding-left: 6px;
@@ -768,7 +768,7 @@ ul.tool li{list-style-type:none;
 	float:left;
 	display:inline-block;
 	/*margin-top: 50px;*/		
-	padding-left: 20px;
+	/*padding-left: 20px;*/
 	max-width: 315px;
 	margin: 0; 
 	padding: 0; 
@@ -915,7 +915,7 @@ ul.user_project_sort li{list-style-type:none;
 /*h写的样式*/
 .lbadding{float:left; padding-left: 10px} /*huang*/
 .rlbadding{float:left; padding-left: 0px; margin-top:40px} /*huang*/
-.lbadding h7{letter-spacing: -0.0125em; font-weight:700}/*未用*/
+/*.lbadding h7{letter-spacing: -0.0125em; font-weight:700}*//*未用*/
 .newsplitcontentright{float:right; width:49%;}/*huang*/
 .newsplitcontentleft{float:left; width:49%;}/*huang*/
 .newsplitcontentall{float:left; padding-left: 30px; width:95%}
@@ -946,17 +946,20 @@ a.logical_int{
 	color: #ed8924;
 }
 
-.contextdescription2{font-family: '微软雅黑';
-				font-size:12px;
-				font-weight:ligher;
-				color:#7e7e7e;
-			}
+.contextdescription2 {
+    font-family: "Microsoft YaHei";
+    font-size: 12px;
+    font-weight: lighter;
+    color: #7e7e7e;
+}
 ul.context_projects{margin:0px; padding-left:0em;}
 
 ul.context_projects ul {padding-left:1.6em;}
 
-ul.context_projects li {list-style-type:none;
-				height:50px;}
+ul.context_projects li {
+    list-style-type:none;
+    height:50px;
+}
 /*字体*/
 
 .more{float:right; padding-right:40px; text-decoration: underline; color: #95c3bc}
@@ -984,7 +987,7 @@ ul.context_projects li {list-style-type:none;
 	padding-top:12px;
 	font-family: arial;
 	font-size:12px;
-	font-weight:ligher;
+	font-weight:lighter;
 	color:#7e7e7e;
 }
 
@@ -998,7 +1001,7 @@ ul.context_projects li {list-style-type:none;
 .fontligher{
 	font-family: arial;
 	font-size:12px;
-	font-weight:ligher;
+	font-weight:lighter;
 	color:#505050;
 
 	height: 34px;
@@ -1058,14 +1061,14 @@ ul.context_projects li {list-style-type:none;
 	
 	font-size:24px;
 	font-weight:bold;
-	text-decoration:;
+	text-decoration:none;
 	color:#000000;
 }
 .firdtname_project{
 	
 	font-size:12px;
 	font-weight:bold;
-	text-decoration:;
+	text-decoration:none;
 	color:#116699;
 
 
@@ -1080,8 +1083,8 @@ ul.context_projects li {list-style-type:none;
 	text-decoration: underline;
 }
 .last_active{
-	color:AA9C84;
-	font-size:12px
+	color: #AA9C84;
+	font-size:12px;
 	text-decoration: none;
 }
 ul.newprojects{			/*huang*/
@@ -1103,16 +1106,16 @@ ul.newprojects li{   /*huang 块状*/
 	border-bottom:5px #DBEDF4 solid;
 	border-left:2px dotted #DBEDF4;
 	min-height:260px;
-	line-height: :30px;
+	line-height: 30px;
 }
-ul.newprojects li documenttext{ /*未wan*/
+/*ul.newprojects li documenttext{ *//*未wan*/
 	/*overflow: hidden;*/
-	height: 260px;
-	width: 200px;
-	margin-right:auto;
-	
-	padding-top:10px;
-}
+	/*height: 260px;*/
+	/*width: 200px;*/
+	/*margin-right:auto;*/
+	/**/
+	/*padding-top:10px;*/
+/*}*/
 ul.newprojects2{			/*huang*/
 	margin: 0px;
 	padding-left: 2em;
@@ -1133,7 +1136,6 @@ ul.newprojects2 li{
 
 .newfeedback h1{
 	color: inherit;
-	text-d
 }
 /***** Layout *****/
 #wrapper {background: white;}
@@ -1389,7 +1391,7 @@ table.attributes { width: 100% }
 table.attributes th { vertical-align: top; text-align: left; }
 table.attributes td { vertical-align: top; }
 
-table.boards a.board, h3.comments { /*background: url(../images/comment.png) */no-repeat 0% 50%; padding-left: 5px; }
+/*table.boards a.board, h3.comments {*background: url(../images/comment.png) no-repeat 0% 50%; padding-left: 5px; }*/
 table.boards td.topic-count, table.boards td.message-count {text-align:center;}
 table.boards td.last-message {font-size:80%;}
 
@@ -1478,7 +1480,7 @@ margin-left:-10px;
 
 .project_right_tag{margin-top:44%;}
 .project_homepage_tag{float:left; margin-top:9%;color:#000000;}
-.project_infor_tag{float:auto;color:#000000;padding-left: 15px;}
+.project_infor_tag{/*float:auto;*/color:#000000;padding-left: 15px;}
 .project_page_tag{float:right;color:#C0C0C0; font-family: '微软雅黑';font-size: 13px;}
 .wiki_text{font-size:small;color:#000000;}
 .user_setting{float:right; color:#000000;padding-right: 10px;}
@@ -1486,13 +1488,13 @@ margin-left:-10px;
 
 .project_right_tag{margin-top:40%;}
 .project_homepage_tag{padding-left:570px;color:#000000;}
-.project_infor_tag{float:auto;color:#000000;padding-left: 15px; }
+.project_infor_tag{/*float:auto;*/color:#000000;padding-left: 15px; }
 .project_page_tag{float:right;color:#C0C0C0; font-family: '微软雅黑';font-size: 13px;}
 .wiki_text{font-size:small;color:#000000;}
 .user_setting
 {
 	float:right;
-	color:#000000;
+	/*color:#000000;*/
 	padding-right:10px;
 	background-color: #CCCCBB;
     border-radius: 5px 5px 5px 5px;
@@ -1523,7 +1525,7 @@ margin-left:-10px;
 
 	margin-top: 50px;
 	width:320px;
-	
+
 	/*font-family:微软雅黑,lucida grande,verdana;*/
 	font-size:12px;
 	-webkit-border-radius:10px;
@@ -1540,15 +1542,15 @@ margin-left:-10px;
 form {display: inline;}
 
 /*added by bai*/
-	input[type="submit"].bid_btn {
-		padding-bottom: 5px;
-	width: 55px;
-	height: 25px;
-    font-family: '微软雅黑',Arial,Helvetica,sans-serif;
+input[type="submit"].bid_btn {
+    padding-bottom: 5px;
+    width: 55px;
+    height: 25px;
+    font-family: '微软雅黑', Arial, Helvetica, sans-serif;
     font-size: 12px;
     color: #fff;
     padding: 0px;
-    background: #15bccf; 
+    background: #15bccf;
     border-radius: 4px;
     border: 1px solid #15bccf;
     box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2), 0px 0px 2px rgb(255, 255, 255) inset;
@@ -1557,20 +1559,20 @@ form {display: inline;}
 }
 
 input[type="button"].bid_btn {
-		padding-bottom: 5px;
-	width: 55px;
-	height: 25px;
-    font-family: '微软雅黑',Arial,Helvetica,sans-serif;
+    /*padding-bottom: 5px;*/
+    width: 55px;
+    height: 25px;
+    font-family: '微软雅黑', Arial, Helvetica, sans-serif;
     font-size: 12px;
     color: #fff;
     padding: 0px;
-    background: #15bccf; 
+    background: #15bccf;
     border-radius: 4px;
     border: 1px solid #15bccf;
     box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2), 0px 0px 2px rgb(255, 255, 255) inset;
     text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2), 0px 1px 0px rgb(255, 255, 255);
     cursor: pointer;
-	}
+}
 /*end	*/
 	
 fieldset {border: 1px solid #e4e4e4; margin:0;}
@@ -1588,9 +1590,9 @@ blockquote {
 	padding-bottom: 0.6em; 
 	margin-left: 1.4em;
 	margin-right: 0.4em;
-	border-radius: 4px;  # added by bai (边框变圆润)
-	font-family: 微软雅黑;
-	background: url(/images/requirements/reference.jpg)
+	border-radius: 4px;
+	font-family: "Microsoft YaHei";
+	background: url('../images/requirements/reference.jpg')
 }
 
 blockquote blockquote { margin-left: 0;}
@@ -1631,7 +1633,7 @@ fieldset#filters td.values select {min-width:130px;}
 fieldset#filters td.values input {height:1em;}
 fieldset#filters td.add-filter { text-align: right; vertical-align: top; }
 
-.toggle-multiselect {/*background: url(../images/bullet_toggle_plus.png)*/ no-repeat 0% 40%; padding-left:8px; margin-left:0; cursor:pointer;}
+.toggle-multiselect {/*background: url(../images/bullet_toggle_plus.png) no-repeat 0% 40%;*/ padding-left:8px; margin-left:0; cursor:pointer;}
 .buttons { font-size: 0.9em; margin-bottom: 1.4em; margin-top: 1em; }
 
 div#issue-changesets {float:right; width:45%; margin-left: 1em; margin-bottom: 1em; background: #fff; padding-left: 1em; font-size: 90%;}
@@ -1763,7 +1765,7 @@ p.pagination {margin-top:8px; font-size: 90%}
   margin: 0;
   padding: 3px 0 3px 0;
   padding-left: 100px; /* width of left column containing the label elements *//*by young*/
-  /*/*min-height: 1.8em;*/  by bai*/
+  /*min-height: 1.8em;*/
   clear:left;
 }
 
@@ -2114,7 +2116,7 @@ button.tab-right {
 }
 
 #content .tabs_new ul li a.selected {
-  background-color: rgba(28, 158, 199, 0.68);   # added by bai
+  background-color: rgba(28, 158, 199, 0.68);
   border: 1px solid #15BCCF;
   border-bottom: 1px solid #fff;
   color:#FFF;
@@ -2186,7 +2188,7 @@ button.tab_new-right {
 }
 
 #content .tabs_new_enterprise ul li a.selected {
-  background-color: #9f4056;   # added by bai
+  background-color: #9f4056;
   border: 1px solid  #ac344f;
   border-bottom: 1px solid #fff;
   color:#FFF;

public/stylesheets/welcome.css

@@ -1,3 +1,8 @@
+ /*
+  * 再添加的时候按照功能划分区块，随便加的被删掉自负
+  */
+ /************************** 某部分开始 *****************************/
+ /************************** 某部分结束 *****************************/
 .top_bar{
     height: auto;
 }
@@ -285,8 +290,8 @@ div#tooltip::after {
      background-color: #FCE6EA;
      text-decoration: none;
      border-top: 1px solid #FFFFFF;
-     border-left: 1px solid #FFFFFF:
-     border-bottom:  1px solid #717171;
+     border-left: 1px solid #FFFFFF;
+     border-bottom: 1px solid #717171;
      border-right: 1px solid #717171;
 }
 .inner-content a:hover{
@@ -376,4 +381,65 @@ a.attachments_list_color {
     padding: 0 6px;
     line-height: 1.3em;
     margin-bottom: 3px;
-}
+}
+ /************************** 贴吧动态 开始 *****************************/
+ /*贴吧活动*/
+.memo_activity{
+
+}
+/*帖子li*/
+.memo_activity .message-brief-intro{
+    line-height: 1.76em;
+    padding:3px;
+    margin:3px;
+}
+/*帖子中的链接*/
+.memo_activity a {
+    color: #105CB6;
+}
+/*帖子标题*/
+.memo_activity .memo_title{
+    display: inline-block;
+    margin-bottom: 3px;
+    padding-left: 20px;
+    background: url('../images/list-icon.png') no-repeat scroll left center;
+    font-size: 10pt;
+}
+/*帖子的各种属性*/
+.memo_activity .memo_attr{
+    margin-left: 20px;
+}
+/*帖子的时间*/
+.memo_activity .memo_timestamp{
+    color: #999999;
+    white-space: nowrap;
+    font-size: 9pt;
+}
+/*帖子的作者*/
+.memo_activity .memo_author{
+    margin-left: 8px;
+    margin-bottom: 0px;
+    color: #999999;
+    white-space: nowrap;
+    font-size: 9pt;
+}
+.memo_activity span a{
+    color: gray;
+}
+/*帖子的最后回复人*/
+.memo_activity .memo_last_person{
+    margin-left: 8px;
+    margin-bottom: 0px;
+    color: #999999;
+    white-space: nowrap;
+    font-size: 9pt;
+}
+/*帖子的总回复数量*/
+.memo_activity .memo_reply{
+    float: right;
+    color: rgb(172, 174, 177);
+    white-space: nowrap;
+    font-size: 10pt;
+}
+
+ /************************** 贴吧动态 结束 ****************************

public/themes/redpenny-master/stylesheets/application.css

@@ -66,7 +66,9 @@ a
 .action-settings #header h1:before
 {
 	font-family: Fontawesome;
-	
+    /*	content: "\f0f0 ";*/
+    padding-right: 5px;
+}
 
 /*by young*/
 .action-settings #header h1:before
@@ -190,11 +192,7 @@ a
 .controller-gantts #header h1:before
 {
 	font-family: Fontawesome;
-
-	
-
 /*	content: "\f080";*/
-
 	padding-right: 5px;
 }
 
@@ -210,25 +208,16 @@ a
 .controller-welcome #header h1:before
 {
 	font-family: Fontawesome;
-
-	
-
-/*	content: "\f015 ";*/	
-
+/*	content: "\f015 ";*/
 	padding-right: 5px;
 	font-weight: 100;
 }
 .controller-users #header h1:before
 {
 	font-family: Fontawesome;
-
-	
 	padding-right: 5px;
 }
 
-/*	content: "\f0f0 ";*/
-	padding-right: 5px;
-}
 /*end*/
 
 
@@ -373,11 +362,10 @@ ul.projects li.root
 	background-color:#fff; /*顶层导航颜色*/
 	color: #fff;
 	font-size:13px;     /* bai */
-	font-family: 微软雅黑;
+	font-family: "Microsoft YaHei";
 	position:relative;
 	padding:0;
 	height:1px;
-	padding-top:0;
 	/*by bai*/
 	border-radius: 5px;/*导航栏边角变圆*/
 	/*end*/
@@ -403,7 +391,6 @@ ul.projects li.root
 {
 	/*by young*/
     color:#fff; /*the color of the fonts*/
-	font-weight:6px;
 	padding:4px 3px
 }
 
@@ -454,7 +441,7 @@ ul.projects li.root
 #main.nosidebar #content_
 {
 	width:auto;
-	float:center;
+	/*float:center;*/
 	min-height:800px;
 	border: 1px solid #ffffff;
 }
@@ -537,7 +524,7 @@ ul.projects li.root
 	margin:4px 20px 20px;
 	padding-bottom:15px;
 	text-align:left
-	font-size: 18px;
+	/*font-size: 18px;*/
 }
 
 #footer a:hover
@@ -664,8 +651,8 @@ div.splitcontentleft h2
 	position:relative;
 	z-index: 2;
 	background: #fff;*/
-	font-family:微软雅黑, "PT Sans", Helvetica, Arial;
-	font: color: #FFF;
+	/*font-family:"Microsoft YaHei", "PT Sans", Helvetica, Arial;*/
+	/*font: color: #FFF;*/
 	transition:all .4s linear;
 	-moz-transition:all .4s linear;
 	-o-transition:all .4s linear;
@@ -695,8 +682,9 @@ div.splitcontentleft h2
 }
 #top-menu li a.my-page:before {
 	font-family: Fontawesome;
-	content: "\f0c9 ";	
-
+	content: "\f0c9 ";
+    /*	content: "\f0f0 ";*/
+}
 /*by young*/
 #top-menu li a.home:before {
 	font-family: Fontawesome;
@@ -745,9 +733,6 @@ div.splitcontentleft h2
 	content: "\f08b ";
 }
 
-
-/*	content: "\f0f0 ";*/
-}
 #top-menu #account a.logout:before {
 	font-family: Fontawesome;
 /*	content: "\f08b ";*/
@@ -1065,7 +1050,7 @@ input[type="submit"]
 
 html > body #content
 {
-	min-height:auto!important
+	/*min-height:auto !important;*/
 }
 
 pre,code,.line-code 
@@ -1479,11 +1464,10 @@ div.pagination span {
 	-moz-border-bottom-colors: none;
 	border-image: none;
 }
-}
 
 div.pagination span.current-page {
 	/*color: rgb(153, 153, 153);  add by huang*/
-	color:#e2f4ff;
+	/*color:#e2f4ff;*/
 	cursor: default;
 }
 
@@ -1548,7 +1532,6 @@ div.pagination_new span {
 	-moz-border-bottom-colors: none;
 	border-image: none;
 }
-}
 
 div.pagination_new span.current-page {
 	color: rgb(153, 153, 153);
@@ -1745,7 +1728,7 @@ div.project-search-block {
 	margin-bottom: 0px;
 	padding: 10px;
 	width: 95%;
-	border-top： 1px solid rgb(242,242,242);
+	border-top: 1px solid rgb(242,242,242);
 	/*border-bottom: 1px solid rgb(223, 223, 223);*/
 	margin-left: auto;
 	margin-right: auto;
@@ -1833,7 +1816,7 @@ a.usage {
 /*end*/
 
 a.bid_user {
-	font-family:微软雅黑;
+	font-family:"Microsoft YaHei";
 	color:#acaeb1;
 	font-size:12px;
 }
@@ -1850,7 +1833,7 @@ a.bid_course{
 }
 
 a.bids_user {
-	font-family:微软雅黑;
+	font-family:"Microsoft YaHei";
 	color:#15bccf;
 	font-size:14px;
 	font-weight: bold;
@@ -1866,10 +1849,10 @@ input[type='text'].noline {
 .noline {
 	/*border-style: none;
 	border-color: white;*/
-	font-family:微软雅黑; /*modify by men*/
+	font-family:"Microsoft YaHei"; /*modify by men*/
 	border: #d5dee9 1px solid;
 	font-size: 12px;
-	color: #818283;    # modified by bai
+	color: #818283;
 	padding: 9px 5px;
 	width: 98%;
 	cursor: text;
@@ -2096,7 +2079,7 @@ ul.message-for-user {
 	list-style-type: none;
 	margin: 0px;
     padding: 0px;
-    font-family: 微软雅黑,Verdana,sans-serif,宋体;
+    font-family: "Microsoft YaHei",Verdana,sans-serif,simsun;
     text-align: left;
     font-size: 10pt;
     width: 100%;