jro_apps/redmine Commit - r71:ab88b2762221

gantt link added in left menu and removed from calendar view...

Jean-Philippe Lang -

r71:ab88b2762221

parent child

Context file:

r71:ab88b2762221

Collapse all files

app/views/layouts/base.rhtml +2 0

             <% unless @project.nil? || @project.id.nil? %> \
             <div id="menuProject" class="menu" onmouseover="menuMouseover(event)"> \
             <%= link_to l(:label_calendar), {:controller => 'projects', :action => 'calendar', :id => @project }, :class => "menuItem" %> \
+            <%= link_to l(:label_gantt), {:controller => 'projects', :action => 'gantt', :id => @project }, :class => "menuItem" %> \
             <%= link_to l(:label_issue_plural), {:controller => 'projects', :action => 'list_issues', :id => @project }, :class => "menuItem" %> \
             <%= link_to l(:label_report_plural), {:controller => 'reports', :action => 'issue_report', :id => @project }, :class => "menuItem" %> \
             <%= link_to l(:label_activity), {:controller => 'projects', :action => 'activity', :id => @project }, :class => "menuItem" %> \
             			<ul class="menublock">
             				<li><%= link_to l(:label_overview), :controller => 'projects', :action => 'show', :id => @project %></li>
             				<li><%= link_to l(:label_calendar), :controller => 'projects', :action => 'calendar', :id => @project %></li>
+            				<li><%= link_to l(:label_gantt), :controller => 'projects', :action => 'gantt', :id => @project %></li>
             				<li><%= link_to l(:label_issue_plural), :controller => 'projects', :action => 'list_issues', :id => @project %></li>
             				<li><%= link_to l(:label_report_plural), :controller => 'reports', :action => 'issue_report', :id => @project %></li>
             				<li><%= link_to l(:label_activity), :controller => 'projects', :action => 'activity', :id => @project %></li>

app/views/projects/calendar.rhtml +17 -26

@@ -2,16 +2,24
2		2
3	<table width="100%">	3	<table width="100%">
4	<tr>	4	<tr>
5	<td align="left">	5	<td align="left" width="150">
6	<%= start_form_tag :action => 'calendar', :id => @project %>	6	<%= link_to_remote ('« ' + (@month==1 ? "#{month_name(12)} #{@year-1}" : "#{month_name(@month-1)}")),
7	<%= select_month(@month, :prefix => "month", :discard_type => true) %>	7	{:update => "content", :url => { :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1) }},
8	<%= select_year(@year, :prefix => "year", :discard_type => true) %>	8	{:href => url_for(:action => 'calendar', :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1))}
9	<%= submit_tag l(:button_submit), :class => "button-small" %>	9	%>
10	<%= end_form_tag %>
11	</td>	10	</td>
12	<td align="r~~ight~~">	11	<td align="center">
13	<%= image_tag 'gantt' %>	12	<%= start_form_tag :action => 'calendar', :id => @project %>
14	<%= link_to l(:label_gantt_chart), :action => 'gantt', :id => @project %>	13	<%= select_month(@month, :prefix => "month", :discard_type => true) %>
		14	<%= select_year(@year, :prefix => "year", :discard_type => true) %>
		15	<%= submit_tag l(:button_submit), :class => "button-small" %>
		16	<%= end_form_tag %>
		17	</td>
		18	<td align="right" width="150">
		19	<%= link_to_remote ((@month==12 ? "#{month_name(1)} #{@year+1}" : "#{month_name(@month+1)}") + ' »'),
		20	{:update => "content", :url => { :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1) }},
		21	{:href => url_for(:action => 'calendar', :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1))}
		22	%>
15	</td>	23	</td>
16	</tr>	24	</tr>
17	</table>	25	</table>
@@ -52,23 +60,6 end %>
52	</tr>	60	</tr>
53	</table>	61	</table>
54		62
55	<table width="100%">
56	<tr>
57	<td align="left">
58	<%= link_to_remote ('« ' + (@month==1 ? "#{month_name(12)} #{@year-1}" : "#{month_name(@month-1)}")),
59	{:update => "content", :url => { :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1) }},
60	{:href => url_for(:action => 'calendar', :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1))}
61	%>
62	</td>
63	<td align="right">
64	<%= link_to_remote ((@month==12 ? "#{month_name(1)} #{@year+1}" : "#{month_name(@month+1)}") + ' »'),
65	{:update => "content", :url => { :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1) }},
66	{:href => url_for(:action => 'calendar', :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1))}
67	%>
68
69	</td>
70	</tr>
71	</table>
72	<br />	63	<br />
73	<%= image_tag 'arrow_from' %>  <%= l(:text_tip_task_begin_day) %><br />	64	<%= image_tag 'arrow_from' %>  <%= l(:text_tip_task_begin_day) %><br />
74	<%= image_tag 'arrow_to' %>  <%= l(:text_tip_task_end_day) %><br />	65	<%= image_tag 'arrow_to' %>  <%= l(:text_tip_task_end_day) %><br />

app/views/projects/gantt.rhtml +1 -1

-            <h2><%= l(:label_gantt_chart) %></h2>
+            <h2><%= l(:label_gantt) %></h2>
             <div class="topright">
             <small>
             <%= l(:label_export_to) %>&nbsp;&nbsp;<%= link_to 'PDF', :zoom => @zoom, :year => @year_from, :month => @month_from, :months => @months, :output => 'pdf' %>

lang/de.yml +1 -1

             label_per_page: Pro Seite
             label_calendar: Kalender
             label_months_from: Monate von
-            label_gantt_chart: Gantt Diagramm
+            label_gantt: Gantt
             label_internal: Intern
             label_last_changes: %d änderungen des Letzten
             label_change_view_all: Alle änderungen ansehen

lang/en.yml +1 -1

             label_per_page: Per page
             label_calendar: Calendar
             label_months_from: months from
-            label_gantt_chart: Gantt chart
+            label_gantt: Gantt
             label_internal: Internal
             label_last_changes: last %d changes
             label_change_view_all: View all changes

lang/es.yml +1 -1

             label_per_page: Por la página
             label_calendar: Calendario
             label_months_from: meses de
-            label_gantt_chart: Diagrama de Gantt
+            label_gantt: Gantt
             label_internal: Interno
             label_last_changes: %d cambios del último
             label_change_view_all: Ver todos los cambios

lang/fr.yml +1 -1

             label_per_page: Par page
             label_calendar: Calendrier
             label_months_from: mois depuis
-            label_gantt_chart: Diagramme de Gantt
+            label_gantt: Gantt
             label_internal: Interne
             label_last_changes: %d derniers changements
             label_change_view_all: Voir tous les changements

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages