diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-03-12 17:59:02 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-03-12 17:59:02 +0000 |
commit | 027bf93849e82ef3c60e4a3024db49d65f0fb3c9 (patch) | |
tree | c6bc438fcd50370944b94f605b3f34fe54b73248 /app/views/my/blocks | |
parent | 071f8e18d02f789149071abb8e052bae7ad01003 (diff) | |
download | redmine-027bf93849e82ef3c60e4a3024db49d65f0fb3c9.tar.gz redmine-027bf93849e82ef3c60e4a3024db49d65f0fb3c9.zip |
added svn:eol-style native property on /app files
git-svn-id: http://redmine.rubyforge.org/svn/trunk@333 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/my/blocks')
-rw-r--r-- | app/views/my/blocks/_calendar.rhtml | 92 | ||||
-rw-r--r-- | app/views/my/blocks/_documents.rhtml | 14 | ||||
-rw-r--r-- | app/views/my/blocks/_issuesassignedtome.rhtml | 20 | ||||
-rw-r--r-- | app/views/my/blocks/_issuesreportedbyme.rhtml | 18 | ||||
-rw-r--r-- | app/views/my/blocks/_news.rhtml | 14 |
5 files changed, 79 insertions, 79 deletions
diff --git a/app/views/my/blocks/_calendar.rhtml b/app/views/my/blocks/_calendar.rhtml index dfff5b78a..4c583e496 100644 --- a/app/views/my/blocks/_calendar.rhtml +++ b/app/views/my/blocks/_calendar.rhtml @@ -1,47 +1,47 @@ -<h3><%= l(:label_calendar) %></h3>
-
-<%
-@date_from = Date.today - (Date.today.cwday-1)
-@date_to = Date.today + (7-Date.today.cwday)
-@issues = Issue.find :all,
- :conditions => ["issues.project_id in (#{@user.projects.collect{|m| m.id}.join(',')}) AND ((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?))", @date_from, @date_to, @date_from, @date_to],
- :include => [:project, :tracker] unless @user.projects.empty?
-@issues ||= []
-%>
-
-<table class="list with-cells">
-<thead><tr>
-<th></th>
-<% 1.upto(7) do |d| %>
- <th align="center" width="14%"><%= day_name(d) %></th>
-<% end %>
-</tr></thead>
-<tbdoy>
-<tr height="100">
-<% day = @date_from
-while day <= @date_to
- if day.cwday == 1 %>
- <th valign="middle"><%= 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>
- <% day_issues = []
- @issues.each { |i| day_issues << i if i.start_date == day or i.due_date == day }
- day_issues.each do |i| %>
- <%= if day == i.start_date and day == i.due_date
- image_tag('arrow_bw.png')
- elsif day == i.start_date
- image_tag('arrow_from.png')
- elsif day == i.due_date
- image_tag('arrow_to.png')
- end %>
- <small><%= link_to "#{i.tracker.name} ##{i.id}", :controller => 'issues', :action => 'show', :id => i %>: <%=h i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)') %></small><br />
- <% end %>
- </td>
- <%= '</tr><tr height="100">' if day.cwday >= 7 and day!=@date_to %>
- <%
- day = day + 1
-end %>
-</tr>
-</tbody>
+<h3><%= l(:label_calendar) %></h3> + +<% +@date_from = Date.today - (Date.today.cwday-1) +@date_to = Date.today + (7-Date.today.cwday) +@issues = Issue.find :all, + :conditions => ["issues.project_id in (#{@user.projects.collect{|m| m.id}.join(',')}) AND ((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?))", @date_from, @date_to, @date_from, @date_to], + :include => [:project, :tracker] unless @user.projects.empty? +@issues ||= [] +%> + +<table class="list with-cells"> +<thead><tr> +<th></th> +<% 1.upto(7) do |d| %> + <th align="center" width="14%"><%= day_name(d) %></th> +<% end %> +</tr></thead> +<tbdoy> +<tr height="100"> +<% day = @date_from +while day <= @date_to + if day.cwday == 1 %> + <th valign="middle"><%= 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> + <% day_issues = [] + @issues.each { |i| day_issues << i if i.start_date == day or i.due_date == day } + day_issues.each do |i| %> + <%= if day == i.start_date and day == i.due_date + image_tag('arrow_bw.png') + elsif day == i.start_date + image_tag('arrow_from.png') + elsif day == i.due_date + image_tag('arrow_to.png') + end %> + <small><%= link_to "#{i.tracker.name} ##{i.id}", :controller => 'issues', :action => 'show', :id => i %>: <%=h i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)') %></small><br /> + <% end %> + </td> + <%= '</tr><tr height="100">' if day.cwday >= 7 and day!=@date_to %> + <% + day = day + 1 +end %> +</tr> +</tbody> </table>
\ No newline at end of file diff --git a/app/views/my/blocks/_documents.rhtml b/app/views/my/blocks/_documents.rhtml index eb8c16a58..a1bb0b36c 100644 --- a/app/views/my/blocks/_documents.rhtml +++ b/app/views/my/blocks/_documents.rhtml @@ -1,8 +1,8 @@ -<h3><%=l(:label_document_plural)%></h3>
-
-<%= render(:partial => 'documents/document',
- :collection => Document.find(:all,
- :limit => 10,
- :order => 'documents.created_on DESC',
- :conditions => "documents.project_id in (#{@user.projects.collect{|m| m.id}.join(',')})",
+<h3><%=l(:label_document_plural)%></h3> + +<%= render(:partial => 'documents/document', + :collection => Document.find(:all, + :limit => 10, + :order => 'documents.created_on DESC', + :conditions => "documents.project_id in (#{@user.projects.collect{|m| m.id}.join(',')})", :include => [:project])) unless @user.projects.empty? %>
\ No newline at end of file diff --git a/app/views/my/blocks/_issuesassignedtome.rhtml b/app/views/my/blocks/_issuesassignedtome.rhtml index 2a4e2a05d..e52e0fad1 100644 --- a/app/views/my/blocks/_issuesassignedtome.rhtml +++ b/app/views/my/blocks/_issuesassignedtome.rhtml @@ -1,10 +1,10 @@ -<h3><%=l(:label_assigned_to_me_issues)%></h3>
-<% assigned_issues = Issue.find(:all,
- :conditions => ["assigned_to_id=?", user.id],
- :limit => 10,
- :include => [ :status, :project, :tracker ],
- :order => 'issues.updated_on DESC') %>
-<%= render :partial => 'issues/list_simple', :locals => { :issues => assigned_issues } %>
-<% if assigned_issues.length > 0 %>
-<p><%=lwr(:label_last_updates, assigned_issues.length)%></p>
-<% end %>
+<h3><%=l(:label_assigned_to_me_issues)%></h3> +<% assigned_issues = Issue.find(:all, + :conditions => ["assigned_to_id=?", user.id], + :limit => 10, + :include => [ :status, :project, :tracker ], + :order => 'issues.updated_on DESC') %> +<%= render :partial => 'issues/list_simple', :locals => { :issues => assigned_issues } %> +<% if assigned_issues.length > 0 %> +<p><%=lwr(:label_last_updates, assigned_issues.length)%></p> +<% end %> diff --git a/app/views/my/blocks/_issuesreportedbyme.rhtml b/app/views/my/blocks/_issuesreportedbyme.rhtml index 9b40b3606..4e173d3c5 100644 --- a/app/views/my/blocks/_issuesreportedbyme.rhtml +++ b/app/views/my/blocks/_issuesreportedbyme.rhtml @@ -1,10 +1,10 @@ -<h3><%=l(:label_reported_issues)%></h3>
-<% reported_issues = Issue.find(:all,
- :conditions => ["author_id=?", user.id],
- :limit => 10,
- :include => [ :status, :project, :tracker ],
- :order => 'issues.updated_on DESC') %>
-<%= render :partial => 'issues/list_simple', :locals => { :issues => reported_issues } %>
-<% if reported_issues.length > 0 %>
-<p><%=lwr(:label_last_updates, reported_issues.length)%></p>
+<h3><%=l(:label_reported_issues)%></h3> +<% reported_issues = Issue.find(:all, + :conditions => ["author_id=?", user.id], + :limit => 10, + :include => [ :status, :project, :tracker ], + :order => 'issues.updated_on DESC') %> +<%= render :partial => 'issues/list_simple', :locals => { :issues => reported_issues } %> +<% if reported_issues.length > 0 %> +<p><%=lwr(:label_last_updates, reported_issues.length)%></p> <% end %>
\ No newline at end of file diff --git a/app/views/my/blocks/_news.rhtml b/app/views/my/blocks/_news.rhtml index 4bad9a542..30085cf45 100644 --- a/app/views/my/blocks/_news.rhtml +++ b/app/views/my/blocks/_news.rhtml @@ -1,8 +1,8 @@ -<h3><%=l(:label_news_latest)%></h3>
-
-<%= render (:partial => 'news/news',
- :collection => News.find(:all,
- :limit => 10,
- :order => 'news.created_on DESC',
- :conditions => "news.project_id in (#{@user.projects.collect{|m| m.id}.join(',')})",
+<h3><%=l(:label_news_latest)%></h3> + +<%= render (:partial => 'news/news', + :collection => News.find(:all, + :limit => 10, + :order => 'news.created_on DESC', + :conditions => "news.project_id in (#{@user.projects.collect{|m| m.id}.join(',')})", :include => [:project, :author])) unless @user.projects.empty? %>
\ No newline at end of file |