From 5a7aabd7cf8d5587ec2784b0df8847f7401ea219 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 18 Aug 2014 10:16:34 +0800
Subject: [PATCH] =?UTF-8?q?#1357=201.=E6=B3=A8=E9=87=8A=E6=97=A0=E6=95=88?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=202.=E4=BF=AE=E6=94=B9wiki=E3=80=81DTS?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95logo=E4=B8=8D=E8=A7=81=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../layouts/_base_enterprise_header.html.erb  | 20 +++++++++----------
 app/views/layouts/_base_home_menu.html.erb    |  8 ++++----
 app/views/layouts/base_courses.html.erb       |  2 +-
 app/views/projects/_tools_expand.html.erb     |  4 ++--
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/views/layouts/_base_enterprise_header.html.erb b/app/views/layouts/_base_enterprise_header.html.erb
index 7fd21afe1..d98b94839 100644
--- a/app/views/layouts/_base_enterprise_header.html.erb
+++ b/app/views/layouts/_base_enterprise_header.html.erb
@@ -1,13 +1,13 @@
 <!-- <table id="top-menu" style="background-color: #ac344f;margin-top: 10px;margin-bottom: 0px; padding-top: 3px; ">			
-		<tr><td ><%=link_to image_tag("/images/logo_ent.png",weight:"38px", height: "38px"), home_path %></td>
-			<td valign="top" width="300px"><%= render_menu :top_enterprise_menu if User.current.logged? || !Setting.login_required? -%></td>
-			<td><%=link_to "企业入口"%></td>
+		<tr><td ><%#=link_to image_tag("/images/logo_ent.png",weight:"38px", height: "38px"), home_path %></td>
+			<td valign="top" width="300px"><%#= render_menu :top_enterprise_menu if User.current.logged? || !Setting.login_required? -%></td>
+			<td><%#=link_to "企业入口"%></td>
 			<td valign="top" style=" padding-left: 380px">				
-					  <%= content_tag('div', "#{link_to(l(:label_layouts_feedback)+'(' + User.current.count_new_jour.to_s + ')', feedback_path(User.current))}".html_safe, :id => 'loggedas') if User.current.logged? %>
-		  			  <%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}".html_safe, :id => 'loggedas') if User.current.logged? %>		
+					  <%#= content_tag('div', "#{link_to(l(:label_layouts_feedback)+'(' + User.current.count_new_jour.to_s + ')', feedback_path(User.current))}".html_safe, :id => 'loggedas') if User.current.logged? %>
+		  			  <%#= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}".html_safe, :id => 'loggedas') if User.current.logged? %>
 			</td>
 			<td valign="top">		
-					  <%= render_menu :account_menu -%>		
+					  <%#= render_menu :account_menu -%>
 		    </td>		
 		</tr>
 </table>	 -->						
@@ -31,14 +31,14 @@
 	
 		
 		<!-- <div style="float: right; margin-top: 13px;">
-		<%= content_tag('div', "#{link_to(image_tag('/images/mes.png'), feedback_path(User.current))}".html_safe, :title => "留言") if User.current.logged? %>
+		<%#= content_tag('div', "#{link_to(image_tag('/images/mes.png'), feedback_path(User.current))}".html_safe, :title => "留言") if User.current.logged? %>
 		</div> -->
 		<!-- <div  align="center" style="float: right; margin-right: -25px; margin-top: 6px; background: #ea7125;  width: 12px;border-radius:7px; font-size: 8px; color: #fff; font-weight: bold">
-		<%= User.current.count_new_jour if User.current.logged? && User.current.count_new_jour != 0 %>
+		<%#= User.current.count_new_jour if User.current.logged? && User.current.count_new_jour != 0 %>
 		</div> -->
-		<!-- <%= content_tag('div', "#{}".html_safe, :id => 'loggedas')%> -->
+		<!-- <%#= content_tag('div', "#{}".html_safe, :id => 'loggedas')%> -->
 		<!-- 消息#{link_to((User.current.count_new_jour), feedback_path(User.current))} -->
-		<!-- <%= content_tag('div', "消息（#{User.current.journals_for_messages.count}）".html_safe, :id => 'loggedas')%> -->
+		<!-- <%#= content_tag('div', "消息（#{User.current.journals_for_messages.count}）".html_safe, :id => 'loggedas')%> -->
 		
 
 <!-- <div style="border-top:solid 1px #C6E9F1;width:940px;margin-left:auto;margin-right:auto;margin-bottom: 5px;margin-top: -10px;"></div> -->
diff --git a/app/views/layouts/_base_home_menu.html.erb b/app/views/layouts/_base_home_menu.html.erb
index ca3e5c847..9327cae49 100644
--- a/app/views/layouts/_base_home_menu.html.erb
+++ b/app/views/layouts/_base_home_menu.html.erb
@@ -9,14 +9,14 @@
 		<%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}".html_safe, :id => 'loggedas') if User.current.logged? %>
 		
 		<!-- <div style="float: right; margin-top: 13px;">
-		<%= content_tag('div', "#{link_to(image_tag('/images/mes.png'), feedback_path(User.current))}".html_safe, :title => "留言") if User.current.logged? %>
+		<%#= content_tag('div', "#{link_to(image_tag('/images/mes.png'), feedback_path(User.current))}".html_safe, :title => "留言") if User.current.logged? %>
 		</div> -->
 		<!-- <div  align="center" style="float: right; margin-right: -25px; margin-top: 6px; background: #ea7125;  width: 12px;border-radius:7px; font-size: 8px; color: #fff; font-weight: bold">
-		<%= User.current.count_new_jour if User.current.logged? && User.current.count_new_jour != 0 %>
+		<%#= User.current.count_new_jour if User.current.logged? && User.current.count_new_jour != 0 %>
 		</div> -->
-		<!-- <%= content_tag('div', "#{}".html_safe, :id => 'loggedas')%> -->
+		<!-- <%#= content_tag('div', "#{}".html_safe, :id => 'loggedas')%> -->
 		<!-- 消息#{link_to((User.current.count_new_jour), feedback_path(User.current))} -->
-		<!-- <%= content_tag('div', "消息（#{User.current.journals_for_messages.count}）".html_safe, :id => 'loggedas')%> -->
+		<!-- <%#= content_tag('div', "消息（#{User.current.journals_for_messages.count}）".html_safe, :id => 'loggedas')%> -->
 		<%= render_menu :top_home_menu if User.current.logged? || !Setting.login_required? -%>
 </div>
 <div style="border-top:solid 1px #C6E9F1;width:940px;margin-left:auto;margin-right:auto;margin-bottom: 5px;margin-top: -10px;"></div>
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 725e7fba9..01510865b 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -82,7 +82,7 @@
                             <%= join_in_course(@course, User.current) %>
                         <% end %>
                         <% unless User.current.member_of_course?(@course) %>
-                            <!-- <%= image_tag "/images/fav.png" %> -->
+                            <!-- <%#= image_tag "/images/fav.png" %> -->
                         <% end %>
                     <% end %>
                   </div>
diff --git a/app/views/projects/_tools_expand.html.erb b/app/views/projects/_tools_expand.html.erb
index 7520bd4da..13d63fc08 100644
--- a/app/views/projects/_tools_expand.html.erb
+++ b/app/views/projects/_tools_expand.html.erb
@@ -7,7 +7,7 @@
     <li style="background: url('http://<%= Setting.host_name %>/images/sidebar/tool_tag_alpha.png') no-repeat scroll 10px 30% transparent;"><%= link_to l(:label_project_tool_response) ,project_feedback_path(@project)%></li>
     <li style="background: url('http://<%= Setting.host_name %>/images/sidebar/tool_tag_alpha.png') no-repeat scroll 10px 30% transparent;"><%= link_to l(:project_module_files) ,project_files_path(@project) %></li>
     <% if @project.enabled_modules.where("name = 'wiki'").count > 0 %>
-        <li><%= link_to l(:project_module_wiki), project_wiki_path(@project) %></li>
+        <li style="background: url('http://<%= Setting.host_name %>/images/sidebar/tool_tag_alpha.png') no-repeat scroll 10px 30% transparent;"><%= link_to l(:project_module_wiki), project_wiki_path(@project) %></li>
     <% end %>
   </ul>
   <ul><h3>进度跟踪</h3>
@@ -17,7 +17,7 @@
   </ul>
   <ul><h3>其他工具</h3>
     <% if @project.enabled_modules.where(" name = 'dts'").count > 0 %>
-        <li><%= link_to l(:label_module_share) ,share_show_path(@project) %></li>
+        <li style="background: url('http://<%= Setting.host_name %>/images/sidebar/tool_tag_alpha.png') no-repeat scroll 10px 30% transparent;"><%= link_to l(:label_module_share) ,share_show_path(@project) %></li>
     <% end %>
     <li style="background: url('http://<%= Setting.host_name %>/images/sidebar/tool_tag_alpha.png') no-repeat scroll 10px 30% transparent;"><%= link_to l(:project_module_documents), project_documents_path(@project) %></li>
     <li></li>