-
-
+
+
<%
#
# Tasks subjects
@@ -113,7 +83,7 @@ end %>
-
+
<%
#
# Months headers
@@ -124,7 +94,7 @@ height = (show_weeks ? header_heigth : header_heigth + g_height)
@months.times do
width = ((month_f >> 1) - month_f) * zoom - 1
%>
-
+
<%= link_to "#{month_f.year}-#{month_f.month}", { :year => month_f.year, :month => month_f.month, :zoom => @zoom, :months => @months }, :title => "#{month_name(month_f.month)} #{month_f.year}"%>
<%
@@ -147,7 +117,7 @@ if show_weeks
week_f = @date_from + (7 - @date_from.cwday + 1)
width = (7 - @date_from.cwday + 1) * zoom-1
%>
-
+
<%
left = left + width+1
end %>
@@ -155,7 +125,7 @@ if show_weeks
while week_f <= @date_to
width = (week_f + 6 <= @date_to) ? 7 * zoom -1 : (@date_to - week_f + 1) * zoom-1
%>
-
+
<%= week_f.cweek if width >= 16 %>
<%
@@ -175,7 +145,7 @@ if show_days
(@date_to - @date_from + 1).to_i.times do
width = zoom - 1
%>
-
5 %>" class="m_bg">
+
5 %>" class="gantt_hdr">
<%= day_name(wday)[0,1] %>
<%
@@ -236,7 +206,6 @@ end %>
<%= link_to ('« ' + l(:label_previous)), :year => (@date_from << @months).year, :month => (@date_from << @months).month, :zoom => @zoom, :months => @months %>
-
<%= link_to (l(:label_next) + ' »'), :year => (@date_from >> @months).year, :month => (@date_from >> @months).month, :zoom => @zoom, :months => @months %>
\ No newline at end of file
diff --git a/app/views/projects/list.rhtml b/app/views/projects/list.rhtml
index 59580797..0723a708 100644
--- a/app/views/projects/list.rhtml
+++ b/app/views/projects/list.rhtml
@@ -9,9 +9,9 @@
<% for project in @projects %>
">
- <%= link_to project.name, :action => 'show', :id => project %>
- <%=h project.description %>
- <%= format_date(project.created_on) %>
+ <%= link_to project.name, :action => 'show', :id => project %>
+ <%=h project.description %>
+ <%= format_date(project.created_on) %>
<% end %>
diff --git a/app/views/projects/list_issues.rhtml b/app/views/projects/list_issues.rhtml
index 7ccc5961..e71a7b2d 100644
--- a/app/views/projects/list_issues.rhtml
+++ b/app/views/projects/list_issues.rhtml
@@ -57,7 +57,7 @@
<% for issue in @issues %>
">
- <%= check_box_tag "issue_ids[]", issue.id %>
+ <%= check_box_tag "issue_ids[]", issue.id, false, :id => "issue_#{issue.id}" %>
<%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %>
<%= issue.tracker.name %>
<%= issue.status.name %>
@@ -74,12 +74,11 @@
<%= link_to 'CSV', {:action => 'export_issues_csv', :id => @project}, :class => 'icon file' %>,
<%= link_to 'PDF', {:action => 'export_issues_pdf', :id => @project}, :class => 'pic picPdf' %>
-
-<%= submit_tag l(:button_move), :class => "button-small" %>
-<%= end_form_tag %>
+<%= submit_tag l(:button_move), :class => "button-small" %>
<%= pagination_links_full @issue_pages %>
[ <%= @issue_pages.current.first_item %> - <%= @issue_pages.current.last_item %> / <%= @issue_count %> ]
-
+
+<%= end_form_tag %>
<% end %>
<% end %>
\ No newline at end of file
diff --git a/app/views/projects/show.rhtml b/app/views/projects/show.rhtml
index 518ec38f..be5b67ab 100644
--- a/app/views/projects/show.rhtml
+++ b/app/views/projects/show.rhtml
@@ -27,7 +27,7 @@
<% end %>
- <%= link_to l(:label_issue_view_all), :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 %>
+ <%= link_to l(:label_issue_view_all), :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 %>
@@ -51,12 +51,6 @@
<%=l(:label_news_latest)%>
<%= render :partial => 'news/news', :collection => @news %>
-
<%= link_to l(:label_news_view_all), :controller => 'projects', :action => 'list_news', :id => @project %>
+
<%= link_to l(:label_news_view_all), :controller => 'projects', :action => 'list_news', :id => @project %>
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/app/views/queries/_filters.rhtml b/app/views/queries/_filters.rhtml
index 4cfce899..4c20d86f 100644
--- a/app/views/queries/_filters.rhtml
+++ b/app/views/queries/_filters.rhtml
@@ -1,5 +1,5 @@
-
<%= l(:label_filter_plural) %>
-
+
-
+
<% query.available_filters.sort{|a,b| a[1][:order]<=>b[1][:order]}.each do |filter| %>
<% field = filter[0]
options = filter[1] %>
id="tr_<%= field %>">
-
+
<%= check_box_tag 'fields[]', field, query.has_filter?(field), :onclick => "toggle_filter('#{field}');", :id => "cb_#{field}" %>
<%= l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) %>
-
- <%= select_tag "operators[#{field}]", options_for_select(operators_for_select(options[:type]), query.operator_for(field)), :onchange => "toggle_operator('#{field}');", :class => "select-small", :style => "vertical-align: top;" %>
+
+ <%= select_tag "operators[#{field}]", options_for_select(operators_for_select(options[:type]), query.operator_for(field)), :id => "operators_#{field}", :onchange => "toggle_operator('#{field}');", :class => "select-small", :style => "vertical-align: top;" %>
-
+
<% case options[:type]
when :list, :list_optional, :list_status %>
- 1 %>" name="values[<%= field %>][]" id="values[<%= field %>][]" class="select-small" style="vertical-align: top;">
+ 1 %> name="values[<%= field %>][]" id="values_<%= field %>" class="select-small" style="vertical-align: top;">
<%= options_for_select options[:values], query.values_for(field) %>
<%= link_to_function image_tag('expand'), "toggle_multi_select('#{field}');" %>
<% when :date, :date_past %>
- <%= text_field_tag "values[#{field}][]", query.values_for(field), :size => 3, :class => "select-small" %> <%= l(:label_day_plural) %>
+ <%= text_field_tag "values[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 3, :class => "select-small" %> <%= l(:label_day_plural) %>
<% when :text %>
- <%= text_field_tag "values[#{field}][]", query.values_for(field), :size => 30, :class => "select-small" %>
+ <%= text_field_tag "values[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 30, :class => "select-small" %>
<% end %>
+
-
<% end %>
diff --git a/app/views/reports/_details.rhtml b/app/views/reports/_details.rhtml
index 1d791e0c..e52538f7 100644
--- a/app/views/reports/_details.rhtml
+++ b/app/views/reports/_details.rhtml
@@ -4,13 +4,13 @@
<% col_width = 70 / (@statuses.length+3) %>
-
+
<% for status in @statuses %>
-
<%= status.name %>
+
<%= status.name %>
<% end %>
-<%=l(:label_open_issues_plural)%>
-<%=l(:label_closed_issues_plural)%>
-<%=l(:label_total)%>
+<%=l(:label_open_issues_plural)%>
+<%=l(:label_closed_issues_plural)%>
+<%=l(:label_total)%>
<% for row in rows %>
diff --git a/app/views/reports/_simple.rhtml b/app/views/reports/_simple.rhtml
index 24cbd9b7..1e66210f 100644
--- a/app/views/reports/_simple.rhtml
+++ b/app/views/reports/_simple.rhtml
@@ -3,10 +3,10 @@
<% else %>
-
-<%=l(:label_open_issues_plural)%>
-<%=l(:label_closed_issues_plural)%>
-<%=l(:label_total)%>
+
+<%=l(:label_open_issues_plural)%>
+<%=l(:label_closed_issues_plural)%>
+<%=l(:label_total)%>
<% for row in rows %>
diff --git a/app/views/repositories/_dir_list.rhtml b/app/views/repositories/_dir_list.rhtml
index 635fba52..7b80c5f1 100644
--- a/app/views/repositories/_dir_list.rhtml
+++ b/app/views/repositories/_dir_list.rhtml
@@ -20,4 +20,4 @@
end %>
-<%= l(:label_total) %>: <%= human_size(total_size) %>
\ No newline at end of file
+<%= l(:label_total) %>: <%= human_size(total_size) %>
\ No newline at end of file
diff --git a/app/views/repositories/browse.rhtml b/app/views/repositories/browse.rhtml
index 92ad8478..cdd4e688 100644
--- a/app/views/repositories/browse.rhtml
+++ b/app/views/repositories/browse.rhtml
@@ -1,11 +1,14 @@
-<%= stylesheet_link_tag "scm" %>
-
<%= start_form_tag %>
-<%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 5 %>
-<%= submit_tag 'OK' %>
+
<%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 5 %>
+<%= submit_tag 'OK' %>
+<%= end_form_tag %>
<%= render :partial => 'navigation', :locals => { :path => @path, :kind => 'dir', :revision => @rev } %>
-<%= render :partial => 'dir_list' %>
\ No newline at end of file
+<%= render :partial => 'dir_list' %>
+
+<% content_for :header_tags do %>
+<%= stylesheet_link_tag "scm" %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/repositories/diff.rhtml b/app/views/repositories/diff.rhtml
index d4350cb6..0060e786 100644
--- a/app/views/repositories/diff.rhtml
+++ b/app/views/repositories/diff.rhtml
@@ -1,7 +1,5 @@
<%= render :partial => 'navigation', :locals => { :path => @path, :kind => 'file', :revision => @rev } %>
-<%= stylesheet_link_tag "scm" %>
-
@<%= @rev %> @<%= @rev_to %>
@@ -52,4 +50,8 @@ line_num_r = 0 %>
<% end %>
-
\ No newline at end of file
+
+
+<% content_for :header_tags do %>
+<%= stylesheet_link_tag "scm" %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/repositories/revision.rhtml b/app/views/repositories/revision.rhtml
index 19e98082..f616a018 100644
--- a/app/views/repositories/revision.rhtml
+++ b/app/views/repositories/revision.rhtml
@@ -1,9 +1,8 @@
-<%= stylesheet_link_tag "scm" %>
-
<%= start_form_tag %>
-<%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 5 %>
-<%= submit_tag 'OK' %>
+
<%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 5 %>
+<%= submit_tag 'OK' %>
+<%= end_form_tag %>
<%= l(:label_revision) %> <%= @revision.identifier %>
@@ -32,4 +31,8 @@
<% end %>
-<%= lwr(:label_modification, @revision.paths.length) %>
\ No newline at end of file
+<%= lwr(:label_modification, @revision.paths.length) %>
+
+<% content_for :header_tags do %>
+<%= stylesheet_link_tag "scm" %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/repositories/revisions.rhtml b/app/views/repositories/revisions.rhtml
index 851c8585..6ab8df40 100644
--- a/app/views/repositories/revisions.rhtml
+++ b/app/views/repositories/revisions.rhtml
@@ -1,9 +1,8 @@
-<%= stylesheet_link_tag "scm" %>
-
<%= start_form_tag %>
-<%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 5 %>
-<%= submit_tag 'OK' %>
+
<%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 5 %>
+<%= submit_tag 'OK' %>
+<%= end_form_tag %>
<%= render :partial => 'navigation', :locals => { :path => @path, :kind => @entry.kind, :revision => @rev } %>
@@ -29,10 +28,14 @@
<%= link_to revision.identifier, :action => 'revision', :id => @project, :rev => revision.identifier %>
<%=h revision.author %>
<%= format_time(revision.time) %>
-<%= textilizable(revision.message) %>
+<%= textilizable(revision.message) %>
<%= link_to 'Diff', :action => 'diff', :id => @project, :path => @path, :rev => revision.identifier if @entry.is_file? && revision != @revisions.last %>
<% end %>
-<%= lwr(:label_modification, @revisions.length) %>
\ No newline at end of file
+<%= lwr(:label_modification, @revisions.length) %>
+
+<% content_for :header_tags do %>
+<%= stylesheet_link_tag "scm" %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/repositories/show.rhtml b/app/views/repositories/show.rhtml
index 4c95f884..9c2adc92 100644
--- a/app/views/repositories/show.rhtml
+++ b/app/views/repositories/show.rhtml
@@ -1,5 +1,3 @@
-<%= stylesheet_link_tag "scm" %>
-
<%= l(:label_repository) %>
<%= l(:label_revision_plural) %>
@@ -12,4 +10,8 @@
<%= l(:label_browse) %>
-<%= render :partial => 'dir_list' %>
\ No newline at end of file
+<%= render :partial => 'dir_list' %>
+
+<% content_for :header_tags do %>
+<%= stylesheet_link_tag "scm" %>
+<% end %>
\ No newline at end of file
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 2b1c5379..9663491c 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -505,6 +505,31 @@ font-size: 0.8em;
font-size: 1em;
}
+/***** Gantt chart *****/
+.gantt_hdr {
+ position:absolute;
+ top:0;
+ height:16px;
+ border-top: 1px solid #c0c0c0;
+ border-bottom: 1px solid #c0c0c0;
+ border-right: 1px solid #c0c0c0;
+ text-align: center;
+ overflow: hidden;
+}
+
+.task {
+ position: absolute;
+ height:8px;
+ font-size:0.8em;
+ color:#888;
+ background:#aaa;
+ padding:0;
+ margin:0;
+ line-height:0.8em;
+}
+
+.task_late { background:#f66; }
+.task_done { background:#66f; }
/***** CSS FORM ******/
.tabular p{