Mercurial > hg > soundsoftware-site
comparison app/views/projects/.svn/text-base/show.rhtml.svn-base @ 37:94944d00e43c
* Update to SVN trunk rev 4411
author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
---|---|
date | Fri, 19 Nov 2010 13:24:41 +0000 |
parents | 40f7cfd4df19 |
children | cbce1fd3b1b7 |
comparison
equal
deleted
inserted
replaced
22:40f7cfd4df19 | 37:94944d00e43c |
---|---|
14 <% unless @project.homepage.blank? %><li><%=l(:field_homepage)%>: <%= auto_link(h(@project.homepage)) %></li><% end %> | 14 <% unless @project.homepage.blank? %><li><%=l(:field_homepage)%>: <%= auto_link(h(@project.homepage)) %></li><% end %> |
15 <% if @subprojects.any? %> | 15 <% if @subprojects.any? %> |
16 <li><%=l(:label_subproject_plural)%>: | 16 <li><%=l(:label_subproject_plural)%>: |
17 <%= @subprojects.collect{|p| link_to(h(p), :action => 'show', :id => p)}.join(", ") %></li> | 17 <%= @subprojects.collect{|p| link_to(h(p), :action => 'show', :id => p)}.join(", ") %></li> |
18 <% end %> | 18 <% end %> |
19 <% @project.custom_values.each do |custom_value| %> | 19 <% @project.visible_custom_field_values.each do |custom_value| %> |
20 <% if !custom_value.value.blank? %> | 20 <% if !custom_value.value.blank? %> |
21 <li><%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li> | 21 <li><%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li> |
22 <% end %> | 22 <% end %> |
23 <% end %> | 23 <% end %> |
24 </ul> | 24 </ul> |
65 | 65 |
66 <% content_for :sidebar do %> | 66 <% content_for :sidebar do %> |
67 <% if @total_hours && User.current.allowed_to?(:view_time_entries, @project) %> | 67 <% if @total_hours && User.current.allowed_to?(:view_time_entries, @project) %> |
68 <h3><%= l(:label_spent_time) %></h3> | 68 <h3><%= l(:label_spent_time) %></h3> |
69 <p><span class="icon icon-time"><%= l_hours(@total_hours) %></span></p> | 69 <p><span class="icon icon-time"><%= l_hours(@total_hours) %></span></p> |
70 <p><%= link_to(l(:label_details), {:controller => 'timelog', :action => 'details', :project_id => @project}) %> | | 70 <p><%= link_to(l(:label_details), {:controller => 'timelog', :action => 'index', :project_id => @project}) %> | |
71 <%= link_to(l(:label_report), {:controller => 'timelog', :action => 'report', :project_id => @project}) %></p> | 71 <%= link_to(l(:label_report), {:controller => 'time_entry_reports', :action => 'report', :project_id => @project}) %></p> |
72 <% end %> | 72 <% end %> |
73 <%= call_hook(:view_projects_show_sidebar_bottom, :project => @project) %> | 73 <%= call_hook(:view_projects_show_sidebar_bottom, :project => @project) %> |
74 <% end %> | 74 <% end %> |
75 | 75 |
76 <% content_for :header_tags do %> | 76 <% content_for :header_tags do %> |