From d76eec27cce25671b0be7b81c99d475dfe59c954 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Thu, 12 Jun 2014 11:11:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E7=AB=9E=E8=B5=9B=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E8=AF=84=E8=AE=BA=E6=B7=BB=E5=8A=A0=E7=99=BB=E5=BD=95=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/contestnotifications/index.html.erb |  9 +++++++++
 app/views/contestnotifications/show.html.erb  | 12 +++++++++---
 config/locales/en.yml                         |  1 +
 config/locales/zh.yml                         |  1 +
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/app/views/contestnotifications/index.html.erb b/app/views/contestnotifications/index.html.erb
index a9ab5b775..434b71ce8 100644
--- a/app/views/contestnotifications/index.html.erb
+++ b/app/views/contestnotifications/index.html.erb
@@ -2,10 +2,19 @@
 	<%= l(:label_notification) %>
 </span>
 
+<% if User.current.logged? %>
 <%= link_to(l(:bale_news_notice),
             new_contest_contestnotification_path(@contest),
             :class => 'icon icon-add',
             :onclick => 'showAndScrollTo("add-contestnotifications", "contestnotifications_title"); return false;') %>
+<% else %>
+ 
+      <%= l(:label_user_login_attending_contest) %>
+      <%= link_to l(:label_user_login_new), signin_path %>
+
+<% end %>
+
+
 
 <% if @contest && User.current.allowed_to?(:manage_contestnotifications, @contest) %>
     <div id="add-contestnotifications" class="add_frame" style="display:none;">
diff --git a/app/views/contestnotifications/show.html.erb b/app/views/contestnotifications/show.html.erb
index 8cc9c8adb..d2c3ff13f 100644
--- a/app/views/contestnotifications/show.html.erb
+++ b/app/views/contestnotifications/show.html.erb
@@ -30,10 +30,16 @@
 		<%#= link_to_attachments @contestnotification %>
 		<br/>
 		<!--add comment-->
+
+		<% if User.current.logged? %>
+			<p>
+				<%= toggle_link l(:label_comment_add), "add_notificationcomment_form", :focus => "notificationcomment_notificationcomments" %>
+			</p>
+		<% else %> 
+      		<%= l(:label_user_login_notificationcomment) %>
+      		<%= link_to l(:label_user_login_new), signin_path %>
+		<% end %>
 		
-		<p>
-			<%= toggle_link l(:label_comment_add), "add_notificationcomment_form", :focus => "notificationcomment_notificationcomments" %>
-		</p>
 		<%= form_tag( contest_contestnotification_notificationcomments_path(@contest, @contestnotification) , :id => "add_notificationcomment_form", :style => "display:none;") do %>
 		<div class="box">
 			<%= text_area 'notificationcomment', 'notificationcomments', :cols => 80, :rows => 15, :class => 'wiki-edit' %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 237ca03ee..6e42d7800 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1734,6 +1734,7 @@ en:
   label_contest_innovate_community: Competition community
   
   label_user_login_score_and_comment: You are not logged in, please log in and then score and comment the work!
+  label_user_login_notificationcomment: You are not logged in, please log in and then comment the notification!
   label_contest_work_list: Competition work list
   
   
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 30fbfe7f2..643706da9 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -563,6 +563,7 @@ zh:
   label_user_login_project_board: 您还没有登录，请登录后参与项目讨论
   label_user_login_attending_contest: 您还没有登录，请登录后参赛
   label_user_login_score_and_comment: 您还没有登录，请登录后对作品进行打分评价
+  label_user_login_notificationcomment: 您还没有登录，请登录后参加评论
   #end
   #by huang    # modified by bai
   label_college: 高校进入