Skip to content

O
OHR Support
Commit ab88b276 authored by Jean-Philippe Lang's avatar Jean-Philippe Lang
Browse files
Options

gantt link added in left menu and removed from calendar view 

git-svn-id: http://redmine.rubyforge.org/svn/trunk@73 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 2c335dbf
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 31 deletions
app/views/layouts/base.rhtml
View file @ ab88b276
......@@ -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>
......
app/views/projects/calendar.rhtml
View file @ ab88b276
......@@ -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 />
......
app/views/projects/gantt.rhtml
View file @ ab88b276
<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
View file @ ab88b276
......@@ -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
......
lang/en.yml
View file @ ab88b276
......@@ -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
......
lang/es.yml
View file @ ab88b276
......@@ -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
......
lang/fr.yml
View file @ ab88b276
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment