From a105f4eaf03e0b2f6572c9939eef14fba4d93412 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 17 Jun 2016 14:09:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=8A=A8=E6=80=81=E4=B8=AD?=
 =?UTF-8?q?=EF=BC=9A=E8=AF=BE=E7=A8=8B=E8=AE=A8=E8=AE=BA=E5=8C=BA=E3=80=81?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=80=9A=E7=9F=A5=20=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E4=B8=AD=EF=BC=9A=E9=A1=B9=E7=9B=AEissue?=
 =?UTF-8?q?=E3=80=81=E9=A1=B9=E7=9B=AE=E6=96=B0=E9=97=BB=E3=80=81=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E8=AE=A8=E8=AE=BA=E5=8C=BA=20=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=EF=BC=9A=E5=A6=82=E4=B8=8A=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=20=E6=9C=AA=E7=99=BB=E5=BD=95=E6=97=B6=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=BD=BF=E8=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_course_message.html.erb  | 54 ++++++++++++-----------
 app/views/users/_course_news.html.erb     | 52 +++++++++++-----------
 app/views/users/_project_issue.html.erb   | 44 +++++++++---------
 app/views/users/_project_message.html.erb | 54 ++++++++++++-----------
 app/views/users/_project_news.html.erb    | 52 +++++++++++-----------
 5 files changed, 133 insertions(+), 123 deletions(-)

diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index 76971e240..9fb844926 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -49,33 +49,35 @@
         <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
       </div>
 
-      <div class="homepagePostSetting" id="message_setting_<%= user_activity_id%>" style="display: none">
-        <ul>
-          <li class="homepagePostSettingIcon">
-            <ul class="homepagePostSettiongText">
-              <% if activity.author.id == User.current.id%>
-                  <li>
-                    <%= link_to(
-                                l(:button_edit),
-                                edit_board_message_path(activity.id,:board_id=>activity.board_id,:is_course=>is_course,:is_board=>is_board),
-                                :class => 'postOptionLink'
-                        ) if activity.course_editable_by?(User.current) %>
-                  </li>
-                  <li>
-                    <%= link_to(
-                                l(:button_delete),
-                                delete_board_message_path(activity.id,:board_id=>activity.board_id,:is_course=>is_course,:is_board=>is_board),
-                                :method => :post,
-                                :data => {:confirm => l(:text_are_you_sure)},
-                                :class => 'postOptionLink'
-                        ) if activity.course_destroyable_by?(User.current) %>
-                  </li>
-              <% end %>
-              <li><%= link_to "发送", "javascript:void(0);", :onclick => "show_send(#{activity.id}, #{User.current.id}, 'message');", :class => "postOptionLink" %></li>
+      <% if User.current.logged? %>
+        <div class="homepagePostSetting" id="message_setting_<%= user_activity_id%>" style="display: none">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <ul class="homepagePostSettiongText">
+                  <% if activity.author.id == User.current.id%>
+                      <li>
+                        <%= link_to(
+                                    l(:button_edit),
+                                    edit_board_message_path(activity.id,:board_id=>activity.board_id,:is_course=>is_course,:is_board=>is_board),
+                                    :class => 'postOptionLink'
+                            ) if activity.course_editable_by?(User.current) %>
+                      </li>
+                      <li>
+                        <%= link_to(
+                                    l(:button_delete),
+                                    delete_board_message_path(activity.id,:board_id=>activity.board_id,:is_course=>is_course,:is_board=>is_board),
+                                    :method => :post,
+                                    :data => {:confirm => l(:text_are_you_sure)},
+                                    :class => 'postOptionLink'
+                            ) if activity.course_destroyable_by?(User.current) %>
+                      </li>
+                  <% end %>
+                  <li><%= link_to "发送", "javascript:void(0);", :onclick => "show_send(#{activity.id}, #{User.current.id}, 'message');", :class => "postOptionLink" %></li>
+                </ul>
+              </li>
             </ul>
-          </li>
-        </ul>
-      </div>
+        </div>
+      <% end %>
 
     </div>
     <div class="cl"></div>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index 5ffa78158..65bc970e3 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -35,31 +35,33 @@
       <div class="mt10" style="font-weight:normal;">
         <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
       </div>
-      <div class="homepagePostSetting">
-        <ul>
-          <li class="homepagePostSettingIcon">
-            <% if User.current.logged? %>
-                <ul class="homepagePostSettiongText">
-                  <li><%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{activity.id}',#{User.current.id},'news')")  %></li>
-                  <li>
-                    <%= link_to(
-                                l(:button_edit),
-                                {controller:'news', :action => 'edit', :id => activity.id},
-                                :class => 'postOptionLink'
-                        ) if User.current.allowed_to?(:manage_news, activity.course) %>
-                  </li>
-                  <li>
-                    <%= delete_link(
-                                news_path(activity),
-                                :data => {:confirm => l(:text_are_you_sure)},
-                                :class => 'postOptionLink'
-                        ) if User.current.allowed_to?(:manage_news, activity.course) %>
-                  </li>
-                </ul>
-            <% end %>
-          </li>
-        </ul>
-      </div>
+      <% if User.current.logged? %>
+        <div class="homepagePostSetting">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <% if User.current.logged? %>
+                    <ul class="homepagePostSettiongText">
+                      <li><%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{activity.id}',#{User.current.id},'news')")  %></li>
+                      <li>
+                        <%= link_to(
+                                    l(:button_edit),
+                                    {controller:'news', :action => 'edit', :id => activity.id},
+                                    :class => 'postOptionLink'
+                            ) if User.current.allowed_to?(:manage_news, activity.course) %>
+                      </li>
+                      <li>
+                        <%= delete_link(
+                                    news_path(activity),
+                                    :data => {:confirm => l(:text_are_you_sure)},
+                                    :class => 'postOptionLink'
+                            ) if User.current.allowed_to?(:manage_news, activity.course) %>
+                      </li>
+                    </ul>
+                <% end %>
+              </li>
+            </ul>
+        </div>
+      <% end %>
     </div>
     <div class="cl"></div>
   </div>
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb
index d8714400d..ccf0e456e 100644
--- a/app/views/users/_project_issue.html.erb
+++ b/app/views/users/_project_issue.html.erb
@@ -13,29 +13,31 @@
         <% end %>  TO
         <%=  link_to activity.project.name.to_s+" | 项目问题", project_issues_path(activity.project), :class => "newsBlue ml15"%>
       </div>
-      <div class="homepagePostSetting">
-        <ul>
-          <li class="homepagePostSettingIcon">
-            <ul class="homepagePostSettiongText">
-              <li>
-                <%= link_to l(:button_edit), issue_path(activity.id, :edit => 'true'), :class => 'postOptionLink', :accesskey => accesskey(:edit) if activity.editable? && User.current.allowed_to?(:edit_issues, activity.project)  %>
-              </li>
-              <li>
-                <% if !defined?(project_id) && !defined?(user_id) %>
-                    <%= link_to l(:button_delete), issue_path(activity.id), :data => {:confirm => issues_destroy_confirmation_message(activity)}, :method => :delete, :class => 'postOptionLink' if User.current.allowed_to?(:delete_issues, activity.project) %>
-                <% elsif defined?(project_id) %>
-                    <%= link_to l(:button_delete), issue_path(activity.id, :page_classify => "project_page", :page_id => project_id), :data => {:confirm => issues_destroy_confirmation_message(activity)}, :method => :delete, :class => 'postOptionLink' if User.current.allowed_to?(:delete_issues, activity.project) %>
-                <% elsif defined?(user_id) %>
-                    <%= link_to l(:button_delete), issue_path(activity.id, :page_classify => "user_page", :page_id => user_id), :data => {:confirm => issues_destroy_confirmation_message(activity)}, :method => :delete, :class => 'postOptionLink' if User.current.allowed_to?(:delete_issues, activity.project) %>
-                <% end %>
-              </li>
-              <li>
-                <%= link_to l(:button_copy), project_copy_issue_path(activity.project, activity), :class => 'postOptionLink' if User.current.allowed_to?(:add_issues, activity.project) %>
+      <% if User.current.logged? %>
+        <div class="homepagePostSetting">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <ul class="homepagePostSettiongText">
+                  <li>
+                    <%= link_to l(:button_edit), issue_path(activity.id, :edit => 'true'), :class => 'postOptionLink', :accesskey => accesskey(:edit) if activity.editable? && User.current.allowed_to?(:edit_issues, activity.project)  %>
+                  </li>
+                  <li>
+                    <% if !defined?(project_id) && !defined?(user_id) %>
+                        <%= link_to l(:button_delete), issue_path(activity.id), :data => {:confirm => issues_destroy_confirmation_message(activity)}, :method => :delete, :class => 'postOptionLink' if User.current.allowed_to?(:delete_issues, activity.project) %>
+                    <% elsif defined?(project_id) %>
+                        <%= link_to l(:button_delete), issue_path(activity.id, :page_classify => "project_page", :page_id => project_id), :data => {:confirm => issues_destroy_confirmation_message(activity)}, :method => :delete, :class => 'postOptionLink' if User.current.allowed_to?(:delete_issues, activity.project) %>
+                    <% elsif defined?(user_id) %>
+                        <%= link_to l(:button_delete), issue_path(activity.id, :page_classify => "user_page", :page_id => user_id), :data => {:confirm => issues_destroy_confirmation_message(activity)}, :method => :delete, :class => 'postOptionLink' if User.current.allowed_to?(:delete_issues, activity.project) %>
+                    <% end %>
+                  </li>
+                  <li>
+                    <%= link_to l(:button_copy), project_copy_issue_path(activity.project, activity), :class => 'postOptionLink' if User.current.allowed_to?(:add_issues, activity.project) %>
+                  </li>
+                </ul>
               </li>
             </ul>
-          </li>
-        </ul>
-      </div>
+        </div>
+      <% end %>
       <div class="homepagePostTitle break_word">
         <% case activity.tracker_id %>
         <% when 1%>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index f82dc35e7..51f29be83 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -49,33 +49,35 @@
       <div class="mt10" style="font-weight:normal;">
         <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
       </div>
-      <div class="homepagePostSetting" id="message_setting_<%= user_activity_id%>" style="display: none">
-        <ul>
-          <li class="homepagePostSettingIcon">
-            <ul class="homepagePostSettiongText">
-              <% if activity.author.id == User.current.id%>
-                  <li>
-                    <%= link_to(
-                                l(:button_edit),
-                                edit_board_message_path(activity.id,:board_id=>activity.board_id,:is_course=>is_course,:is_board=>is_board),
-                                :class => 'postOptionLink'
-                        ) if activity.editable_by?(User.current) %>
-                  </li>
-                  <li>
-                    <%= link_to(
-                                l(:button_delete),
-                                delete_board_message_path(activity.id,:board_id=>activity.board_id,:is_course=>is_course,:is_board=>is_board),
-                                :method => :post,
-                                :data => {:confirm => l(:text_are_you_sure)},
-                                :class => 'postOptionLink'
-                        ) if activity.destroyable_by?(User.current) %>
-                  </li>
-              <% end %>
-              <li><%= link_to "发送", "javascript:void(0);", :onclick => "show_send(#{activity.id}, #{User.current.id}, 'message');", :class => "postOptionLink" %></li>
+      <% if User.current.logged? %>
+        <div class="homepagePostSetting" id="message_setting_<%= user_activity_id%>" style="display: none">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <ul class="homepagePostSettiongText">
+                  <% if activity.author.id == User.current.id%>
+                      <li>
+                        <%= link_to(
+                                    l(:button_edit),
+                                    edit_board_message_path(activity.id,:board_id=>activity.board_id,:is_course=>is_course,:is_board=>is_board),
+                                    :class => 'postOptionLink'
+                            ) if activity.editable_by?(User.current) %>
+                      </li>
+                      <li>
+                        <%= link_to(
+                                    l(:button_delete),
+                                    delete_board_message_path(activity.id,:board_id=>activity.board_id,:is_course=>is_course,:is_board=>is_board),
+                                    :method => :post,
+                                    :data => {:confirm => l(:text_are_you_sure)},
+                                    :class => 'postOptionLink'
+                            ) if activity.destroyable_by?(User.current) %>
+                      </li>
+                  <% end %>
+                  <li><%= link_to "发送", "javascript:void(0);", :onclick => "show_send(#{activity.id}, #{User.current.id}, 'message');", :class => "postOptionLink" %></li>
+                </ul>
+              </li>
             </ul>
-          </li>
-        </ul>
-      </div>
+        </div>
+      <% end %>
     </div>
     <div class="cl"></div>
   </div>
diff --git a/app/views/users/_project_news.html.erb b/app/views/users/_project_news.html.erb
index 43b22b193..1e56b7555 100644
--- a/app/views/users/_project_news.html.erb
+++ b/app/views/users/_project_news.html.erb
@@ -32,31 +32,33 @@
       <div class="mt10" style="font-weight:normal;">
         <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
       </div>
-      <div class="homepagePostSetting">
-        <ul>
-          <li class="homepagePostSettingIcon">
-            <% if User.current.logged? %>
-                <ul class="homepagePostSettiongText">
-                  <li><%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{activity.id}',#{User.current.id},'news')")  %></li>
-                  <li>
-                    <%= link_to(
-                                l(:button_edit),
-                                {:action => 'edit', :id => activity},
-                                :class => 'postOptionLink'
-                        ) if activity.author == User.current %>
-                  </li>
-                  <li>
-                    <%= delete_link(
-                                news_path(activity),
-                                :data => {:confirm => l(:text_are_you_sure)},
-                                :class => 'postOptionLink'
-                        ) if activity.author == User.current %>
-                  </li>
-                </ul>
-            <% end %>
-          </li>
-        </ul>
-      </div>
+      <% if User.current.logged? %>
+        <div class="homepagePostSetting">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <% if User.current.logged? %>
+                    <ul class="homepagePostSettiongText">
+                      <li><%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{activity.id}',#{User.current.id},'news')")  %></li>
+                      <li>
+                        <%= link_to(
+                                    l(:button_edit),
+                                    {:action => 'edit', :id => activity},
+                                    :class => 'postOptionLink'
+                            ) if activity.author == User.current %>
+                      </li>
+                      <li>
+                        <%= delete_link(
+                                    news_path(activity),
+                                    :data => {:confirm => l(:text_are_you_sure)},
+                                    :class => 'postOptionLink'
+                            ) if activity.author == User.current %>
+                      </li>
+                    </ul>
+                <% end %>
+              </li>
+            </ul>
+        </div>
+      <% end %>
     </div>
     <div class="cl"></div>
   </div>