From 04b0f77532f560ef4714afecc8ea17502cce195a Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 12 Sep 2014 17:31:23 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=96=E5=AD=90?=
 =?UTF-8?q?=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E8=B4=B4=E5=90=A7=E6=8F=8F=E8=BF=B0=E6=A0=BC=E5=BC=8F=E4=B8=8D?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_memos.html.erb |  2 +-
 app/views/memos/show.html.erb         | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/views/layouts/base_memos.html.erb b/app/views/layouts/base_memos.html.erb
index fdce1cc83..14944792d 100644
--- a/app/views/layouts/base_memos.html.erb
+++ b/app/views/layouts/base_memos.html.erb
@@ -56,7 +56,7 @@
 							<div class="sidebar-forums">
 								<div class="forums-line">																																							
 								<div class="forums-title"><%= @forum.name %></div>
-								<div class="forums-description"><%= textilizable @forum.description %></div>
+								<div class="forums-description"><%= textAreailizable @forum.description %></div>
 								</div>																																		
 							<!--informations-->
 								<div class="formus-first-title" >创建人信息</div>
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index 9b68e80fc..099a0c385 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -1,7 +1,7 @@
 <div class="lz">
   <!-- 在这里添加赞和踩-->
   <span id="praise_tread" style="float: right"> <%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%> </span>
-	<div class="lz-left">	
+	<div class="lz-left">
 		<div><%= link_to image_tag(url_to_avatar(@memo.author), :class => "avatar"), user_path(@memo.author) %></div>
 		<p class="clearfix"><%=link_to @memo.author.name, user_path(@memo.author) %></p>
 	</div>
@@ -20,7 +20,7 @@
 				:remote => true,
 				:method => 'get',
 				:title => l(:button_quote)
-				)if !@memo.locked? && User.current.logged? %>			
+				)if !@memo.locked? && User.current.logged? %>
 
 			<%= link_to(
 				image_tag('edit.png'),
@@ -42,14 +42,14 @@
 				:data => {:confirm => l(:text_are_you_sure)},
 				:title => l(:button_delete)
 				) if @memo.destroyable_by?(User.current) %>
-			
-				
+
+
 		</div>
 
 		<div class="memo-title <%= @memo.sticky ? 'sticky' : '' %> <%= @memo.locked? ? 'locked' : '' %>" style="word-break: break-all;word-wrap: break-word;"><%= label_tag l(:field_subject) %>: <%=h @memo.subject %></div>
 		<div class="memo-content">
 		<%= textAreailizable(@memo,:content) %>
-			<p>							
+			<p>
 				<% if @memo.attachments.any?%>
 				<% options = {:author => true, :deletable => @memo.deleted_attach_able_by?(User.current) } %>
 				<%= render :partial => 'attachments/links', :locals => {:attachments => @memo.attachments, :options => options} %>
@@ -84,7 +84,7 @@
 				:method => 'get',
 				:title => l(:button_quote)
 				)if !@memo.locked? && User.current.logged? %>
-				
+
 			<%= link_to(
 				image_tag('edit.png'),
 				{:action => 'edit', :id => reply},
@@ -103,7 +103,7 @@
 				:method => :delete,
 				:data => {:confirm => l(:text_are_you_sure)},
 				:title => l(:button_delete)
-				) if reply.destroyable_by?(User.current) %> 			
+				) if reply.destroyable_by?(User.current) %>
 
 		</div>
         <br/>
@@ -126,7 +126,7 @@
               <!-- modified by zjc 修正名字无链接问题 -->
 				<td class="font_lighter" style="float:right"><%= authoring reply.created_at, reply.author %></td>
 			</tr>
-		</table>    
+		</table>
 	</div>
 	<% end %>
 	<div class="pagination"><%= pagination_links_full @reply_pages, @reply_count, :per_page_links => false %></div>

From 8688c03aee9a637ea508cca100a5860d328de3bc Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 18 Sep 2014 16:20:58 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E9=99=90=E5=88=B6=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=AD=E6=98=B5=E7=A7=B0=E7=9A=84=E9=95=BF?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/attachments/_links.html.erb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/views/attachments/_links.html.erb b/app/views/attachments/_links.html.erb
index de43dce4c..698198120 100644
--- a/app/views/attachments/_links.html.erb
+++ b/app/views/attachments/_links.html.erb
@@ -12,7 +12,7 @@
                 :filename => attachment.filename%>
   <% end %>
   <span title="<%= attachment.description%>">
-    <%= h(truncate(" - #{attachment.description}", length: 20, omission: '...')) unless attachment.description.blank? %>
+    <%= h(truncate(" - #{attachment.description}", length: 15, omission: '...')) unless attachment.description.blank? %>
   </span>
   <span class="size">(<%= number_to_human_size attachment.filesize %>)</span>
   <% if options[:deletable] %>
@@ -34,7 +34,10 @@
   <% end %>
   <% if options[:author] %>
       <!-- modified by zjc author添加超链接 -->
-    <span class="author"><%= link_to h(attachment.author),user_path(attachment.author) %>, <%= format_time(attachment.created_on) %></span>
+    <span class="author" title="attachment.author">
+      <%= link_to h(truncate(attachment.author.name, length: 10, omission: '...')),user_path(attachment.author) %>,
+      <%= format_time(attachment.created_on) %>
+    </span>
   <% end %>
   </p>
 <% end %>

From d9fe607c5be71fd4d07fe589b8761f7edd303693 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 22 Sep 2014 11:36:05 +0800
Subject: [PATCH 3/5] =?UTF-8?q?#1282=20=E4=BF=AE=E5=A4=8D225=E5=8F=B7?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E7=9A=84?=
 =?UTF-8?q?BUG=20=E8=A7=A3=E5=86=B3=E6=96=B9=E6=A1=88=EF=BC=9A=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/migrate/20140922032830_change225_bid_data.rb | 13 +++++++++++++
 db/schema.rb                                    |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20140922032830_change225_bid_data.rb

diff --git a/db/migrate/20140922032830_change225_bid_data.rb b/db/migrate/20140922032830_change225_bid_data.rb
new file mode 100644
index 000000000..f41ec73c0
--- /dev/null
+++ b/db/migrate/20140922032830_change225_bid_data.rb
@@ -0,0 +1,13 @@
+class Change225BidData < ActiveRecord::Migration
+  def up
+    bid = Bid.find 225
+    bid.proportion = 60
+    bid.save
+  end
+
+  def down
+    bid = Bid.find 225
+    bid.proportion = 60
+    bid.save
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index ebf24f547..817104aa9 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 => 20140916005319) do
+ActiveRecord::Schema.define(:version => 20140922032830) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false

From 4604720475ff18d0775c1979766e49dbde28627c Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Mon, 22 Sep 2014 14:55:29 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AB=9E=E8=B5=9B?=
 =?UTF-8?q?=E4=BD=9C=E5=93=81=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: alan <547533434@qq.com>
---
 .../contests/_new_softapplication.html.erb    | 114 ++++++++----------
 config/locales/zh.yml                         |  13 +-
 2 files changed, 63 insertions(+), 64 deletions(-)

diff --git a/app/views/contests/_new_softapplication.html.erb b/app/views/contests/_new_softapplication.html.erb
index ebea41b43..dc5a9493c 100644
--- a/app/views/contests/_new_softapplication.html.erb
+++ b/app/views/contests/_new_softapplication.html.erb
@@ -1,51 +1,77 @@
 <%#= error_messages_for 'softapplication'  %>
 
-<script type="text/javascript" xmlns="http://www.w3.org/1999/html">
+<script type="text/javascript" xmlns="http://www.w3.org/1999/html" xmlns="http://www.w3.org/1999/html">
     //验证作品名称
     function regexName()
    {
        var name = $("#softapplication_name").val();
-       if(name.length ==0)
+       if(name.length == 0)
        {
-           $("#spane_name_notice").text("作品名称不能为空");
+           $("#spane_name_notice").text("<%= l(:label_no_softapplication_name) %>");
            $("#spane_name_notice").css('color','#ff0000');
            $("#spane_name_notice").focus();
            return false;
        }
        else if(name.length <= 25)
        {
-           $("#spane_name_notice").text("填写正确");
+           $("#spane_name_notice").text("<%= l(:label_field_correct) %>");
            $("#spane_name_notice").css('color','#008000');
            return true;
        }
        else
        {
-           $("#spane_name_notice").text("作品名称超过25个汉字");
+           $("#spane_name_notice").text("<%= l(:label_work_name_condition) %>");
            $("#spane_name_notice").css('color','#ff0000');
            $("#spane_name_notice").focus();
            return false;
        }
    }
 
+    // added by longjun
+    //验证作品简介
+    function regexDescription()
+    {
+        var name = $("#softapplication_description").val();
+        if(name.length ==0)
+        {
+            $("#span_sofapplication_description").text("<%= l(:label_no_softapplication_description) %>");
+            $("#span_sofapplication_description").css('color','#ff0000');
+            $("#span_sofapplication_description").focus();
+            return false;
+        }
+        else if(name.length <= 500)
+        {
+            $("#span_sofapplication_description").text("<%= l(:label_field_correct) %>");
+            $("#span_sofapplication_description").css('color','#008000');
+            return true;
+        }
+        else
+        {
+            $("#span_sofapplication_description").text("<%= l(:label_work_description_condition) %>");
+            $("#span_sofapplication_description").css('color','#ff0000');
+            $("#span_sofapplication_description").focus();
+            return false;
+        }
+    }
    //验证运行平台
    function regexWorkdescription()
    {
        var workDescription = $("#softapplication_android_min_version_available").val();
        if(workDescription.length ==0)
        {
-           $("#spane_workdescription_notice").text("运行平台不能为空");
+           $("#spane_workdescription_notice").text("<%= l(:label_no_softapplication_platform) %>");
            $("#spane_workdescription_notice").css('color','#ff0000');
            return false;
        }
        if(workDescription.length <= 125)
        {
-           $("#spane_workdescription_notice").text("填写正确");
+           $("#spane_workdescription_notice").text("<%= l(:label_field_correct) %>");
            $("#spane_workdescription_notice").css('color','#008000');
            return true;
        }
        else
        {
-           $("#spane_workdescription_notice").text("运行平台超过125个汉字");
+           $("#spane_workdescription_notice").text("<%= l(:label_work_platform_condition) %>");
            $("#spane_workdescription_notice").css('color','#ff0000');
            return false;
        }
@@ -57,19 +83,19 @@
         var workDescription = $("#softapplication_application_developers").val();
         if(workDescription.length ==0)
         {
-            $("#span_softapplication_application_developers").text(<%= l(:label_no_softapplication_developers) %>);
+            $("#span_softapplication_application_developers").text("<%= l(:label_no_softapplication_developers) %>");
             $("#span_softapplication_application_developers").css('color','#ff0000');
             return false;
         }
         if(workDescription.length <= 125)
         {
-            $("#span_softapplication_application_developers").text(<%= l(:label_field_correct) %>);
+            $("#span_softapplication_application_developers").text("<%= l(:label_field_correct) %>");
             $("#span_softapplication_application_developers").css('color','#008000');
             return true;
         }
         else
         {
-            $("#span_softapplication_application_developers").text(<%= l(:label_softapplication_developers_condition) %>);
+            $("#span_softapplication_application_developers").text("<%= l(:label_softapplication_developers_condition) %>");
             $("#span_softapplication_application_developers").css('color','#ff0000');
             return false;
         }
@@ -77,7 +103,7 @@
     //提交验证
     function submit_new_softapplication()
     {
-        if(regexName() && regexWorkdescription() && regexDevelopers())
+        if(regexName() && regexDescription() && regexDevelopers())
         {
             $("#new_softapplication").submit();
         }
@@ -90,70 +116,36 @@
       <tr style="width:700px; margin-left: -10px;">
         <span><%= l(:label_work_name) %></span>
         <span class="contest-star"> * </span>:
-        <td>
+
           <%= f.text_field :name,
                            :required => true,
                            :size => 60,
                            :style => "width:320px;",
                            :onblur => "regexName();"
           %>
-        </td>
+
         <span style="font-size: 10px;" id="spane_name_notice">(<%= l(:label_workname_lengthlimit) %>)</span>
       </tr>
       <br/>
       <br/>
       <br/>
 
-      <tr style="width:800px;">
-        <span><%= l(:label_running_platform) %></span>
-        <span class="contest-star"> * </span>:
-        <td style="width: 100px">
-          <%= f.text_field :android_min_version_available,
-                           :required => true,
-                           :size => 60,
-                           :style => "width:320px;",
-                           :onblur=>"regexWorkdescription();"
-          %>
-        </td>
-        <span style="font-size: 10px" id="spane_workdescription_notice">(<%= l(:label_workdescription_lengthlimit) %>)</span>
-      </tr>
-      <br/>
-      <br/>
-      <br/>
 
-      <tr style="width:800px;">
-        <span><%= l(:label_work_type) %></span>
-        <span class="contest-star"> * </span>:
-        <td style="width: 100px">
-            <span>
-              <%#= select_tag 'app_type_name', work_type_opttion, {:name => 'app_type_name',:style => "width:358px;"} %>
-            </span>
-          <%= f.select :app_type_name,work_type_opttion,
-                       {},
-                       {:style => "width:328px;",:onchange => "selectChange(this)"}  %>
-          <%#= f.text_field :app_type_name, :required => true, :size => 60, :style => "width:400px;" %>
-        </td>
-          <span style="font-size: 10px;display: none" id="other_span">
-            <%#= f.text_field :other_input, :required => true, :size => 60, :style => "width:100px;"  %>
-            <input type="text" style="width: 120px;" id="other_input" name = "other_input"/>
-          </span>
-      </tr>
-      <br/>
-      <br/>
-      <br/>
 
-      <tr style="width:800px;">
-        <td style="padding-bottom: 290px;">
+      <tr style="width:800px; padding-bottom: 30px;">
+
             <span><%= l(:label_work_description) %></span>
             <span class="contest-star"> * </span>:
-        </td>
-        <td style="width: 100px">
-          <%= f.text_field :description,
+
+            <!-- modified by longjun 将单行输入框改成多行-->
+          <%= f.text_area :description,
                            :required => true,
                            :size => 60,
-                           :style => "width:320px;"
+                           :rows => 3,
+                           :onblur => 'regexDescription();',
+                           :style => "width:320px; "
           %>
-        </td>
+        <span style="font-size: 10px;" id="span_sofapplication_description">(<%= l(:label_work_description_lengthlimit) %>)</span>
         <!--span style="font-size: 10px">(<%#= l(:label_workdescription_lengthlimit) %>)</span-->
       </tr>
       <br/>
@@ -163,14 +155,14 @@
       <tr style="width:800px;">
         <span><%= l(:label_softapplication_developers) %></span>
         <span class="contest-star"> * </span>:
-        <td style="width: 100px">
+
           <%= f.text_field :application_developers,
                            :required => true,
                            :size => 60,
                            :style => "width:320px;",
                            :onblur => 'regexDevelopers();'
           %>
-        </td>
+
         <span style="font-size: 10px" id="span_softapplication_application_developers">
           (<%= l(:label_workdescription_lengthlimit) %>)
         </span>
@@ -221,8 +213,8 @@
       </fieldset>
     </fieldset></br>
     <div class="align-center" style="padding-top: -3px; padding-bottom: 8px">
-      <!--<input type="button" class="enterprise" value="<%=l(:button_create) %>" onclick="submit_new_softapplication();" >-->
-      <%= submit_tag l(:button_create) %>
+      <input type="button" class="enterprise" value="<%=l(:button_create) %>" onclick="submit_new_softapplication();" >
+      <%#= submit_tag l(:button_create) %>
       <%= submit_tag l(:button_cancel),
                      :name => nil,
                      :onclick => "cancel();",
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 27589e5f1..58ab416c7 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2000,8 +2000,15 @@ zh:
   label_work_deposit_project_url: 托管项目网址
   label_work_deposit_project: 托管项目
   label_softapplication_name_condition: 25个汉字以内（50个字符）
-  label_softapplication_description_condition: 125个汉字以内
+  label_softapplication_description_condition: 125个汉字以内,开发人员用,隔开
+  label_work_description_lengthlimit: 500个汉字以内
   label_softapplication_developers_condition: 开发人员超过125个汉字
+  label_no_softapplication_name: 作品名称不能为空
+  label_work_name_condition: 作品名称超过25个汉字
+  label_no_softapplication_description: 作品简介不能为空
+  label_work_description_condition: 作品简介名称超过500个汉字
+  label_no_softapplication_platform: 运行平台不能为空
+  label_work_platform_condition: 运行平台超过125个汉字
   label_no_softapplication_developers: 开发人员不能为空
   label_user_login_softapplication_board: 您还没有登录，请登录后参与应用评价。
   label_contest_description_no: 暂无描述。
@@ -2043,7 +2050,7 @@ zh:
   label_attending_contest: 参加竞赛
   label_new_attendingcontest_work: 新建参赛作品
   label_workname_lengthlimit: 25个汉字以内
-  label_workdescription_lengthlimit: 125个汉字以内
+  label_workdescription_lengthlimit: 125个汉字以内，用英文逗号隔开
   label_please_input_password: 请输入竞赛密码
   label_please_select_project: 请选择项目
   label_upload_softworkpacket_photo: 上传作品软件包和作品截图
@@ -2128,4 +2135,4 @@ zh:
   lable_hot_course: 活跃课程
   lable_hot_projects: 热门项目
   lable_user_active: 用户动态
-  lable_bar_active: 贴吧动态
+  lable_bar_active: 贴吧动态

From b88c361525fed3cdfaccc35d36a1b80732fa027c Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Mon, 22 Sep 2014 17:32:18 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E5=8F=82=E8=B5=9B=E4=BD=9C=E5=93=81=E6=A0=B7=E5=BC=8F=20Signed?=
 =?UTF-8?q?-off-by:=20alan=20<547533434@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/contests/_new_softapplication.html.erb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/contests/_new_softapplication.html.erb b/app/views/contests/_new_softapplication.html.erb
index dc5a9493c..3e4c0c9e0 100644
--- a/app/views/contests/_new_softapplication.html.erb
+++ b/app/views/contests/_new_softapplication.html.erb
@@ -134,8 +134,9 @@
 
       <tr style="width:800px; padding-bottom: 30px;">
 
-            <span><%= l(:label_work_description) %></span>
-            <span class="contest-star"> * </span>:
+            <span style="margin-top: 5px; float: left; display: block;"><%= l(:label_work_description) %>&nbsp;</span>
+            <span style="margin-top: 5px;float: left; display: block;" class="contest-star"> * </span>
+            <span style="margin-top: 5px; float: left; display: block;"> &nbsp;:&nbsp;</span>
 
             <!-- modified by longjun 将单行输入框改成多行-->
           <%= f.text_area :description,
@@ -147,6 +148,7 @@
           %>
         <span style="font-size: 10px;" id="span_sofapplication_description">(<%= l(:label_work_description_lengthlimit) %>)</span>
         <!--span style="font-size: 10px">(<%#= l(:label_workdescription_lengthlimit) %>)</span-->
+
       </tr>
       <br/>
       <br/>