diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb
index c9f78d8e1..25d35d407 100644
--- a/app/views/boards/_course_show.html.erb
+++ b/app/views/boards/_course_show.html.erb
@@ -1,12 +1,12 @@
-<!-- <%= course_board_breadcrumb(@board) %> -->
+<!-- <%#= course_board_breadcrumb(@board) %> -->
 
 <!--new and follow-->
 <!-- <div class="content-title-top">
-<%= link_to l(:label_message_new),
+<%#= link_to l(:label_message_new),
             new_board_message_path(@board),
             :class => 'icon icon-add',
             :onclick => 'showAndScrollTo("add-message", "message_subject"); return false;' if User.current.logged? %> -->
-<!-- <%= watcher_link(@board, User.current) %> -->
+<!-- <%#= watcher_link(@board, User.current) %> -->
 <!-- </div> -->
 <div id="add-message" class="add_frame" style="display:none;">
   <% if User.current.logged? %>
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index 35868090c..3002cb769 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -1,33 +1,35 @@
-<!-- <%= board_breadcrumb(@board) %> -->
+<!-- <%#= board_breadcrumb(@board) %> -->
 
 <!--new and follow-->
 <!-- <div class="content-title-top">
-<%= link_to l(:label_message_new),
+<%#= link_to l(:label_message_new),
             new_board_message_path(@board),
             :class => 'icon icon-add',
             :onclick => 'showAndScrollTo("add-message", "message_subject"); return false;' if User.current.logged? %> -->
-<!-- <%= watcher_link(@board, User.current) %> -->
+<!-- <%#= watcher_link(@board, User.current) %> -->
 <!-- </div> -->
 <div id="add-message" class="add_frame" style="display:none;">
   <% if User.current.logged? %>
       <h3><%= link_to h(@board.name), project_board_path(@project, @board) %> &#187; <%= l(:label_message_new) %></h3>
-      <div class="add_frame_header" >
+
+      <div class="add_frame_header">
         <%= l(:label_message_new) %>
       </div>
       <%= form_for @message, :url => new_board_message_path(@board), :html => {:multipart => true, :id => 'message-form'} do |f| %>
           <%= render :partial => 'messages/form', :locals => {:f => f} %>
           <p><%= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %>
-            <%= preview_link(preview_board_message_path(@board), 'message-form' ,target='preview',{:class => 'whiteButton m3p10'} )%> |
-            <%= link_to l(:button_cancel), "#", :onclick => '$("#add-message").hide(); return false;' ,:class => 'whiteButton m3p10'  %></p>
+            <%= preview_link(preview_board_message_path(@board), 'message-form', target='preview', {:class => 'whiteButton m3p10'}) %>
+            |
+            <%= link_to l(:button_cancel), "#", :onclick => '$("#add-message").hide(); return false;', :class => 'whiteButton m3p10' %></p>
       <% end %>
       <div id="preview" class="wiki"></div>
   <% end %>
 </div>
 
 <!--display the board-->
-<div class="borad-title"><%=h @board.name %></div>
+<div class="borad-title"><%= h @board.name %></div>
 
-<% if !User.current.logged?%>
+<% if !User.current.logged? %>
     <div style="font-size: 14px;margin:20px;">
       <% if @project.project_type == 1 %>
           <%= l(:label_user_login_course_board) %>
@@ -39,15 +41,17 @@
     </div>
 <% end %>
 
-<!-- <div class="borad-description"><%=h @board.description %></div> -->
+<!-- <div class="borad-description"><%= h @board.description %></div> -->
 <div class="borad-setitle">
-  <span class="borad-topic-count">共有 <%=link_to @topics.count %> 个贴子</span>
-<span>
-	<%= link_to l(:label_message_new),
-                new_board_message_path(@board),
-                :class => 'icon icon-add',
-                :onclick => 'showAndScrollTo("add-message", "message_subject"); return false;' if User.current.logged? %>
-</span>
+  <span class="borad-topic-count">共有 <%= link_to @topics.count %> 个贴子</span>
+  <% if @project.enabled_modules.where("name = 'boards'").count > 0 %>
+    <span>
+        <%= link_to l(:label_message_new),
+                    new_board_message_path(@board),
+                    :class => 'icon icon-add',
+                    :onclick => 'showAndScrollTo("add-message", "message_subject"); return false;' if User.current.logged? %>
+    </span>
+  <% end %>
 </div>
 <div style="padding-top: 10px">
   <% if @topics.any? %>
@@ -63,18 +67,29 @@
       <% @topics.each do |topic| %>
           <table class="content-text-list">
             <tr>
-              <td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(topic.author), :class => "avatar"), user_path(topic.author) %></td>
+              <td colspan="2" valign="top" width="50"><%= link_to image_tag(url_to_avatar(topic.author), :class => "avatar"), user_path(topic.author) %></td>
               <td>
                 <table width="640px" border="0">
                   <tr>
                     <td valign="top" width="500px" class=" <%= topic.sticky? ? 'sticky' : '' %> <%= topic.locked? ? 'locked' : '' %>"><%= link_to h(topic.subject), board_message_path(@board, topic) %></td>
-                    <td align="right" rowspan="3"><table class="borad-count"><tr><td align="center" class="borad-count-digit"><%=link_to (topic.replies_count), board_message_path(@board, topic) %></td></tr>
-                      <tr><td align="center">回答</td></tr>
-                    </table></td>
+                    <td align="right" rowspan="3">
+                      <table class="borad-count">
+                        <tr>
+                          <td align="center" class="borad-count-digit"><%= link_to (topic.replies_count), board_message_path(@board, topic) %></td>
+                        </tr>
+                        <tr>
+                          <td align="center">回答</td>
+                        </tr>
+                      </table>
+                    </td>
                   </tr>
                   <!-- <tr><td colspan="2" ><span class="font_description">标签</span></td></tr> -->
-                  <tr><td align="left" colspan="2" ><span class="font_lighter"><%= authoring topic.created_on, topic.author %><br /></span></td></tr>
-                </table></td>
+                  <tr>
+                    <td align="left" colspan="2">
+                      <span class="font_lighter"><%= authoring topic.created_on, topic.author %><br/></span></td>
+                  </tr>
+                </table>
+              </td>
             </tr>
           </table>
 
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 9b05e64d6..31cf824d7 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -1,120 +1,127 @@
 <div class="content-title-top">
-	<div>
-	<%= link_to l(:label_issue_new), { :controller => 'issues', :action => 'new', :copy_from => nil }, :param => :project_id, :caption => :label_issue_new,
-              :html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) }, :class => 'icon icon-add' %>
+  <% if @project.enabled_modules.where("name = 'issue_tracking'").count > 0 %>
+      <div>
+        <%= link_to l(:label_issue_new), {:controller => 'issues', :action => 'new', :copy_from => nil}, :param => :project_id, :caption => :label_issue_new,
+                    :html => {:accesskey => Redmine::AccessKeys.key_for(:new_issue)}, :class => 'icon icon-add' %>
 
-	<%= link_to l(:label_query), '#', :class => 'icon icon-help',
-	           :onclick => '$("#custom_query").slideToggle(400); ' if true || User.current.logged? %>
-	</div>
+        <%= link_to l(:label_query), '#', :class => 'icon icon-help',
+                    :onclick => '$("#custom_query").slideToggle(400); ' if true || User.current.logged? %>
+      </div>
+  <% end %>
 </div>
 
 <div class="contextual">
-	<% if !@query.new_record? && @query.editable_by?(User.current) %>
-	<%= link_to l(:button_edit), edit_query_path(@query), :class => 'icon icon-edit' %>
-	<%= delete_link query_path(@query) %>
-	<% end %>
+  <% if !@query.new_record? && @query.editable_by?(User.current) %>
+      <%= link_to l(:button_edit), edit_query_path(@query), :class => 'icon icon-edit' %>
+      <%= delete_link query_path(@query) %>
+  <% end %>
 </div>
 
 <% html_title(@query.new_record? ? l(:label_issue_plural) : @query.name) %>
 <div style="clear:right; ">
-<%= form_tag({ :controller => 'issues', :action => 'index', :project_id => @project }, :method => :get, :id => 'query_form', :class => 'query_form') do %>
-<%= hidden_field_tag 'set_filter', '1' %>
-
-<div id="custom_query" class="custom_query" style="display: <%= !params[:utf8].blank? ? 'block' : 'none' %>;">
-	<span>---<%= l :label_query_new %>---</span>
-	<div id="query_form_content" class="hide-when-print">
-		<fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
-			<legend onclick="toggleFieldset(this);">
-				<%= l(:label_issue_query_condition) %>
-			</legend>
-			<div style="<%= @query.new_record? ? "" : "display: none;" %>">
-				<%= render :partial => 'queries/filters', :locals => {:query => @query} %>
-			</div>
-		</fieldset>
-		<fieldset class="collapsible collapsed" >
-			<legend onclick="toggleFieldset(this);">
-				<%= l(:label_options) %>
-			</legend>
-			<div style="display: none;">
-				<table>
-					<tr>
-						<td><%= l(:field_column_names) %></td>
-						<td><%= render_query_columns_selection(@query) %></td>
-					</tr>
-					<tr>
-						<td><label for='group_by'><%= l(:field_group_by) %></label></td>
-						<td><%= select_tag('group_by', options_for_select([[]] + @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]}, @query.group_by) ) %></td>
-					</tr>
-					<tr>
-						<td><%= l(:button_show) %></td>
-						<td><%= available_block_columns_tags(@query) %></td>
-					</tr>
-				</table>
-			</div>
-		</fieldset>
-	<div class="buttons hide-when-print">
-		<%= link_to_function l(:label_issue_query), 'submit_query_form("query_form")', :class => 'icon icon-checked' %>
-		<%= link_to l(:label_issue_cancel_query), { :set_filter => 1, :project_id => @project }, :class => 'icon icon-reload'  %>	
-	</div>
-	</div>
-</div>
-<% end %>
+  <%= form_tag({:controller => 'issues', :action => 'index', :project_id => @project}, :method => :get, :id => 'query_form', :class => 'query_form') do %>
+      <%= hidden_field_tag 'set_filter', '1' %>
+
+      <div id="custom_query" class="custom_query" style="display: <%= !params[:utf8].blank? ? 'block' : 'none' %>;">
+        <span>---<%= l :label_query_new %>---</span>
+
+        <div id="query_form_content" class="hide-when-print">
+          <fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
+            <legend onclick="toggleFieldset(this);">
+              <%= l(:label_issue_query_condition) %>
+            </legend>
+            <div style="<%= @query.new_record? ? "" : "display: none;" %>">
+              <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
+            </div>
+          </fieldset>
+          <fieldset class="collapsible collapsed">
+            <legend onclick="toggleFieldset(this);">
+              <%= l(:label_options) %>
+            </legend>
+            <div style="display: none;">
+              <table>
+                <tr>
+                  <td><%= l(:field_column_names) %></td>
+                  <td><%= render_query_columns_selection(@query) %></td>
+                </tr>
+                <tr>
+                  <td><label for='group_by'><%= l(:field_group_by) %></label></td>
+                  <td><%= select_tag('group_by', options_for_select([[]] + @query.groupable_columns.collect { |c| [c.caption, c.name.to_s] }, @query.group_by)) %></td>
+                </tr>
+                <tr>
+                  <td><%= l(:button_show) %></td>
+                  <td><%= available_block_columns_tags(@query) %></td>
+                </tr>
+              </table>
+            </div>
+          </fieldset>
+          <div class="buttons hide-when-print">
+            <%= link_to_function l(:label_issue_query), 'submit_query_form("query_form")', :class => 'icon icon-checked' %>
+            <%= link_to l(:label_issue_cancel_query), {:set_filter => 1, :project_id => @project}, :class => 'icon icon-reload' %>
+          </div>
+        </div>
+      </div>
+  <% end %>
 </div>
 
 <%= error_messages_for 'query' %>
 
 <% if @query.valid? %>
-	<% if @issues.empty? %>
-		<p class="nodata">
-			<%= l(:label_no_data) %>
-		</p>
-	<% else %>
-		<%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %>
-		<div class="pagination"><ul><%= pagination_links_full @issue_pages, @issue_count %></ul></div>
-	<% end %>
-	<div style="float: right; padding-top: 30px">
-		<% other_formats_links do |f| %>
-			<%= f.link_to 'Atom', :url => params.merge(:key => User.current.rss_key) %>
-			<%= f.link_to 'CSV', :url => params, :onclick => "showModal('csv-export-options', '330px'); return false;" %>
-			<%= f.link_to 'PDF', :url => params %>
-		<% end %>
-	</div>
-
-
-	<div id="csv-export-options" style="display:none;">
-	  <h3 class="title"><%= l(:label_export_options, :export_format => 'CSV') %></h3>
-	  <%= form_tag(params.merge({:format => 'csv',:page=>nil}), :method => :get, :id => 'csv-export-form') do %>
-	  <p>
-	    <label><%= radio_button_tag 'columns', 'all' %> <%= l(:description_all_columns) %></label>
-	  </p>
-	  <p>
-	    <label><%= check_box_tag 'description', '1', @query.has_column?(:description) %> <%= l(:field_description) %></label>
-	  </p>
-	  <p class="buttons">
-	    <%= submit_tag l(:button_export), :name => nil, :onclick => "hideModal(this);" %>
-	    <%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %>
-	  </p>
-	  <% end %>
-	</div>
+    <% if @issues.empty? %>
+        <p class="nodata">
+          <%= l(:label_no_data) %>
+        </p>
+    <% else %>
+        <%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %>
+        <div class="pagination">
+          <ul><%= pagination_links_full @issue_pages, @issue_count %></ul>
+        </div>
+    <% end %>
+    <div style="float: right; padding-top: 30px">
+      <% other_formats_links do |f| %>
+          <%= f.link_to 'Atom', :url => params.merge(:key => User.current.rss_key) %>
+          <%= f.link_to 'CSV', :url => params, :onclick => "showModal('csv-export-options', '330px'); return false;" %>
+          <%= f.link_to 'PDF', :url => params %>
+      <% end %>
+    </div>
+
+
+    <div id="csv-export-options" style="display:none;">
+      <h3 class="title"><%= l(:label_export_options, :export_format => 'CSV') %></h3>
+      <%= form_tag(params.merge({:format => 'csv', :page => nil}), :method => :get, :id => 'csv-export-form') do %>
+          <p>
+            <label><%= radio_button_tag 'columns', 'all' %> <%= l(:description_all_columns) %></label>
+          </p>
+
+          <p>
+            <label><%= check_box_tag 'description', '1', @query.has_column?(:description) %> <%= l(:field_description) %></label>
+          </p>
+
+          <p class="buttons">
+            <%= submit_tag l(:button_export), :name => nil, :onclick => "hideModal(this);" %>
+            <%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %>
+          </p>
+      <% end %>
+    </div>
 
 <% end %>
 
-<%= call_hook(:view_issues_index_bottom, { :issues => @issues, :project => @project, :query => @query }) %>
+<%= call_hook(:view_issues_index_bottom, {:issues => @issues, :project => @project, :query => @query}) %>
 
 <% content_for :sidebar do %>
-<%= render :partial => 'issues/sidebar' %>
+    <%= render :partial => 'issues/sidebar' %>
 <% end %>
 
 <% content_for :header_tags do %>
-<%= auto_discovery_link_tag(:atom,
-														{:query_id => @query, :format => 'atom',
-														:page => nil, :key => User.current.rss_key},
-														:title => l(:label_issue_plural)) %>
-<%= auto_discovery_link_tag(:atom,
-														{:controller => 'journals', :action => 'index',
-														:query_id => @query, :format => 'atom',
-														:page => nil, :key => User.current.rss_key},
-														:title => l(:label_changes_details)) %>
+    <%= auto_discovery_link_tag(:atom,
+                                {:query_id => @query, :format => 'atom',
+                                 :page => nil, :key => User.current.rss_key},
+                                :title => l(:label_issue_plural)) %>
+    <%= auto_discovery_link_tag(:atom,
+                                {:controller => 'journals', :action => 'index',
+                                 :query_id => @query, :format => 'atom',
+                                 :page => nil, :key => User.current.rss_key},
+                                :title => l(:label_changes_details)) %>
 <% end %>
 
 <%= context_menu issues_context_menu_path %>
diff --git a/app/views/news/_project_news.html.erb b/app/views/news/_project_news.html.erb
index 416b648a9..cdef33e34 100644
--- a/app/views/news/_project_news.html.erb
+++ b/app/views/news/_project_news.html.erb
@@ -11,11 +11,12 @@
 <span style="font-size: 16px; border-bottom:1px solid #f0f0f0; margin-right: 15px;">
 	<%= label_tips %>
 </span>
+<% if @project.enabled_modules.where("name = 'news'").count > 0 %>
 <%= link_to(btn_tips,
             new_project_news_path(@project),
             :class => 'icon icon-add',
             :onclick => 'showAndScrollTo("add-news", "news_title"); return false;') %>
-
+<% end %>
 <% if @project && User.current.allowed_to?(:manage_news, @project) %>
     <div id="add-news" class="add_frame" style="display:none;">
       <%= labelled_form_for @news, :url => project_news_index_path(@project),