jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Conflicts:
	app/views/layouts/base_projects.html.erb
This commit is contained in:
sw 2015-04-14 10:19:17 +08:00
parent fadca9128f 6b8022cb23
commit aee81e8e44
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/views/projects/_tools_expand.html.erb
View File

@ -8,11 +8,11 @@
<%= link_to l(:project_module_wiki), project_wiki_path(@project) %> <%= link_to l(:project_module_wiki), project_wiki_path(@project) %>
<% end %> <% end %>
</li> </li>
<li> <!--<li>-->
<% unless @project.enabled_modules.where("name = 'code_review'").empty? %> <!--<%# unless @project.enabled_modules.where("name = 'code_review'").empty? %>-->
<%= link_to l(:project_module_code_review), {controller: 'code_review', action: 'index', id: @project.id} %> <!--<%#= link_to l(:project_module_code_review), {controller: 'code_review', action: 'index', id: @project.id} %>-->
<% end %> <!--<%# end %>-->
</li> <!--</li>-->
<!--<li>--> <!--<li>-->
<!--<%# unless @project.enabled_modules.where("name = 'calendar'").empty? %>--> <!--<%# unless @project.enabled_modules.where("name = 'calendar'").empty? %>-->
<!--<%#= link_to l(:project_module_calendar),project_calendar_path(@project) %>--> <!--<%#= link_to l(:project_module_calendar),project_calendar_path(@project) %>-->
@ -23,21 +23,21 @@
<!--<%#= link_to l(:project_module_gantt) ,project_gantt_path(@project) %>--> <!--<%#= link_to l(:project_module_gantt) ,project_gantt_path(@project) %>-->
<!--<%# end %>--> <!--<%# end %>-->
<!--</li>--> <!--</li>-->
<li> <!--<li>-->
<% unless @project.enabled_modules.where("name = 'documents'").empty? %> <!--<%# unless @project.enabled_modules.where("name = 'documents'").empty? %>-->
<%= link_to l(:project_module_documents), project_documents_path(@project) %> <!--<%#= link_to l(:project_module_documents), project_documents_path(@project) %>-->
<% end %> <!--<%# end %>-->
</li> <!--</li>-->
<!---->
<li> <li>
<%= link_to l(:label_roadmap) ,project_roadmap_path(@project) %> <%= link_to l(:label_roadmap) ,project_roadmap_path(@project) %>
</li> </li>
<li> <li>
<%= link_to l(:label_project_tool_response) ,project_feedback_path(@project)%> <%= link_to l(:label_project_tool_response) ,project_feedback_path(@project)%>
</li> </li>
<li> <!--<li>-->
<% unless @project.enabled_modules.where("name = 'dts'").empty? %> <!--<%# unless @project.enabled_modules.where("name = 'dts'").empty? %>-->
<%= link_to l(:project_module_dts) ,share_show_path(@project) %> <!--<%#= link_to l(:project_module_dts) ,share_show_path(@project) %>-->
<% end %> <!--<%# end %>-->
</li> <!--</li>-->