diff options
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/activity.rhtml | 19 | ||||
| -rw-r--r-- | app/views/projects/calendar.rhtml | 18 | ||||
| -rw-r--r-- | app/views/projects/gantt.rhtml | 55 | ||||
| -rw-r--r-- | app/views/projects/list.rhtml | 6 | ||||
| -rw-r--r-- | app/views/projects/list_issues.rhtml | 9 | ||||
| -rw-r--r-- | app/views/projects/show.rhtml | 12 |
6 files changed, 42 insertions, 77 deletions
diff --git a/app/views/projects/activity.rhtml b/app/views/projects/activity.rhtml index 9a4a07aff..cb7a3bfe1 100644 --- a/app/views/projects/activity.rhtml +++ b/app/views/projects/activity.rhtml @@ -2,16 +2,19 @@ <div>
<div class="rightbox">
- <%= start_form_tag %>
+<%= start_form_tag %>
<p><%= select_month(@month, :prefix => "month", :discard_type => true) %>
<%= select_year(@year, :prefix => "year", :discard_type => true) %></p>
- <%= check_box_tag 'show_issues', 1, @show_issues %><%= hidden_field_tag 'show_issues', 0 %> <%=l(:label_issue_plural)%><br />
- <%= check_box_tag 'show_news', 1, @show_news %><%= hidden_field_tag 'show_news', 0 %> <%=l(:label_news_plural)%><br />
- <%= check_box_tag 'show_files', 1, @show_files %><%= hidden_field_tag 'show_files', 0 %> <%=l(:label_attachment_plural)%><br />
- <%= check_box_tag 'show_documents', 1, @show_documents %><%= hidden_field_tag 'show_documents', 0 %> <%=l(:label_document_plural)%><br />
- <p><center><%= submit_tag l(:button_apply), :class => 'button-small' %></center></p>
- <%= end_form_tag %>
- </div>
+<p>
+ <%= check_box_tag 'show_issues', 1, @show_issues %><%= hidden_field_tag 'show_issues', 0, :id => nil %> <%=l(:label_issue_plural)%><br />
+ <%= check_box_tag 'show_news', 1, @show_news %><%= hidden_field_tag 'show_news', 0, :id => nil %> <%=l(:label_news_plural)%><br />
+ <%= check_box_tag 'show_files', 1, @show_files %><%= hidden_field_tag 'show_files', 0, :id => nil %> <%=l(:label_attachment_plural)%><br />
+ <%= check_box_tag 'show_documents', 1, @show_documents %><%= hidden_field_tag 'show_documents', 0, :id => nil %> <%=l(:label_document_plural)%>
+</p>
+<p class="textcenter"><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
+<%= end_form_tag %>
+</div>
+
<% @events_by_day.keys.sort {|x,y| y <=> x }.each do |day| %>
<h3><%= day_name(day.cwday) %> <%= day.day %></h3>
<ul>
diff --git a/app/views/projects/calendar.rhtml b/app/views/projects/calendar.rhtml index ab26d0b84..8bd970fe6 100644 --- a/app/views/projects/calendar.rhtml +++ b/app/views/projects/calendar.rhtml @@ -1,21 +1,20 @@ <h2><%= l(:label_calendar) %></h2>
+ <%= start_form_tag :action => 'calendar', :id => @project %>
<table width="100%">
<tr>
-<td align="left" width="150">
+<td align="left" style="width:150px">
<%= link_to_remote ('« ' + (@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="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">
+<td align="right" style="width:150px">
<%= link_to_remote ((@month==12 ? "#{month_name(1)} #{@year+1}" : "#{month_name(@month+1)}") + ' »'),
{: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))}
@@ -23,6 +22,7 @@ </td>
</tr>
</table>
+ <%= end_form_tag %>
<br />
<table class="list with-cells">
@@ -30,19 +30,19 @@ <tr>
<th></th>
<% 1.upto(7) do |d| %>
- <th width="14%"><%= day_name(d) %></th>
+ <th style="width:14%"><%= day_name(d) %></th>
<% end %>
</tr>
</thead>
<tbody>
-<tr height="100">
+<tr style="height:100px">
<% day = @date_from
while day <= @date_to
if day.cwday == 1 %>
<th><%= day.cweek %></th>
<% end %>
- <td valign="top" width="14%" class="<%= day.month==@month ? "even" : "odd" %>">
- <p align="right"><%= day==Date.today ? "<b>#{day.day}</b>" : day.day %></p>
+ <td valign="top" style="width:14%" class="<%= day.month==@month ? "even" : "odd" %>">
+ <p class="textright"><%= day==Date.today ? "<b>#{day.day}</b>" : day.day %></p>
<% day_issues = []
@issues.each { |i| day_issues << i if i.start_date == day or i.due_date == day }
day_issues.each do |i| %>
@@ -56,7 +56,7 @@ while day <= @date_to <small><%= link_to "#{i.tracker.name} ##{i.id}", { :controller => 'issues', :action => 'show', :id => i }, :title => "#{i.subject}" %>: <%=h i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)') %></small><br />
<% end %>
</td>
- <%= '</tr><tr height="100">' if day.cwday >= 7 and day!=@date_to %>
+ <%= '</tr><tr style="height:100px">' if day.cwday >= 7 and day!=@date_to %>
<%
day = day + 1
end %>
diff --git a/app/views/projects/gantt.rhtml b/app/views/projects/gantt.rhtml index 6199107c5..33d87e6dc 100644 --- a/app/views/projects/gantt.rhtml +++ b/app/views/projects/gantt.rhtml @@ -9,12 +9,14 @@ <tr>
<td align="left">
<%= start_form_tag %>
-<input type="text" name="months" size="2" value="<%= @months %>">
+<p>
+<input type="text" name="months" size="2" value="<%= @months %>" />
<%= l(:label_months_from) %>
<%= select_month(@month_from, :prefix => "month", :discard_type => true) %>
<%= select_year(@year_from, :prefix => "year", :discard_type => true) %>
<%= hidden_field_tag 'zoom', @zoom %>
<%= submit_tag l(:button_submit), :class => "button-small" %>
+</p>
<%= end_form_tag %>
</td>
<td align="right">
@@ -33,38 +35,6 @@ </table>
<br />
-<style>
-.m_bg {
- 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;
-}
-</style>
-
<% zoom = 1
@zoom.times { zoom = zoom * 2 }
@@ -89,13 +59,13 @@ g_height = [(20 * @issues.length + 6), 206].max t_height = g_height + headers_heigth
%>
-<table width="100%" border=0 cellspacing=0 cellpading=0>
+<table width="100%" style="border:0; border-collapse: collapse;">
<tr>
-<td width=260>
+<td style="width:260px;">
<div style="position:relative;height:<%= t_height + 24 %>px;width:<%= subject_width + 1 %>px;">
-<div style="right:-2px;width:<%= subject_width %>px;height:<%= headers_heigth %>px;background: #eee;" class="m_bg"></div>
-<div style="right:-2px;width:<%= subject_width %>px;height:<%= t_height %>px;border-left: 1px solid #c0c0c0;" class="m_bg"></div>
+<div style="right:-2px;width:<%= subject_width %>px;height:<%= headers_heigth %>px;background: #eee;" class="gantt_hdr"></div>
+<div style="right:-2px;width:<%= subject_width %>px;height:<%= t_height %>px;border-left: 1px solid #c0c0c0;" class="gantt_hdr"></div>
<%
#
# Tasks subjects
@@ -113,7 +83,7 @@ end %> <td>
<div style="position:relative;height:<%= t_height + 24 %>px;width:<%= subject_width %>;overflow:auto;">
-<div style="width:<%= g_width-1 %>px;height:<%= headers_heigth %>px;background: #eee;" class="m_bg"> </div>
+<div style="width:<%= g_width-1 %>px;height:<%= headers_heigth %>px;background: #eee;" class="gantt_hdr"> </div>
<%
#
# 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
%>
- <div style="left:<%= left %>px;width:<%= width %>px;height:<%= height %>px;" class="m_bg">
+ <div style="left:<%= left %>px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
<%= 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}"%>
</div>
<%
@@ -147,7 +117,7 @@ if show_weeks week_f = @date_from + (7 - @date_from.cwday + 1)
width = (7 - @date_from.cwday + 1) * zoom-1
%>
- <div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="m_bg"> </div>
+ <div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr"> </div>
<%
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
%>
- <div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="m_bg">
+ <div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
<small><%= week_f.cweek if width >= 16 %></small>
</div>
<%
@@ -175,7 +145,7 @@ if show_days (@date_to - @date_from + 1).to_i.times do
width = zoom - 1
%>
- <div style="left:<%= left %>px;top:37px;width:<%= width %>px;height:<%= height %>px;font-size:0.7em;<%= "background:#f1f1f1;" if wday > 5 %>" class="m_bg">
+ <div style="left:<%= left %>px;top:37px;width:<%= width %>px;height:<%= height %>px;font-size:0.7em;<%= "background:#f1f1f1;" if wday > 5 %>" class="gantt_hdr">
<%= day_name(wday)[0,1] %>
</div>
<%
@@ -236,7 +206,6 @@ end %> <table width="100%">
<tr>
<td align="left"><%= link_to ('« ' + l(:label_previous)), :year => (@date_from << @months).year, :month => (@date_from << @months).month, :zoom => @zoom, :months => @months %></td>
-<td>
<td align="right"><%= link_to (l(:label_next) + ' »'), :year => (@date_from >> @months).year, :month => (@date_from >> @months).month, :zoom => @zoom, :months => @months %></td>
</tr>
</table>
\ No newline at end of file diff --git a/app/views/projects/list.rhtml b/app/views/projects/list.rhtml index 59580797d..0723a7081 100644 --- a/app/views/projects/list.rhtml +++ b/app/views/projects/list.rhtml @@ -9,9 +9,9 @@ <tbody> <% for project in @projects %> <tr class="<%= cycle("odd", "even") %>">
- <td><%= link_to project.name, :action => 'show', :id => project %>
- <td><%=h project.description %>
- <td align="center"><%= format_date(project.created_on) %>
+ <td><%= link_to project.name, :action => 'show', :id => project %></td>
+ <td><%=h project.description %></td>
+ <td align="center"><%= format_date(project.created_on) %></td>
</tr> <% end %> </tbody> diff --git a/app/views/projects/list_issues.rhtml b/app/views/projects/list_issues.rhtml index 7ccc59611..e71a7b2d3 100644 --- a/app/views/projects/list_issues.rhtml +++ b/app/views/projects/list_issues.rhtml @@ -57,7 +57,7 @@ <tbody>
<% for issue in @issues %> <tr class="<%= cycle("odd", "even") %>">
- <th width="15"><%= check_box_tag "issue_ids[]", issue.id %></th>
+ <th style="width:15px;"><%= check_box_tag "issue_ids[]", issue.id, false, :id => "issue_#{issue.id}" %></th>
<td align="center"><%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %></td>
<td align="center"><%= issue.tracker.name %></td>
<td><div class="square" style="background:#<%= issue.status.html_color %>;"></div> <%= issue.status.name %></td>
@@ -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' %>
</div>
-
-<%= submit_tag l(:button_move), :class => "button-small" %>
-<%= end_form_tag %>
+<p><%= 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 %> ]
-
+</p>
+<%= 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 518ec38ff..be5b67abb 100644 --- a/app/views/projects/show.rhtml +++ b/app/views/projects/show.rhtml @@ -27,7 +27,7 @@ </li>
<% end %>
</ul>
- <center><small><%= link_to l(:label_issue_view_all), :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 %></small></center>
+ <p class="textcenter"><small><%= link_to l(:label_issue_view_all), :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 %></small></p>
</div> </div>
@@ -51,12 +51,6 @@ <div class="box">
<h3><%=l(:label_news_latest)%></h3>
<%= render :partial => 'news/news', :collection => @news %> - <center><small><%= link_to l(:label_news_view_all), :controller => 'projects', :action => 'list_news', :id => @project %></small></center>
+ <p class="textcenter"><small><%= link_to l(:label_news_view_all), :controller => 'projects', :action => 'list_news', :id => @project %></small></p>
</div>
-</div>
-
-
-
- -
-
+</div>
\ No newline at end of file |