Skip to content

Commit

Permalink
Merge pull request #2 from speedy32129/development
Browse files Browse the repository at this point in the history
commit version 0.0.3
  • Loading branch information
speedy32129 committed Jun 3, 2016
2 parents 4ea3148 + dc78752 commit d780a4a
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 2 deletions.
4 changes: 4 additions & 0 deletions app/views/projects/_show_0.0.0.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@
<h3><%=l(:label_subproject_plural)%>:</h3>
<li><%= @subprojects.collect{|p| link_to(h(p), :action => 'show', :id => p)}.join("</li><li>") %>
<% end %>
<% if @subprojects.any? %>
<br /><br />
<h3>Total: <%=@subprojects.count%></h3>
<% end %>
<% @project.custom_values.each do |custom_value| %>
<% if !custom_value.value.blank? %>
<li><%=h custom_value.custom_field.name %>: <%=h show_value(custom_value) %></li>
Expand Down
4 changes: 4 additions & 0 deletions app/views/projects/_show_2.0.0.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@
<h3><%=l(:label_subproject_plural)%>:</h3>
<li><%= @subprojects.collect{|p| link_to(h(p), :action => 'show', :id => p)}.join("</li><li>").html_safe %>
<% end %>
<% if @subprojects.any? %>
<br /><br />
<h3>Total: <%=@subprojects.count%></h3>
<% end %>
<% @project.visible_custom_field_values.each do |custom_value| %>
<% if !custom_value.value.blank? %>
<li><%=h custom_value.custom_field.name %>: <%=h show_value(custom_value) %></li>
Expand Down
5 changes: 4 additions & 1 deletion app/views/projects/_show_3.x.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@
<h3><span class="label"><%=l(:label_subproject_plural)%>:</span></h3>
<li><%= @subprojects.collect{|p| link_to(h(p), :action => 'show', :id => p)}.join("</li><li>").html_safe %>
<% end %>
<% if @subprojects.any? %>
<br /><br />
<h3>Total: <%=@subprojects.count%></h3>
<% end %>
<% render_custom_field_values(@project) do |custom_field, formatted| %>
<li><span class="label"><%= custom_field.name %>:</span> <%= formatted %></li>
<% end %>
Expand Down Expand Up @@ -71,7 +75,6 @@
<!-- Tracker List - end -->

<!-- Member List - start -->
<!--<div class="splitcontentright">-->
<%= render :partial => 'members_box' %>

<% if @news.any? && authorize_for('news', 'index') %>
Expand Down
2 changes: 1 addition & 1 deletion init.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
author 'Jim McAleer'
author_url 'http://github.com/speedy32129'
description 'This plugin replaces the projects show page and displays a better subproject list.'
version '0.0.2'
version '0.0.3'
end

0 comments on commit d780a4a

Please sign in to comment.