7 files changed, 24 insertions, 31 deletions
diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index 951fa88f7..4d036ef8a 100644
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -38,6 +38,7 @@ var menu_contenu=' \
 <% 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" %> \
@@ -103,6 +104,7 @@ var menu_contenu=' \
 			<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>
diff --git a/app/views/projects/calendar.rhtml b/app/views/projects/calendar.rhtml
index 22fcfa021..2781f98c9 100644
--- a/app/views/projects/calendar.rhtml
+++ b/app/views/projects/calendar.rhtml
@@ -2,16 +2,24 @@
 
 <table width="100%">
 <tr>
-<td align="left">
-<%= start_form_tag :action => 'calendar', :id => @project %>
-<%= select_month(@month, :prefix => "month", :discard_type => true) %>
-<%= select_year(@year, :prefix => "year", :discard_type => true) %>
-<%= submit_tag l(:button_submit), :class => "button-small" %>
-<%= end_form_tag %>
+<td align="left" width="150">
+    <%= link_to_remote ('&#171; ' + (@month==1 ? "#{month_name(12)} #{@year-1}" : "#{month_name(@month-1)}")), 
+                        {:update => "content", :url => { :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1) }},
+                        {:href => url_for(:action => 'calendar', :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1))}
+                        %>
 </td>
-<td align="right">
-<%= image_tag 'gantt' %>
-<%= link_to l(:label_gantt_chart), :action => 'gantt', :id => @project %>&nbsp;
+<td align="center">
+    <%= start_form_tag :action => 'calendar', :id => @project %>
+    <%= select_month(@month, :prefix => "month", :discard_type => true) %>
+    <%= select_year(@year, :prefix => "year", :discard_type => true) %>
+    <%= submit_tag l(:button_submit), :class => "button-small" %>
+    <%= end_form_tag %>
+</td>
+<td align="right" width="150">
+    <%= link_to_remote ((@month==12 ? "#{month_name(1)} #{@year+1}" : "#{month_name(@month+1)}") + ' &#187;'), 
+                        {:update => "content", :url => { :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1) }},
+                        {:href => url_for(:action => 'calendar', :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1))}
+                        %>&nbsp;
 </td>
 </tr>
 </table>
@@ -52,23 +60,6 @@ end %>
 </tr>
 </table>
 
-<table width="100%">
-<tr>
-<td align="left">
-<%= link_to_remote ('&#171; ' + (@month==1 ? "#{month_name(12)} #{@year-1}" : "#{month_name(@month-1)}")), 
-                    {:update => "content", :url => { :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1) }},
-                    {:href => url_for(:action => 'calendar', :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1))}
-                    %>
-</td>
-<td align="right">
-<%= link_to_remote ((@month==12 ? "#{month_name(1)} #{@year+1}" : "#{month_name(@month+1)}") + ' &#187;'), 
-                    {:update => "content", :url => { :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1) }},
-                    {:href => url_for(:action => 'calendar', :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1))}
-                    %>
-&nbsp;
-</td>
-</tr>
-</table>
 <br />
 <%= image_tag 'arrow_from' %>&nbsp;&nbsp;<%= l(:text_tip_task_begin_day) %><br />
 <%= image_tag 'arrow_to' %>&nbsp;&nbsp;<%= l(:text_tip_task_end_day) %><br />
diff --git a/app/views/projects/gantt.rhtml b/app/views/projects/gantt.rhtml
index 78d3ac20a..b03675795 100644
--- a/app/views/projects/gantt.rhtml
+++ b/app/views/projects/gantt.rhtml
@@ -1,4 +1,4 @@
-<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' %>
diff --git a/lang/de.yml b/lang/de.yml
index 7eaa3d05a..3cff24ed3 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -254,7 +254,7 @@ label_add_note: Eine Anmerkung addieren
 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
diff --git a/lang/en.yml b/lang/en.yml
index a3aad0467..d64edea78 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -254,7 +254,7 @@ label_add_note: Add a note
 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
diff --git a/lang/es.yml b/lang/es.yml
index f87a31133..13894955c 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -254,7 +254,7 @@ label_add_note: Agregar una nota
 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
diff --git a/lang/fr.yml b/lang/fr.yml
index 8e7829b19..cdfabd7dd 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -255,7 +255,7 @@ label_add_note: Ajouter une note
 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