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

app/views/projects/_tools_expand.html.erb

@@ -33,6 +33,10 @@
 	<%= link_to l(:project_module_documents), project_documents_path(@project) %>
   <% end %>
 </li>
+  
+<li>
+	<%= link_to l(:label_roadmap) ,project_roadmap_path(@project) %>
+</li>
 <li>
 	<%= link_to l(:label_project_tool_response) ,project_feedback_path(@project)%>
 </li>

app/views/versions/index.html.erb

@@ -1,4 +1,7 @@
 <!--modified by young-->
+<div class="project_r_h">
+  <h2 class="project_h2"><%= l(:label_roadmap) %></h2>
+</div>
 <div class="content-title-top">
   <%= link_to l(:label_version_new), new_project_version_path(@project), :class => 'icon icon-add' if User.current.allowed_to?(:manage_versions, @project) %>
 </div>

app/views/versions/show.html.erb

@@ -1,4 +1,7 @@
 <!--modified by young-->
+<div class="project_r_h">
+  <h2 class="project_h2"><%= l(:label_roadmap) %></h2>
+</div>
 <div class="contextual" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
 <%= link_to(l(:button_edit), edit_version_path(@version), :class => 'icon icon-edit') if User.current.allowed_to?(:manage_versions, @version.project) %>
 <%= link_to_if_authorized(l(:button_edit_associated_wikipage,