From b416d69639a2256f71a308cf89eab93a006e5c79 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Mon, 26 May 2014 11:01:17 +0800
Subject: [PATCH] vxc

---
 app/controllers/softapplications_controller.rb | 1 +
 app/views/welcome/contest.html.erb             | 2 +-
 db/schema.rb                                   | 7 ++++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/controllers/softapplications_controller.rb b/app/controllers/softapplications_controller.rb
index 31675ca5d..6425dad24 100644
--- a/app/controllers/softapplications_controller.rb
+++ b/app/controllers/softapplications_controller.rb
@@ -149,6 +149,7 @@ class SoftapplicationsController < ApplicationController
     respond_to do |format|
       if @softapplication.save
         ContestingSoftapplication.create(:contest_id => params[:contest_id], :softapplication_id => @softapplication.id)
+        #ProjectingSoftapplication.create(:project_id => params[:project_id], :softapplication_id => @softapplication.id)
         format.html { redirect_to show_attendingcontest_contest_path(:id => params[:contest_id]), notice: l(:notice_attendingcontest_work_successfully_created) }
         # format.json { render json: @softapplication, status: :created, location: @softapplication }
       else
diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb
index 3e0fecceb..c0cbd4f6c 100644
--- a/app/views/welcome/contest.html.erb
+++ b/app/views/welcome/contest.html.erb
@@ -187,7 +187,7 @@
 	<div class="d-p-projectlist-box">
 		<ul class="d-p-projectlist">
 			<% find_new_forum_topics(11).each do |topic|%>
-			<li class="message-brief-intro" style="min-height: 60px; line-height:2em; ">
+			<li class="message-brief-intro" style="height: auto; line-height:2em; padding-bottom: 1px ">
 				<div  style="display: inline-block; width: 100%;">
 				  <span class="memo_activity"  style="color:gray; display: inline-block;  margin-bottom:6px; background: url('/images/list-icon.png') no-repeat scroll ;background-position: left center;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                     <%= link_to '['+topic.forum.name + ']',forum_path(topic.forum),:class => 'memo_Bar_title' %><%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url, :class => "gray" , :style => "font-size: 10pt !important;" %>
diff --git a/db/schema.rb b/db/schema.rb
index f6c83ac65..ff9889129 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140519074133) do
+ActiveRecord::Schema.define(:version => 20140522025721) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -28,6 +28,11 @@ ActiveRecord::Schema.define(:version => 20140519074133) do
     t.datetime "updated_at", :null => false
   end
 
+  create_table "applied_projects", :force => true do |t|
+    t.integer "project_id", :null => false
+    t.integer "user_id",    :null => false
+  end
+
   create_table "apply_project_masters", :force => true do |t|
     t.integer  "user_id"
     t.string   "apply_type"