Skip to content

Commit

Permalink
Merge pull request #1 from speedy32129/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
speedy32129 committed May 20, 2016
2 parents c318764 + 58830e9 commit 4ea3148
Show file tree
Hide file tree
Showing 8 changed files with 199 additions and 358 deletions.
10 changes: 6 additions & 4 deletions README.rdoc
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
= Redmine Projects Show plugin
= Redmine Project Show plugin

Projects Show is a Redmine plugin to show how simple it is to override default views. This partial one display the sub-projects in a more readable list instead of the comma separated one. Doing it within a plugin is better than changing the core as when you go thru updates to Redmine you won't have to go back and make the changes again.
Project Show is a Redmine plugin to show how simple it is to override default views. This partial one displays the sub-projects in a more readable list instead of the comma separated one. Doing it within a plugin is better than changing the core as when you go thru updates to Redmine you won't have to go back and make the changes again. I got tired of having to do this for multiple installs and versions fso I think the plugin is a btter idea.

== Features

* Current spent time always visible

== Getting the plugin

The newest version is always at {GitHub}[http://github.com/speedy32129/project_show].
The newest version is always at {GitHub}[http://github.com/speedy32129/projects_show].

== Install

Install using the standard methods for a redmine plugin.
Install using the standard methods for a redmine plugin. Make sure plugin directory is named "projects_show". However testing is showing if the web server is restarted it's not necessary to run the plugin migrations.

== Uninstall

Expand All @@ -23,6 +23,8 @@ Unstall using the standard methods for a redmine plugin.
Display a more readable sybproject list.

=== Change History
0.0.2 - Made the plugin multi-version compatible

0.0.1 - Initial creation


112 changes: 112 additions & 0 deletions app/views/projects/_show_0.0.0.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
<!-- show_0.0.0 -->
<div class="contextual">
<% if User.current.allowed_to?(:add_subprojects, @project) %>
<%= link_to l(:label_subproject_new), {:controller => 'projects', :action => 'new', :parent_id => @project}, :class => 'icon icon-add' %>
<% end %>
<% if User.current.allowed_to?(:close_project, @project) %>
<% if @project.active? %>
<%= link_to l(:button_close), close_project_path(@project), :data => {:confirm => l(:text_are_you_sure)}, :method => :post, :class => 'icon icon-lock' %>
<% else %>
<%= link_to l(:button_reopen), reopen_project_path(@project), :data => {:confirm => l(:text_are_you_sure)}, :method => :post, :class => 'icon icon-unlock' %>
<% end %>
<% end %>
</div>

<!-- Project Overview - start-->
<h2><%=l(:label_overview)%></h2>

<% unless @project.active? %>
<p class="warning"><span class="icon icon-lock"><%= l(:text_project_closed) %></span></p>
<% end %>

<div class="splitcontentleft">
<% if @project.description.present? %>
<div class="wiki">
<%= textilizable @project.description %>
</div>
<% end %>
<ul>
<% unless @project.homepage.blank? %>
<li><%=l(:field_homepage)%>: <%= link_to h(@project.homepage), @project.homepage %></li>
<% end %>
<!-- Project Overview - end -->

<!-- Subproject List - start -->
<% if @subprojects.any? %>
<h3><%=l(:label_subproject_plural)%>:</h3>
<li><%= @subprojects.collect{|p| link_to(h(p), :action => 'show', :id => p)}.join("</li><li>") %>
<% 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>
<% end %>
<% end %>
</ul>
</div>
<!-- Subproject list - end -->

<!-- Tracker List - start -->
<div class="splitcontentright">
<% if User.current.allowed_to?(:view_issues, @project) %>
<div class="issues box">
<h3><%=l(:label_issue_tracking)%></h3>
<ul>
<% for tracker in @trackers %>
<li><%= link_to h(tracker.name), :controller => 'issues', :action => 'index', :project_id => @project,
:set_filter => 1,
"tracker_id" => tracker.id %>:
<%= l(:label_x_open_issues_abbr_on_total, :count => @open_issues_by_tracker[tracker].to_i,
:total => @total_issues_by_tracker[tracker].to_i) %>
</li>
<% end %>
</ul>
<p>
<%= link_to l(:label_issue_view_all), :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1 %>
<% if User.current.allowed_to?(:view_calendar, @project, :global => true) %>
| <%= link_to(l(:label_calendar), :controller => 'calendars', :action => 'show', :project_id => @project) %>
<% end %>
<% if User.current.allowed_to?(:view_gantt, @project, :global => true) %>
| <%= link_to(l(:label_gantt), :controller => 'gantts', :action => 'show', :project_id => @project) %>
<% end %>
</p>
</div>
<% end %>
<%= call_hook(:view_projects_show_left, :project => @project) %>
<!-- Tracker List - end -->

<!-- Member List - start -->
<%= render :partial => 'members_box' %>

<% if @news.any? && authorize_for('news', 'index') %>
<div class="news box">
<h3><%=l(:label_news_latest)%></h3>
<%= render :partial => 'news/news', :collection => @news %>
<p><%= link_to l(:label_news_view_all), :controller => 'news', :action => 'index', :project_id => @project %></p>
</div>
<% end %>
<%= call_hook(:view_projects_show_right, :project => @project) %>
</div>
<!-- Member List - end -->

<!-- Sidebar - start -->
<% content_for :sidebar do %>
<% if @total_hours.present? %>
<h3><%= l(:label_spent_time) %></h3>
<p><span class="icon icon-time"><%= l_hours(@total_hours) %></span></p>
<p>
<% if User.current.allowed_to?(:log_time, @project) %>
<%= link_to(l(:label_details), {:controller => 'timelog', :action => 'details', :project_id => @project}) %> |
<% end %>
<%= link_to(l(:label_details), {:controller => 'timelog', :action => 'details', :project_id => @project}) %> |
<%= link_to(l(:label_report), {:controller => 'timelog', :action => 'report', :project_id => @project}) %></p>
<% end %>
<%= call_hook(:view_projects_show_sidebar_bottom, :project => @project) %>
<% end %>
<!-- Sidebar - end -->

<% content_for :header_tags do %>
<%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :id => @project, :format => 'atom', :key => User.current.rss_key}) %>
<% end %>

<% html_title(l(:label_overview)) -%>

Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<!-- show_2.0.0 -->
<div class="contextual">
<% if User.current.allowed_to?(:add_subprojects, @project) %>
<%= link_to l(:label_subproject_new), new_project_path(:parent_id => @project), :class => 'icon icon-add' %>
<%= link_to l(:label_subproject_new), {:controller => 'projects', :action => 'new', :parent_id => @project}, :class => 'icon icon-add' %>
<% end %>
<% if User.current.allowed_to?(:close_project, @project) %>
<% if @project.active? %>
Expand All @@ -11,91 +12,101 @@
<% end %>
</div>

<!-- Project Overview - start-->
<h2><%=l(:label_overview)%></h2>

<% unless @project.active? %>
<p class="warning"><span class="icon icon-lock"><%= l(:text_project_closed) %></span></p>
<% end %>
<!-- Project Information - Start -->

<div class="splitcontentleft">
<% if @project.description.present? %>
<div class="wiki">
<%= textilizable @project.description %>
</div>
<% end %>
<ul>
<% unless @project.homepage.blank? %>
<li><%=l(:field_homepage)%>: <%= link_to h(@project.homepage), @project.homepage %></li>
<% end %>
<!-- Project Overview - end -->

<!-- Subproject List - start -->
<% if @subprojects.any? %>
<h3><%=l(:label_subproject_plural)%>:</h3>
<li><%= @subprojects.collect{|p| link_to(h(p), :action => 'show', :id => p)}.join("</li><li>").html_safe %>
<% 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>
<% end %>
<% end %>
</ul>
</div>
<!-- Project Information - End -->
<!-- Subproject List - end -->

<!-- Tracker List - Start -->
<div class="splitcontentleft">
<!-- Tracker List - start -->
<div class="splitcontentright">
<% if User.current.allowed_to?(:view_issues, @project) %>
<div class="issues box">
<h3><%=l(:label_issue_tracking)%></h3>
<ul>
<% for tracker in @trackers %>
<li><%= link_to h(tracker.name), project_issues_path(@project, :set_filter => 1, :tracker_id => tracker.id) %>:
<li><%= link_to h(tracker.name), :controller => 'issues', :action => 'index', :project_id => @project,
:set_filter => 1,
"tracker_id" => tracker.id %>:
<%= l(:label_x_open_issues_abbr_on_total, :count => @open_issues_by_tracker[tracker].to_i,
:total => @total_issues_by_tracker[tracker].to_i) %>
</li>
<% end %>
</ul>
<p>
<%= link_to l(:label_issue_view_all), project_issues_path(@project, :set_filter => 1) %>
<%= link_to l(:label_issue_view_all), :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1 %>
<% if User.current.allowed_to?(:view_calendar, @project, :global => true) %>
| <%= link_to l(:label_calendar), project_calendar_path(@project) %>
| <%= link_to(l(:label_calendar), :controller => 'calendars', :action => 'show', :project_id => @project) %>
<% end %>
<% if User.current.allowed_to?(:view_gantt, @project, :global => true) %>
| <%= link_to l(:label_gantt), project_gantt_path(@project) %>
| <%= link_to(l(:label_gantt), :controller => 'gantts', :action => 'show', :project_id => @project) %>
<% end %>
</p>
</div>
<% end %>
<%= call_hook(:view_projects_show_left, :project => @project) %>
</div>
<!-- Tracker List - End -->
<!-- Tracker List - end -->

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

<% if @news.any? && authorize_for('news', 'index') %>
<div class="news box">
<h3><%=l(:label_news_latest)%></h3>
<%= render :partial => 'news/news', :collection => @news %>
<p><%= link_to l(:label_news_view_all), project_news_index_path(@project) %></p>
<p><%= link_to l(:label_news_view_all), :controller => 'news', :action => 'index', :project_id => @project %></p>
</div>
<% end %>
<%= call_hook(:view_projects_show_right, :project => @project) %>
</div>
<!-- Member List - End -->

<!-- Subproject List - Start -->
<div class="splitcontentright">
<div class="issues box">
<% unless @project.homepage.blank? %>
<li><span class="label"><%=l(:field_homepage)%>:</span> <%= link_to h(@project.homepage), @project.homepage %></li>
<% end %>
<% if @subprojects.any? %>
<h3><%=l(:label_subproject_plural)%>:</h3>
<br />
<ul>
<li>
<%= @subprojects.collect{|p| link_to p, project_path(p)}.join("</li><li>").html_safe %>
<% end %>
<% render_custom_field_values(@project) do |custom_field, formatted| %>
<li><span class="label"><%= custom_field.name %>:</span> <%= formatted %></li>
<% end %>
</ul>
</div>
</div>
<!-- Subproject List - End -->
<!-- Member List - end -->

<!-- Sidebar - start -->
<% content_for :sidebar do %>
<%= render :partial => 'projects/sidebar' %>
<% if @total_hours.present? %>
<h3><%= l(:label_spent_time) %></h3>
<p><span class="icon icon-time"><%= l_hours(@total_hours) %></span></p>
<p>
<% if User.current.allowed_to?(:log_time, @project) %>
<%= link_to l(:button_log_time), new_project_time_entry_path(@project) %> |
<% end %>
<%= link_to(l(:label_details), project_time_entries_path(@project)) %> |
<%= link_to(l(:label_report), report_project_time_entries_path(@project)) %></p>
<% end %>
<%= call_hook(:view_projects_show_sidebar_bottom, :project => @project) %>
<% end %>
<!-- Sidebar - end -->

<% content_for :header_tags do %>
<%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :id => @project, :format => 'atom', :key => User.current.rss_key}) %>
<% end %>

<% html_title(l(:label_overview)) -%>

Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<!-- show_3.x -->
<div class="contextual">
<% if User.current.allowed_to?(:add_subprojects, @project) %>
<%= link_to l(:label_subproject_new), new_project_path(:parent_id => @project), :class => 'icon icon-add' %>
Expand All @@ -11,6 +12,7 @@
<% end %>
</div>

<!-- Project Overview - start -->
<h2><%=l(:label_overview)%></h2>

<% unless @project.active? %>
Expand All @@ -23,28 +25,27 @@
<%= textilizable @project.description %>
</div>
<% end %>
</div>
<div class="splitcontentright">
<div class="issues box">
<!--<ul>-->
<ul>
<% unless @project.homepage.blank? %>
<li><span class="label"><%=l(:field_homepage)%>:</span> <%= link_to h(@project.homepage), @project.homepage %></li>
<li><%=l(:field_homepage)%>: <%= link_to h(@project.homepage), @project.homepage %></li>
<% end %>
<!-- Project Overview - end -->

<!-- Subproject List - start -->
<% if @subprojects.any? %>
<span class="label"><%=l(:label_subproject_plural)%>:</span>
<br />
<ul>
<li>
<%= @subprojects.collect{|p| link_to p, project_path(p)}.join("</li><li>").html_safe %>
<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 %>
<% render_custom_field_values(@project) do |custom_field, formatted| %>
<li><span class="label"><%= custom_field.name %>:</span> <%= formatted %></li>
<% end %>
</ul>
</div>
</div>
<div class="splitcontentleft">
<% if User.current.allowed_to?(:view_issues, @project) %>
<!-- Subproject List - end -->

<!-- Tracker List - start -->
<div class="splitcontentright">
<% if User.current.allowed_to?(:view_issues, @project) %>
<div class="issues box">
<h3><%=l(:label_issue_tracking)%></h3>
<ul>
Expand All @@ -67,9 +68,10 @@
</div>
<% end %>
<%= call_hook(:view_projects_show_left, :project => @project) %>
</div>
<!-- Tracker List - end -->

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

<% if @news.any? && authorize_for('news', 'index') %>
Expand All @@ -81,13 +83,17 @@
<% end %>
<%= call_hook(:view_projects_show_right, :project => @project) %>
</div>
<!-- Member List - end -->

<!-- Sidebar - start -->
<% content_for :sidebar do %>
<%= render :partial => 'projects/sidebar' %>
<% end %>
<!-- Sidebar - end -->

<% content_for :header_tags do %>
<%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :id => @project, :format => 'atom', :key => User.current.rss_key}) %>
<% end %>

<% html_title(l(:label_overview)) -%>

Loading

0 comments on commit 4ea3148

Please sign in to comment.