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

app/views/contestnotifications/edit.html.erb

@@ -1,4 +1,4 @@
-<h3><%=l(:label_news)%></h3>
+<h3><%=l(:label_edit_contest_notice)%></h3>
 
 <%= labelled_form_for @contestnotification,
                       :url =>  contest_contestnotification_path,

app/views/contestnotifications/show.html.erb

@@ -1,4 +1,8 @@
-
+<script>
+    function cancel() {
+        $("#add_contestnotification").hide();
+    }
+</script>
 <div class="contextual">
 	<%= link_to(l(:button_edit),
                 edit_contest_contestnotification_path(@contest, @contestnotification),
@@ -27,7 +31,7 @@
 
 <div id="notificationcomments" style="margin-bottom:16px;">
 
-	<div style="margin:15px">
+	<div style="margin:15px" id ="add_contestnotification">
 		<span class="font_description">
           <%= textilizable(@contestnotification, :description) %>
         </span>
@@ -62,7 +66,17 @@
 		</div>
 		<p>
 			<%= submit_tag l(:button_add) %>
-			<%= submit_tag l(:button_cancel), :onclick => "cancel();" %>
+
+            <!--modified by longjun 点击取消时收回添加回复的部分-->
+
+          <%= submit_tag l(:button_cancel),
+                         :name => nil,
+                         :onclick => "cancel();",
+                         :type => 'button',
+                         :class => "enterprise",
+                         :onmouseout => "this.style.backgroundPosition = 'left top'",
+                         :onmouseover => "this.style.backgroundPosition = 'left -30px'"
+          %>
 		</p>
 		<% end %>
 		
@@ -97,7 +111,8 @@
                       </span>
                         <%= l(:label_comment_plural) %>
                     </td>
-                    <td>
+                    <!--modified by longjun 删除变成竖的，IE浏览器兼容，将宽度设置为40px-->
+                    <td width="40px">
                       <% if notificationcomment.author==User.current|| User.current.admin? %>
                           <%= link_to(l(:label_bid_respond_delete),
                                       contest_contestnotification_notificationcomment_path(@contest, @contestnotification,notificationcomment),

app/views/softapplications/_list.html.erb

@@ -9,30 +9,13 @@
       <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%>
-        <!--<table width="100%" border="0">-->
+
-          <!--<tr>-->
-            <!--<td style="width: 70px;  word-wrap: break-word; word-break: break-all"><%=l(:label_attendingcontestwork_belongs_contest)%>：</td>-->
-            <!--<td style="width: 100px; word-wrap: break-word; word-break: break-all">-->
-              <!--<%= contest ? link_to(contest.name.truncate(14, omission: '...'), show_attendingcontest_contest_path(contest), title: contest.name.to_s ) : '尚未加入竞赛'%>-->
-            <!--</td>-->
-          <!--</tr>-->
-          <!--<tr>-->
-            <!--<td style="width: 70px;  word-wrap: break-word; word-break: break-all"><%=l(:label_attendingcontestwork_belongs_type)%>：</td>-->
-            <!--<td style="width: 100px; word-wrap: break-word; word-break: break-all">-->
-              <!--<%= softapplication.app_type_name %>-->
-            <!--</td>-->
-          <!--</tr>-->
-          <!--<tr>-->
-            <!--<td style="width: 70px;  word-wrap: break-word; word-break: break-all"><%=l(:label_attendingcontestwork_adaptive_system)%>：</td>-->
-            <!--<td style="width: 100px; word-wrap: break-word; word-break: break-all">-->
-              <!--<%= softapplication.android_min_version_available %>-->
-            <!--</td>-->
-          <!--</tr>-->
-        <!--</table>-->
         <p><%=l(:label_attendingcontestwork_belongs_contest)%>：<%= contest ? link_to(contest.name.truncate(14, omission: '...'), show_attendingcontest_contest_path(contest), title: contest.name.to_s ) : '尚未加入竞赛'%></p>
-        <p><%=l(:label_attendingcontestwork_belongs_type)%>：<%= softapplication.app_type_name.truncate(14, omission: '...') %></p>
+
+        <!--modified by longjun 因为新建竞赛作品时没有填写运行平台和类别，所有如果为空不能使用truncate函数-->
+        <p><%=l(:label_attendingcontestwork_belongs_type)%>：<%= softapplication.app_type_name ? softapplication.app_type_name.truncate(14, omission: '...') : "" %></p>
         <% strTitle = softapplication.android_min_version_available %>
-        <p><%=l(:label_attendingcontestwork_adaptive_system)%>：<lable title="<%= strTitle %>"><%= strTitle.truncate(10,omisiion:'...') %></lable></p>
+        <p><%=l(:label_attendingcontestwork_adaptive_system)%>：<lable title="<%= strTitle %>"><%= strTitle ? strTitle.truncate(10,omisiion:'...') : "" %></lable></p>
       </div>
       <div style="padding-left: 53px">
         <span><%=l(:label_attendingcontestwork_developers)%>：<%= softapplication.application_developers %></span>

config/locales/zh.yml

@@ -705,6 +705,7 @@ zh:
   label_report_plural: 报表
   label_news: 新闻
   label_news_new: 添加新闻
+  label_edit_contest_notice: 编辑竞赛通知
   bale_news_notice: 添加通知 #huang
   bale_edit_notice: 修改通知
   label_news_notice: 发布课程通知
@@ -2046,6 +2047,7 @@ zh:
   label_contest_delete: 删除竞赛
   label_noawards_current: 暂未评奖
 
+  
   label_softapplication: 应用软件
   label_attending_contest: 参加竞赛
   label_new_attendingcontest_work: 新建参赛作品