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

app/controllers/projects_controller.rb

@@ -957,16 +957,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
+    @course_prefs.endup_time = yesterday
-    @save_flag = course_prefs.save
+    @save_flag = @course_prefs.save
 
     respond_to do |format|
       format.js
@@ -974,11 +975,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
+    @course_prefs.endup_time = day
-    @save_flag = course_prefs.save
+    @save_flag = @course_prefs.save
 
     respond_to do |format|
       format.js {
@@ -988,6 +989,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/controllers/softapplications_controller.rb

@@ -8,6 +8,30 @@ class SoftapplicationsController < ApplicationController
   def index
     @softapplications = Softapplication.all
 
+    #new added fenyefunction
+    @limit = 5
+    @softapplication_count = @softapplications.count
+    @softapplication_pages = Paginator.new @softapplication_count, @limit, params['page']  
+    @offset ||= @softapplication_pages.offset
+    #@softapplications = @softapplications[@offset,@limit]
+    #new added end
+
+    #new added sort
+    if params[:softapplication_sort_type].present?
+    case params[:softapplication_sort_type]
+      when '0'
+          @softapplications = @softapplications[@offset, @limit]
+        @s_state = 0
+      when '1'
+          @softapplications = @softapplications.sort { |x, y| y[:created_at] <=> x[:created_at]}[@offset, @limit]
+        @s_state = 1
+      end
+      else
+          @softapplications = @softapplications.sort { |x, y| y[:created_at] <=> x[:created_at]}[@offset, @limit]
+        @s_state = 1
+    end    
+    #new added end
+    
     respond_to do |format|
       format.html # index.html.erb
       format.json { render json: @softapplications }
@@ -16,8 +40,25 @@ class SoftapplicationsController < ApplicationController
 
   # GET /softapplications/1
   # GET /softapplications/1.json
+
+  def percent_of(num, percent)
+    num.to_f / percent.to_f * 100.0
+  end
+
   def show
     @softapplication = Softapplication.find(params[:id])
+    # 打分统计
+    stars_reates = @softapplication.
+                    rates(:quality)
+    stars_reates_count = stars_reates.count == 0 ? 1 : stars_reates.count
+    stars_status = stars_reates.select("stars, count(*) as scount").
+                    group("stars")
+    
+    @stars_status_map = Hash.new(0.0)
+    stars_status.each do |star_status|
+      @stars_status_map["star#{star_status.stars.to_i}".to_sym] = 
+        percent_of(star_status.scount, stars_reates_count).to_s + "%"
+    end
     @jours = @softapplication.journals_for_messages.order('created_on DESC')
     @image_results = []
     @softapplication.attachments.each do |f|

app/controllers/welcome_controller.rb

@@ -39,17 +39,18 @@ class WelcomeController < ApplicationController
     @courseCount = Project.course_entities.count
     @teacherCount = User.teacher.count
     @studentCount = User.student.count
-    @logoLink = logolink(params[:school_id])
+    @logoLink = logolink()
   end
   
   
   
- def logolink(id)
+ def logolink()
+    id = params[:school_id]
     logo_link = ""
     if id.nil? and User.current.user_extensions.school.nil?
       logo_link = '/images/transparent.png'
     else
-      if id.to_i == 0
+      if id == "0"
         logo_link = '/images/transparent.png'
       else
         if id.nil?

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/softapplications_helper.rb

@@ -1,2 +1,18 @@
 module SoftapplicationsHelper
+    def sort_softapplication(state)
+      content = ''.html_safe
+      case state
+      when 0
+        content << content_tag('li', link_to(l(:label_sort_by_time),  {controller: 'softapplications', action: 'index' ,:softapplication_sort_type => '1'}))
+        content << content_tag('li', link_to(l(:label_sort_by_active),  {controller: 'softapplications', action: 'index' ,:softapplication_sort_type => '0'}, :class=>"selected"), :class=>"selected")
+        
+      when 1
+        content << content_tag('li', link_to(l(:label_sort_by_time),  {controller: 'softapplications', action: 'index' ,:softapplication_sort_type => '1'}, :class=>"selected"), :class=>"selected")
+        content << content_tag('li', link_to(l(:label_sort_by_active),  {controller: 'softapplications', action: 'index' ,:softapplication_sort_type => '0'}))
       end
+      content = content_tag('ul', content)
+      content_tag('div', content, :class => "tabs")
+    end
+end
+
+

app/helpers/user_score_helper.rb

@@ -54,58 +54,112 @@ module UserScoreHelper
     watcher_count = Watcher.where("watchable_type = 'principal' AND watchable_id = ?", user.id).count
   end
 
+
+
+
   def calculate_skill_count(user)
     
-    praise_count = 0
+    praise_count_l0 = 0
-    tread_count = 0
+    praise_count_l1 = 0
+    praise_count_l2 = 0
+    tread_count_l0 = 0
+    tread_count_l1 = 0
+    tread_count_l2 = 0
     issues = Issue.where('author_id = ?', user.id)   
     issues.each do |i|
-      ptcs = PraiseTreadCache.where('object_id = ?', i.id)
+      pts = PraiseTread.where('praise_tread_object_id = ?', i.id)
-      ptcs.each do |p|
+      pts.each do |p|
-        praise_count = praise_count + p.praise_num
+        templevel = calculate_level(User.find(p.user_id))
-        tread_count = tread_count + p.tread_num
+
+        if templevel.to_i == 0
+          if p.praise_or_tread == 1
+            praise_count_l0 = praise_count_l0 + 1
+          else
+            tread_count_l0 = tread_count_l0 + 1            
+          end
+        end
+        if templevel.to_i == 1
+          if p.praise_or_tread == 1
+            praise_count_l1 = praise_count_l1 + 1
+          else
+            tread_count_l1 = tread_count_l1 + 1
+          end
+        end
+        if templevel.to_i == 2
+          if p.praise_or_tread == 1
+            praise_count_l2 = praise_count_l2 + 1
+          else
+            tread_count_l2 + tread_count_l2 + 1
           end
         end
+      end
+    end
+
+
+
     
     bids = Bid.where('author_id = ?', user.id)
     bids.each do |b|
-      ptcs = PraiseTreadCache.where('object_id = ?', b.id)
+      ptcs = PraiseTread.where('praise_tread_object_id = ?', b.id)
       ptcs.each do |p|
-        praise_count = praise_count + p.praise_num
+        templevel = calculate_level(User.find(p.user_id))
-        tread_count = tread_count + p.tread_num
+
+        if templevel.to_i == 0
+          if p.praise_or_tread == 1
+            praise_count_l0 = praise_count_l0 + 1
+          else
+            tread_count_l0 = tread_count_l0 + 1            
+          end
+        end
+        if templevel.to_i == 1
+          if p.praise_or_tread == 1
+            praise_count_l1 = praise_count_l1 + 1
+          else
+            tread_count_l1 = tread_count_l1 + 1
+          end
+        end
+        if templevel.to_i == 2
+          if p.praise_or_tread == 1
+            praise_count_l2 = praise_count_l2 + 1
+          else
+            tread_count_l2 + tread_count_l2 + 1
+          end
+        end
       end
     end
     
     contests = Contest.where('author_id = ?', user.id)
     contests.each do |c|
-      ptcs = PraiseTreadCache.where('object_id = ?', c.id)
+      ptcs = PraiseTread.where('praise_tread_object_id = ?', c.id)
       ptcs.each do |p|
-        praise_count = praise_count + p.praise_num
+        templevel = calculate_level(User.find(p.user_id))
-        tread_count = tread_count + p.tread_num          
+
+        if templevel.to_i == 0
+          if p.praise_or_tread == 1
+            praise_count_l0 = praise_count_l0 + 1
+          else
+            tread_count_l0 = tread_count_l0 + 1            
           end
         end
-    
+        if templevel.to_i == 1
-    
+          if p.praise_or_tread == 1
-    level = calculate_level(user)
+            praise_count_l1 = praise_count_l1 + 1
-    
+          else
-    skill_score = 0
+            tread_count_l1 = tread_count_l1 + 1
-    
+          end
-    if level == 0
-      skill_score = praise_count - 0.5 * tread_count
         end
-    if level == 1
+        if templevel.to_i == 2
-      skill_score = 2 * praise_count - 1.5 * tread_count
+          if p.praise_or_tread == 1
+            praise_count_l2 = praise_count_l2 + 1
+          else
+            tread_count_l2 + tread_count_l2 + 1
           end
-    if level == 2
-      skill_socre = 3 * praise_count - 2.5 * tread_count
         end 
-    if level == 3
-      skill_socre = 4 * praise_count - 3.5 * tread_count
       end     
-    if level == 4 
-      skill_socre = 5 * praise_count - 4.5 * tread_count
     end
     
+    
+    
 #    case level
 #      when 0 skill_score = praise_count - 0.5 * tread_count
 #      when 1 skill_score = 2 * praise_count - 1.5 * tread_count
@@ -114,11 +168,18 @@ module UserScoreHelper
 #      when 4 skill_socre = 5 * praise_count - 4.5 * tread_count
 #    end
 
-    
+    skill_score = 2 * praise_count_l0.to_f + 3 * praise_count_l1.to_f + 4 * praise_count_l2.to_f
+                  - 1 * tread_count_l0.to_f - 1.5 * tread_count_l1.to_f - 2 * tread_count_l2.to_f
     
     tread_user_count = PraiseTread.where('praise_or_tread = ? AND user_id = ?', 0, user.id).count
     
-    skill_score = skill_score - 0.5 * tread_user_count
+    skill_score = skill_score.to_f - tread_user_count.to_f
+
+
+
+
+
+
 
     return skill_score
     
@@ -135,7 +196,7 @@ module UserScoreHelper
     issues.each do |i|
       ptcs = PraiseTreadCache.where('object_id = ?', i.id)
       ptcs.each do |p|
-        if p.praise_num > max_praise_num
+        if p.praise_num.to_i > max_praise_num.to_i
           max_praise_num = p.praise_num
         end
       end
@@ -145,7 +206,7 @@ module UserScoreHelper
     bids.each do |b|
       ptcs = PraiseTreadCache.where('object_id = ?', b.id)
       ptcs.each do |p|
-        if p.praise_num > max_praise_num
+        if p.praise_num.to_i > max_praise_num.to_i
           max_praise_num = p.praise_num
         end
       end
@@ -155,7 +216,7 @@ module UserScoreHelper
     contests.each do |c|
       ptcs = PraiseTreadCache.where('object_id = ?', c.id)
       ptcs.each do |p|
-        if p.praise_num > max_praise_num
+        if p.praise_num.to_i > max_praise_num.to_i
           max_praise_num = p.praise_num
         end
       end     

app/views/contests/_list_softapplications.html.erb

@@ -14,7 +14,7 @@
 			<tr>
 				<td>简介:</td>
 				<td>
-					<%= c_softapplication.softapplication.description %>
+					<%= c_softapplication.softapplication.description.truncate(90, omission: '...') %>
 				</td>
 			</tr></br>
 			</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) #如果课程已结束%>
+<% if display #如果课程已结束%>
-	<%= link_to '重启课程', restartcourse_project_path(project), :remote => true, :method => :post, :id => id, :confirm => ('确定要重启课程？') %>
+	<% 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/files/index.html.erb

@@ -1,4 +1,132 @@
 <!-- <h3> --><!-- %=l(:label_attachment_plural)%></h3 -->
+<style>
+#ver-zebra, .file_table_des
+{
+	font-family: "Lucida Sans Unicode", "Lucida Grande", Sans-Serif;
+	font-size: 12px;
+	margin: 5px 10px;
+	width: 98%;
+	text-align: left;
+	border-collapse: collapse;
+  line-height: 20px;
+  font-size: 14px;
+}
+#ver-zebra th
+{
+	font-size: 14px;
+	font-weight: normal;
+	padding: 12px 15px;
+	border-right: 1px solid #fff;
+	border-left: 1px solid #fff;
+	color: #039;
+	text-align: left;
+}
+#ver-zebra td
+{
+	padding: 8px 15px;
+	border-right: 1px solid #fff;
+	border-left: 1px solid #fff;
+	color: #669;
+}
+#ver-zebra td.description {
+  background-color: white;
+  padding: 0px;
+  margin: 0px auto;
+}
+div.tags_area {
+  padding: 2px 10px 10px 10px;
+  margin: 0px;
+  margin-bottom: 10px;
+  /*border-bottom: 1px dashed #CCCCCC;*/
+  overflow: hidden;
+  position: relative;
+}
+.tags_gradint {
+}
+.read-more{
+  padding: 5px;
+  border-top: 4px double #ddd;
+  background: #fff;
+  color: #333;
+}
+.read-more a{
+  padding-right: 22px;
+  background: url() no-repeat 100% 50%;
+  font-weight: bold;
+  text-decoration: none;
+}
+.read-more a:hover{
+  color: #000;
+}
+.vzebra-odd
+{
+	background: #eff2ff;
+}
+.vzebra-even
+{
+	background: #e8edff;
+}
+#ver-zebra #vzebra-adventure, #ver-zebra #vzebra-children
+{
+	background: #ffffff;
+	border-bottom: 1px solid #c8d4fd;
+}
+#ver-zebra #vzebra-comedy, #ver-zebra #vzebra-action
+{
+	background: #ffffff;
+	border-bottom: 1px solid #d6dfff;
+}
+.filename{
+	overflow: hidden; 
+	white-space: nowrap; 
+	text-overflow: ellipsis;
+}
+div.pagination{
+  margin: 10px 0px;
+  height: 1.5em;
+  text-align: left;
+  font-size: 13px;
+}
+.m5p5{
+  display: inline-block;
+  height: auto;
+  color: white !important; 
+  margin: 8px;
+  padding: 3px 7px;
+}
+.m5p5:hover {
+  text-decoration: none;
+  /*padding-bottom: 3px;*/
+  /*border-bottom: 1px solid #666666;*/
+  border-radius: 4px;
+  border: 1px solid #15bccf;
+  box-shadow: 3px 3px 3px #666666;
+}
+.relation_file_div{
+  margin: 0px 25px;
+}
+.relation_file_div fieldset{
+  margin: 0px 0px;
+  padding: 10px;
+  border-radius: 5px;
+  transition: all 2s linear 1s;
+}
+.relation_file_div input#attach_search:focus{
+  border: 1px solid #1B95C6;
+  box-shadow: 0px 0px 4px #1B95C6;
+  width: 200px;
+}
+.relation_file_div input#attach_search{
+  width: 150px;
+  outline: none;
+  border-radius: 5px;
+  -webkit-transition: 1s width;
+  -moz-transition   : 1s width;
+  -o-transition     : 1s width;
+  transition        : 1s width;
+}
+</style>
+
  
 <span class="borad-title"><%=(@project.project_type == 1) ? t(:label_user_course) : t(:label_project) %>资源共享区</span>
 
@@ -88,9 +216,7 @@
       <td class='description' colspan="5">
       <div class="tags_area">
         <% @preTags = %w|预设A 预设B 预设C 预设D 预设E 预设Z | %>
-        <div id='attach_<%=file.id%>' ><%#需要交由浏览器异步刷新，或者一次连表查询，n+1 查询问题搞不定%>
         <%= render :partial => 'tags/tag', :locals => {:obj => file, :object_flag => "6"}%>
-        </div>
         <div class="tags_gradint"></div>
       </div>
       <div class="read-more hidden"><a href="javascript:void(0);" onclick="readmore(this);"> 更多 </a></div>

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_softapplication_index_top_content.html.erb

@@ -0,0 +1,22 @@
+<div class="top-content">
+	<table>
+		<tr>
+			<td class="info_font" style="width: 240px; color: #15bccf">创新竞赛社区</td>
+			<td style="width: 430px; color: #15bccf"><strong><%= l(:label_user_location) %> : </strong></td>
+			<td rowspan="2" width="300px">
+				<div class="project-search" style="float: right">			
+					<%= text_field_tag 'name', params[:name], :size => 25 %>
+					<%= hidden_field_tag 'project_type', params[:project_type] %>
+					<%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>		
+				</div>				
+			</td>
+		</tr>
+		
+		<tr>
+			<td style="padding-left: 8px"><%=link_to request.host()+"/softapplications", :controller=>'softapplications', :action=>'index' %></td>
+			<td ><%=link_to l(:field_homepage), home_path %> > 
+			     <%=link_to l(:label_contest_softapplication), :controller=>'softapplications', :action=>'index' %> 			     
+			</td>
+		</tr>
+	</table>
+</div>

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/softapplications/index.html.erb

@@ -1,4 +1,4 @@
-<h1>参赛应用</h1>
+<!-- <h1>参赛应用</h1>
 
 <table>
   <tr>
@@ -30,4 +30,44 @@
 
 <br />
 
-<%= link_to 'New Softapplication', new_softapplication_path %>
+<%= link_to '发布新应用', new_softapplication_path %> -->
+
+
+
+<%=render :partial => 'layouts/base_softapplication_index_top_content'%>
+
+<% if @softapplications.size > 0%>
+	<%= sort_softapplication(@s_state)%>
+
+	<div width="95%" border="0" style="padding-left: 10px; padding-top: 10px;">
+		<% @softapplications.each do |softapplication| %>
+			<div>
+				<span style="font-size: 15px; margin-right: 10px;"><strong><%= link_to softapplication.name, softapplication, :target => "_blank" %></strong></span>
+				<span><%= rating_for softapplication, :static => true, dimension: :quality, class: 'rateable div_inline' %></span>
+				
+			</div>
+			<div class="avatar-4"; style="float: left; margin-top: 7px "><%= image_tag('/images/app1.png')%></div>
+			<div style="float: left; width: 600px; padding-top: 6px; margin-left: 8px"><%= softapplication.description.truncate(95, omission: '...') %></div>
+			<div style="float: left; width: 200px; margin-left: 70px; margin-top: -3px; line-height: 0.5em">
+				<%contest = softapplication.contests.first%>
+				<p>所属竞赛：<%= contest ? link_to(contest.name, show_softapplication_contest_path(contest) ) : '尚未加入竞赛'%></p>
+				<p>所属类别：<%= softapplication.app_type_name %></p>
+				<p>系统支持：<%= softapplication.android_min_version_available %></p>
+			</div>
+			<div style="padding-left: 53px">
+				<span>开发人员：<%= softapplication.application_developers %></span>
+				<span style="padding-left: 50px">发布时间：<%=format_time softapplication.created_at %></span>			
+			</div>
+			<div style="border-left: 1px solid #d9d8d8; border-bottom: 1px solid #d9d8d8; margin-left: 50px; padding-bottom: 10px; margin-bottom: 20px; width: 66%"></div>
+			<div class="underline-contests_one" style="margin-top: -7px"></div>
+		<% end %>	
+	</div>
+	
+<% else %>
+    <%= render :partial => "layouts/no_content"%>
+<% end %>
+
+
+<div class="pagination"><%= pagination_links_full @softapplication_pages, @softapplication_count, :per_page_links => false %></div>
+
+<% html_title l(:label_softapplication_list)%>

app/views/softapplications/show.html.erb

@@ -27,7 +27,7 @@
 				<tr>
 					<td style="width: 570px; padding-left:40px; word-wrap: break-word; word-break: break-all">所属类别：<%= @softapplication.app_type_name %></td>
 					<% contest = @softapplication.contests.first %>
-					<td style="width: 240px; word-wrap: break-word; word-break: break-all">所属竞赛：<%= contest ? link_to(contest.name, show_contest_contest_path(contest)) : '尚未加入竞赛'%></td>
+					<td style="width: 240px; word-wrap: break-word; word-break: break-all">所属竞赛：<%= contest ? link_to(contest.name, show_softapplication_contest_path(contest)) : '尚未加入竞赛'%></td>
 				</tr>
 				<tr>
 					<td style="padding-left: 40px">发布人员：<%= @softapplication.user.name %></td>
@@ -56,14 +56,40 @@
 <div class="underline-contests_one"></div>
 
 <div style="height: auto; padding-bottom: 10px">
-	<strong><div style="font-size: 15px">应用简介：</div></strong>
+	<strong><div style="font-size: 15px;">应用简介：</div></strong>
-	<div><%= @softapplication.description.truncate(150, omission: '...') %></div>
+	<div style="padding-top: 5px"><%= @softapplication.description %></div>
+</div>
+<div class="underline-contests_one"></div>
+
+<div style="height: auto; padding-bottom: 10px">
+	<div style="font-size: 15px;"><strong>应用得分：</strong></div>
+	<div style="overflow: hidden">
+		<div style="margin-left: 25%; float: left">
+			<div style="padding-left: 45px; padding-bottom: 5px">得分比例</div>
+			<div>
+				<% 100.step(20,-20) do |star|  %>
+					<div data-kls="Softapplication" data-id="2" data-dimension="quality" data-average="3.25" class="rateable div_inline jDisabled" style="height: 20px; width: 115px; overflow: hidden; z-index: 1; position: relative;">
+						<div class="jRatingColor" style="width: <%=star%>%;"></div>
+						<div class="jRatingAverage" style="width: 0px; top: -20px;"></div>
+						<div class="jStar" style="width: 115px; height: 20px; top: -40px; background: url(&quot;/images/seems_rateable/stars.png&quot;) repeat-x scroll 0% 0% transparent;">
+						</div>
+					</div>
+					<%= @stars_status_map["star#{(star/20).to_s}".to_sym] %>
+					<br>
+				<% end %>
+			</div>
+		</div>
+		<div style="float: left; padding-left: 100px; padding-top:35px ">
+			<div style="padding-left: 25px;">最终得分</div>
+			<div style="padding-top: 3px"><%= rating_for @softapplication, :static => true, dimension: :quality, class: 'rateable div_inline' %></div>
+		</div>
+	</div>
 </div>
 <div class="underline-contests_one"></div>
 
 <div style="height: 240px">
 	<strong><div style="font-size: 15px">软件截图：</div></strong>
-	<div class="softapplication-img">
+	<div class="softapplication-img" style="padding-top: 5px">
      <% @image_results.take(4).each do |attachment| %>
         <%= link_to_attachment_img attachment, :class => "soft-application", :download => "true" %>
      <% end %>
@@ -72,7 +98,18 @@
 </div>
 
 <div class="underline-contests_one"></div>
-
+<!-- <div style="margin-left: 22%;">
+<% 100.step(20,-20) do |star|  %>
+<div data-kls="Softapplication" data-id="2" data-dimension="quality" data-average="3.25" class="rateable div_inline jDisabled" style="height: 20px; width: 115px; overflow: hidden; z-index: 1; position: relative;">
+	<div class="jRatingColor" style="width: <%=star%>%;"></div>
+	<div class="jRatingAverage" style="width: 0px; top: -20px;"></div>
+	<div class="jStar" style="width: 115px; height: 20px; top: -40px; background: url(&quot;/images/seems_rateable/stars.png&quot;) repeat-x scroll 0% 0% transparent;">
+	</div>
+</div>
+<%= @stars_status_map["star#{(star/20).to_s}".to_sym] %>
+<br>
+<% end %>
+</div> -->
 <div style="height: 50px">
 	<div style="font-size: 15px"><strong>软件评论：</strong></div>
 	<div style="padding-left: 210px">评分: <%= rating_for @softapplication, dimension: :quality, class: 'rateable div_inline' %></div>

app/views/test/index.html.erb

@@ -12,14 +12,13 @@
 
 <tr>
 	<td><%= user.lastname %><%= user.firstname  %></td>
-<!--	<td><%= calculate_collaboration_count(user)  %></td>
+	<td><%= calculate_collaboration_count(user) %></td>
 	<td><%= calculate_influence_count(user) %></td>
 	<td><%= calculate_skill_count(user) %></td>
  	<td><%= calculate_file(user) %></td>
  	<td><%= calculate_issue(user) %></td>
 	<td><%= calculate_level(user) %></td>
--->
+
-	<td><%= user.changesets.count %></td>
 </tr>
 <% end %>
 </table>

app/views/welcome/contest.html.erb

@@ -201,7 +201,7 @@
 
 <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>
 	<div class="d-p-projectlist-box">
 		<% if Softapplication.count > 0%>
 			<div class="d-p-projectlist">

app/views/welcome/course.html.erb

@@ -24,14 +24,12 @@
 
 		</div>
 		<div class="welcome_left" >
-	
+			<br />
-		<span class="font_welcome_school">
+			<span class="font_welcome_school"> <% if params[:school_id].nil? and User.current.user_extensions.school.nil? %>
-			<% if params[:school_id].nil? and User.current.user_extensions.school.nil? %>
 				<% else%>
 					<% if params[:school_id] == "0" %>
 					<% else %>
 						<% if params[:school_id].nil? %>
-
 							<%= School.find(User.current.user_extensions.school.id).name %>
 							<br />
 						<% else %>
@@ -39,8 +37,7 @@
 							<br />
 						<% end %>
 					<% end %>
-			<% end %>
+				<% end %> </span>
-			</span>
 			<span class="font_welcome_trustie"><%= l(:label_welcome_trustie) %><%= l(:label_welcome_trustie_course) %> </span>
 			<% if params[:school_id].nil? and User.current.user_extensions.school.nil? %>
 			<span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_course_description) %></span>

app/views/welcome/index.html.erb

@@ -96,19 +96,25 @@
 			<%= 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">
+		<div class="welcome-box-list-new memo_activity">
 		<% find_new_forum_topics(7).each do |topic|%>
-			<li class="message-brief-intro" style="line-height: 1.63em;padding-bottom:3px;">
+			<li class="message-brief-intro">
-				<div  style="display: inline-block; width: 100%;">
+				<div class='memo_title'>
-				  <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,title: topic.subject %>
-				    <%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url, :class => "gray" , :style => "font-size: 10pt !important;", :target => "_blank" %>
+				</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>
-				<br>
+					<span class="memo_reply">
-				<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>
+						回复(<%= link_to topic.try(:replies_count), topic.event_url %>)
-				<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>
 			</li>
 		<% end %>

config/locales/zh.yml

@@ -1425,7 +1425,7 @@ zh:
   label_has_praisers: 赞(%{count})
   label_has_watchers: 关注(%{count})
   label_has_fans: 粉丝(%{count})
-  label_coursefile_sharingarea: 课程资源共享区
+  label_coursefile_sharingarea: 课程文件共享专区
   #modify by men
   label_x_has_fans:
     zero: 粉丝(%{count})
@@ -1547,7 +1547,6 @@ zh:
   label_sort_by_time: 按时间排序
   label_sort_by_active: 按活跃度排序
   label_sort_by_influence: 按影响力排序
-  label_sort_by_activity: 按动态数排序
   label_bids_published: 发布于
   label_bids_published_ago: 之前
   label_welcome_trustie: Trustie
@@ -1668,7 +1667,7 @@ zh:
   label_public_info: （打钩为公开，不打钩则不公开，若不公开，仅项目成员可见该项目。）
   label_course_view_student: 查看其他课程
   label_course_student: 学生
-  label_homework: 课程实践
+  label_homework: 课程作业
   label_course_file: 资源库 #资料共享
   label_stores_index: 资源搜索
   label_course_new_homework: 新建作业
@@ -1716,11 +1715,6 @@ zh:
     zero: 份资料
     one: 份资料
     other: 份资料
-#added by gcm
-  label_x_activity:
-    zero: 个动态
-    one: 个动态
-    other: 个动态
   
 
   
@@ -1765,13 +1759,13 @@ zh:
   label_has_been: 已经被
   label_course_userd_by: 个课程引用
   
+  role_of_course: 课程角色
+  label_student: 学生
   
+  #added by Wen
   label_school_all: 中国高校
   
   
-  role_of_course: 课程角色
-  label_student: 学生
-  
   label_project_grade: 项目得分
   label_user_grade: 个人得分
   label_user_for_project_grade: 个人得分
@@ -1829,8 +1823,7 @@ zh:
   label_sumbit_empty: 搜索内容不能为空
   
   #add by linchun (竞赛相关)
-  label_upload_files: 上传资源
+  label_upload_files: 上传文件
-  label_relation_files: 关联已有资源
   label_upload_softwarepackage: 上传软件包
   label_upload_cuttingphoto: 上传截图
   label_contests_reward_method: 奖励方式
@@ -1869,8 +1862,20 @@ zh:
   label_add_contest_succeed_fail: 添加失败,该应用已参赛.
   label_no_ftapplication: 暂无应用
   label_edit_softapplication: 修改应用
-  label_contest_settings: 配置竞赛
   label_contest_delete: 删除竞赛
+  label_softapplication_list: 应用列表
   
-  
+  label_coursefile_sharingarea: 课程资源共享区
+  label_sort_by_activity: 按动态数排序
+  label_homework: 课程实践
+  label_x_activity:
+    zero: 个动态
+    one: 个动态
+    other: 个动态  
+  label_school_all: 中国高校
+  label_upload_files: 上传资源
+  label_relation_files: 关联已有资源
+  label_contest_settings: 配置竞赛
+  label_contest_delete: 删除竞赛
+  label_school_all: 学校列表
   

public/stylesheets/welcome.css

@@ -1,3 +1,8 @@
+ /*
+  * 再添加的时候按照功能划分区块，随便加的被删掉自负
+  */
+ /************************** 某部分开始 *****************************/
+ /************************** 某部分结束 *****************************/
 .top_bar{
     height: auto;
 }
@@ -285,7 +290,7 @@ div#tooltip::after {
      background-color: #FCE6EA;
      text-decoration: none;
      border-top: 1px solid #FFFFFF;
-     border-left: 1px solid #FFFFFF:
+     border-left: 1px solid #FFFFFF;
      border-bottom: 1px solid #717171;
      border-right: 1px solid #717171;
 }
@@ -377,3 +382,65 @@ a.attachments_list_color {
     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;
+    background-position: 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;
+}
+
+ /************************** 贴吧动态 结束 ****************************