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/issues | |
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/issues')
-rw-r--r-- | app/views/issues/_add_shortcut.rhtml | 10 | ||||
-rw-r--r-- | app/views/issues/_history.rhtml | 22 | ||||
-rw-r--r-- | app/views/issues/_list_simple.rhtml | 38 | ||||
-rw-r--r-- | app/views/issues/_tooltip.rhtml | 12 | ||||
-rw-r--r-- | app/views/issues/change_status.rhtml | 36 | ||||
-rw-r--r-- | app/views/issues/history.rhtml | 10 | ||||
-rw-r--r-- | app/views/issues/show.rhtml | 216 |
7 files changed, 172 insertions, 172 deletions
diff --git a/app/views/issues/_add_shortcut.rhtml b/app/views/issues/_add_shortcut.rhtml index 7cd3114c6..c6a5a4667 100644 --- a/app/views/issues/_add_shortcut.rhtml +++ b/app/views/issues/_add_shortcut.rhtml @@ -1,5 +1,5 @@ -<% if authorize_for('projects', 'add_issue') %>
-<% form_tag({ :controller => 'projects', :action => 'add_issue', :id => @project }, :method => 'get') do %>
-<%= l(:label_issue_new) %>: <%= select_tag 'tracker_id', ("<option></option>" + options_from_collection_for_select(trackers, 'id', 'name')), :onchange => "if (this.value!='') {this.form.submit();}" %>
-<% end %>
-<% end %>
+<% if authorize_for('projects', 'add_issue') %> +<% form_tag({ :controller => 'projects', :action => 'add_issue', :id => @project }, :method => 'get') do %> +<%= l(:label_issue_new) %>: <%= select_tag 'tracker_id', ("<option></option>" + options_from_collection_for_select(trackers, 'id', 'name')), :onchange => "if (this.value!='') {this.form.submit();}" %> +<% end %> +<% end %> diff --git a/app/views/issues/_history.rhtml b/app/views/issues/_history.rhtml index 37faf977b..cc02eee4e 100644 --- a/app/views/issues/_history.rhtml +++ b/app/views/issues/_history.rhtml @@ -1,11 +1,11 @@ -<% for journal in journals %>
- <h4><%= format_time(journal.created_on) %> - <%= journal.user.name %></h4>
- <ul>
- <% for detail in journal.details %>
- <li><%= show_detail(detail) %></li>
- <% end %>
- </ul>
- <% if journal.notes? %>
- <%= textilizable journal.notes %>
- <% end %>
-<% end %>
+<% for journal in journals %> + <h4><%= format_time(journal.created_on) %> - <%= journal.user.name %></h4> + <ul> + <% for detail in journal.details %> + <li><%= show_detail(detail) %></li> + <% end %> + </ul> + <% if journal.notes? %> + <%= textilizable journal.notes %> + <% end %> +<% end %> diff --git a/app/views/issues/_list_simple.rhtml b/app/views/issues/_list_simple.rhtml index 10d880f43..0e3c39bbf 100644 --- a/app/views/issues/_list_simple.rhtml +++ b/app/views/issues/_list_simple.rhtml @@ -1,25 +1,25 @@ -<% if issues.length > 0 %>
- <table class="list">
- <thead><tr>
- <th>#</th>
- <th><%=l(:field_tracker)%></th>
- <th><%=l(:field_subject)%></th>
- </tr></thead>
- <tbody>
+<% if issues.length > 0 %> + <table class="list"> + <thead><tr> + <th>#</th> + <th><%=l(:field_tracker)%></th> + <th><%=l(:field_subject)%></th> + </tr></thead> + <tbody> <% for issue in issues %> - <tr class="<%= cycle("odd", "even") %>">
- <th align="center">
- <%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %>
- </th>
+ <tr class="<%= cycle("odd", "even") %>"> + <th align="center"> + <%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %> + </th> <td><p class="small"><%= issue.project.name %> - <%= issue.tracker.name %><br /> - <%= issue.status.name %> - <%= format_time(issue.updated_on) %></p></td>
- <td>
- <p class="small"><%= link_to h(issue.subject), :controller => 'issues', :action => 'show', :id => issue %></p>
+ <%= issue.status.name %> - <%= format_time(issue.updated_on) %></p></td> + <td> + <p class="small"><%= link_to h(issue.subject), :controller => 'issues', :action => 'show', :id => issue %></p> </td> </tr> - <% end %>
+ <% end %> </tbody> - </table>
-<% else %>
- <i><%=l(:label_no_data)%></i>
+ </table> +<% else %> + <i><%=l(:label_no_data)%></i> <% end %>
\ No newline at end of file diff --git a/app/views/issues/_tooltip.rhtml b/app/views/issues/_tooltip.rhtml index d7b555e4a..d186322c6 100644 --- a/app/views/issues/_tooltip.rhtml +++ b/app/views/issues/_tooltip.rhtml @@ -1,6 +1,6 @@ -<%= link_to "#{issue.tracker.name} ##{issue.id}", { :controller => 'issues', :action => 'show', :id => issue } %></strong>: <%=h issue.subject %><br />
-<br />
-<strong><%= l(:field_start_date) %></strong>: <%= format_date(issue.start_date) %><br />
-<strong><%= l(:field_due_date) %></strong>: <%= format_date(issue.due_date) %><br />
-<strong><%= l(:field_assigned_to) %></strong>: <%= issue.assigned_to ? issue.assigned_to.name : "-" %><br />
-<strong><%= l(:field_priority) %></strong>: <%= issue.priority.name %>
+<%= link_to "#{issue.tracker.name} ##{issue.id}", { :controller => 'issues', :action => 'show', :id => issue } %></strong>: <%=h issue.subject %><br /> +<br /> +<strong><%= l(:field_start_date) %></strong>: <%= format_date(issue.start_date) %><br /> +<strong><%= l(:field_due_date) %></strong>: <%= format_date(issue.due_date) %><br /> +<strong><%= l(:field_assigned_to) %></strong>: <%= issue.assigned_to ? issue.assigned_to.name : "-" %><br /> +<strong><%= l(:field_priority) %></strong>: <%= issue.priority.name %> diff --git a/app/views/issues/change_status.rhtml b/app/views/issues/change_status.rhtml index 377e0da2e..61e2fad29 100644 --- a/app/views/issues/change_status.rhtml +++ b/app/views/issues/change_status.rhtml @@ -1,37 +1,37 @@ <h2><%=l(:label_issue)%> #<%= @issue.id %>: <%=h @issue.subject %></h2> -
-<%= error_messages_for 'issue' %>
-<% form_tag({:action => 'change_status', :id => @issue}, :class => "tabular") do %>
-
-<%= hidden_field_tag 'confirm', 1 %>
+ +<%= error_messages_for 'issue' %> +<% form_tag({:action => 'change_status', :id => @issue}, :class => "tabular") do %> + +<%= hidden_field_tag 'confirm', 1 %> <%= hidden_field_tag 'new_status_id', @new_status.id %> -<div class="box">
-<p><label><%=l(:label_issue_status_new)%></label> <%= @new_status.name %></p>
-
+<div class="box"> +<p><label><%=l(:label_issue_status_new)%></label> <%= @new_status.name %></p> + <p><label for="issue_assigned_to_id"><%=l(:field_assigned_to)%></label> -<select name="issue[assigned_to_id]">
-<option value=""></option>
+<select name="issue[assigned_to_id]"> +<option value=""></option> <%= options_from_collection_for_select @assignable_to, "id", "display_name", @issue.assigned_to_id %></p> -</select></p>
+</select></p> <p><label for="issue_done_ratio"><%=l(:field_done_ratio)%></label> <%= select("issue", "done_ratio", ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) ) %> </select></p> -
+ <p><label for="issue_fixed_version"><%=l(:field_fixed_version)%></label> -<select name="issue[fixed_version_id]">
-<option value="">--none--</option>
-<%= options_from_collection_for_select @issue.project.versions, "id", "name", @issue.fixed_version_id %>
+<select name="issue[fixed_version_id]"> +<option value="">--none--</option> +<%= options_from_collection_for_select @issue.project.versions, "id", "name", @issue.fixed_version_id %> </select></p> <p><label for="notes"><%= l(:field_notes) %></label> <%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit' %></p> </div> -
+ <%= hidden_field 'issue', 'lock_version' %> -<%= submit_tag l(:button_save) %>
-<% end %>
+<%= submit_tag l(:button_save) %> +<% end %> diff --git a/app/views/issues/history.rhtml b/app/views/issues/history.rhtml index 2443cc739..830e1fc8e 100644 --- a/app/views/issues/history.rhtml +++ b/app/views/issues/history.rhtml @@ -1,6 +1,6 @@ -<h3><%=l(:label_history)%></h3>
-<div id="history">
-<%= render :partial => 'history', :locals => { :journals => @journals } %>
-</div>
-<br />
+<h3><%=l(:label_history)%></h3> +<div id="history"> +<%= render :partial => 'history', :locals => { :journals => @journals } %> +</div> +<br /> <p><%= link_to l(:button_back), :action => 'show', :id => @issue %></p>
\ No newline at end of file diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml index 442c30abe..43e959c1b 100644 --- a/app/views/issues/show.rhtml +++ b/app/views/issues/show.rhtml @@ -1,111 +1,111 @@ -<div class="contextual">
-<%= l(:label_export_to) %><%= link_to 'PDF', {:action => 'export_pdf', :id => @issue}, :class => 'icon icon-pdf' %>
-</div>
-
-<h2><%= @issue.tracker.name %> #<%= @issue.id %> - <%=h @issue.subject %></h2>
+<div class="contextual"> +<%= l(:label_export_to) %><%= link_to 'PDF', {:action => 'export_pdf', :id => @issue}, :class => 'icon icon-pdf' %> +</div> -<div class="box">
-<table width="100%">
-<tr>
- <td style="width:15%"><b><%=l(:field_status)%> :</b></td><td style="width:35%"><%= @issue.status.name %></td>
- <td style="width:15%"><b><%=l(:field_priority)%> :</b></td><td style="width:35%"><%= @issue.priority.name %></td>
-</tr>
-<tr>
- <td><b><%=l(:field_assigned_to)%> :</b></td><td><%= @issue.assigned_to ? @issue.assigned_to.name : "-" %></td>
- <td><b><%=l(:field_category)%> :</b></td><td><%=h @issue.category ? @issue.category.name : "-" %></td>
-</tr>
-<tr>
- <td><b><%=l(:field_author)%> :</b></td><td><%= link_to_user @issue.author %></td>
- <td><b><%=l(:field_start_date)%> :</b></td><td><%= format_date(@issue.start_date) %></td>
-</tr>
-<tr>
- <td><b><%=l(:field_created_on)%> :</b></td><td><%= format_date(@issue.created_on) %></td>
- <td><b><%=l(:field_due_date)%> :</b></td><td><%= format_date(@issue.due_date) %></td>
-</tr>
-<tr>
- <td><b><%=l(:field_updated_on)%> :</b></td><td><%= format_date(@issue.updated_on) %></td>
- <td><b><%=l(:field_done_ratio)%> :</b></td><td><%= @issue.done_ratio %> %</td>
-</tr>
-<tr>
- <td><b><%=l(:field_fixed_version)%> :</b></td><td><%= @issue.fixed_version ? @issue.fixed_version.name : "-" %></td>
- <td></td><td></td>
-</tr>
-<tr>
-<% n = 0
-for custom_value in @custom_values %>
- <td><b><%= custom_value.custom_field.name %> :</b></td><td><%=h show_value custom_value %></td>
-<% n = n + 1
- if (n > 1)
- n = 0 %>
- </tr><tr>
- <%end
-end %>
-</tr>
-</table>
-<hr />
-<br />
-
-<b><%=l(:field_description)%> :</b><br /><br />
-<%= textilizable @issue.description %>
-<br />
-
-<div class="contextual">
-<%= link_to_if_authorized l(:button_edit), {:controller => 'issues', :action => 'edit', :id => @issue}, :class => 'icon icon-edit' %>
-<%= link_to_if_authorized l(:button_move), {:controller => 'projects', :action => 'move_issues', :id => @project, "issue_ids[]" => @issue.id }, :class => 'icon icon-move' %>
-<%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
-</div>
-
-<% if authorize_for('issues', 'change_status') and @status_options and !@status_options.empty? %>
- <% form_tag ({:controller => 'issues', :action => 'change_status', :id => @issue}) do %>
- <%=l(:label_change_status)%> :
- <select name="new_status_id">
- <%= options_from_collection_for_select @status_options, "id", "name" %>
- </select>
- <%= submit_tag l(:button_change) %>
- <% end %>
-<% end %>
-
-</div>
-
-<div id="history" class="box">
-<h3><%=l(:label_history)%>
-<% if @journals_count > @journals.length %>(<%= l(:label_last_changes, @journals.length) %>)<% end %></h3>
-<%= render :partial => 'history', :locals => { :journals => @journals } %>
-<% if @journals_count > @journals.length %>
- <p><center><small><%= link_to l(:label_change_view_all), :action => 'history', :id => @issue %></small></center></p>
+<h2><%= @issue.tracker.name %> #<%= @issue.id %> - <%=h @issue.subject %></h2> + +<div class="box"> +<table width="100%"> +<tr> + <td style="width:15%"><b><%=l(:field_status)%> :</b></td><td style="width:35%"><%= @issue.status.name %></td> + <td style="width:15%"><b><%=l(:field_priority)%> :</b></td><td style="width:35%"><%= @issue.priority.name %></td> +</tr> +<tr> + <td><b><%=l(:field_assigned_to)%> :</b></td><td><%= @issue.assigned_to ? @issue.assigned_to.name : "-" %></td> + <td><b><%=l(:field_category)%> :</b></td><td><%=h @issue.category ? @issue.category.name : "-" %></td> +</tr> +<tr> + <td><b><%=l(:field_author)%> :</b></td><td><%= link_to_user @issue.author %></td> + <td><b><%=l(:field_start_date)%> :</b></td><td><%= format_date(@issue.start_date) %></td> +</tr> +<tr> + <td><b><%=l(:field_created_on)%> :</b></td><td><%= format_date(@issue.created_on) %></td> + <td><b><%=l(:field_due_date)%> :</b></td><td><%= format_date(@issue.due_date) %></td> +</tr> +<tr> + <td><b><%=l(:field_updated_on)%> :</b></td><td><%= format_date(@issue.updated_on) %></td> + <td><b><%=l(:field_done_ratio)%> :</b></td><td><%= @issue.done_ratio %> %</td> +</tr> +<tr> + <td><b><%=l(:field_fixed_version)%> :</b></td><td><%= @issue.fixed_version ? @issue.fixed_version.name : "-" %></td> + <td></td><td></td> +</tr> +<tr> +<% n = 0 +for custom_value in @custom_values %> + <td><b><%= custom_value.custom_field.name %> :</b></td><td><%=h show_value custom_value %></td> +<% n = n + 1 + if (n > 1) + n = 0 %> + </tr><tr> + <%end +end %> +</tr> +</table> +<hr /> +<br /> + +<b><%=l(:field_description)%> :</b><br /><br /> +<%= textilizable @issue.description %> +<br /> + +<div class="contextual"> +<%= link_to_if_authorized l(:button_edit), {:controller => 'issues', :action => 'edit', :id => @issue}, :class => 'icon icon-edit' %> +<%= link_to_if_authorized l(:button_move), {:controller => 'projects', :action => 'move_issues', :id => @project, "issue_ids[]" => @issue.id }, :class => 'icon icon-move' %> +<%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %> +</div> + +<% if authorize_for('issues', 'change_status') and @status_options and !@status_options.empty? %> + <% form_tag ({:controller => 'issues', :action => 'change_status', :id => @issue}) do %> + <%=l(:label_change_status)%> : + <select name="new_status_id"> + <%= options_from_collection_for_select @status_options, "id", "name" %> + </select> + <%= submit_tag l(:button_change) %> + <% end %> +<% end %> + +</div> + +<div id="history" class="box"> +<h3><%=l(:label_history)%> +<% if @journals_count > @journals.length %>(<%= l(:label_last_changes, @journals.length) %>)<% end %></h3> +<%= render :partial => 'history', :locals => { :journals => @journals } %> +<% if @journals_count > @journals.length %> + <p><center><small><%= link_to l(:label_change_view_all), :action => 'history', :id => @issue %></small></center></p> +<% end %> +</div> + +<div class="box"> +<h3><%=l(:label_attachment_plural)%></h3> +<table width="100%"> +<% for attachment in @issue.attachments %> +<tr> +<td><%= link_to attachment.filename, { :action => 'download', :id => @issue, :attachment_id => attachment }, :class => 'icon icon-attachment' %> (<%= number_to_human_size(attachment.filesize) %>)</td> +<td><%= format_date(attachment.created_on) %></td> +<td><%= attachment.author.display_name %></td> +<td><div class="contextual"><%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy_attachment', :id => @issue, :attachment_id => attachment }, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %></div></td> +</tr> <% end %> -</div>
-
-<div class="box">
-<h3><%=l(:label_attachment_plural)%></h3>
-<table width="100%">
-<% for attachment in @issue.attachments %>
-<tr>
-<td><%= link_to attachment.filename, { :action => 'download', :id => @issue, :attachment_id => attachment }, :class => 'icon icon-attachment' %> (<%= number_to_human_size(attachment.filesize) %>)</td>
-<td><%= format_date(attachment.created_on) %></td>
-<td><%= attachment.author.display_name %></td>
-<td><div class="contextual"><%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy_attachment', :id => @issue, :attachment_id => attachment }, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %></div></td>
-</tr>
+</table> +<br /> +<% if authorize_for('issues', 'add_attachment') %> + <% form_tag ({ :controller => 'issues', :action => 'add_attachment', :id => @issue }, :multipart => true, :class => "tabular") do %> + <p id="attachments_p"><label><%=l(:label_attachment_new)%> + <%= image_to_function "add.png", "addFileField();return false" %></label> + <%= file_field_tag 'attachments[]', :size => 30 %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p> + <%= submit_tag l(:button_add) %> + <% end %> +<% end %> +</div> + +<% if authorize_for('issues', 'add_note') %> + <div class="box"> + <h3><%= l(:label_add_note) %></h3> + <% form_tag ({:controller => 'issues', :action => 'add_note', :id => @issue}, :class => "tabular" ) do %> + <p><label for="notes"><%=l(:field_notes)%></label> + <%= text_area_tag 'notes', '', :cols => 60, :rows => 10, :class => 'wiki-edit' %></p> + <%= submit_tag l(:button_add) %> + <% end %> + </div> <% end %> -</table>
-<br />
-<% if authorize_for('issues', 'add_attachment') %>
- <% form_tag ({ :controller => 'issues', :action => 'add_attachment', :id => @issue }, :multipart => true, :class => "tabular") do %>
- <p id="attachments_p"><label><%=l(:label_attachment_new)%>
- <%= image_to_function "add.png", "addFileField();return false" %></label>
- <%= file_field_tag 'attachments[]', :size => 30 %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
- <%= submit_tag l(:button_add) %>
- <% end %>
-<% end %>
-</div>
-
-<% if authorize_for('issues', 'add_note') %>
- <div class="box">
- <h3><%= l(:label_add_note) %></h3>
- <% form_tag ({:controller => 'issues', :action => 'add_note', :id => @issue}, :class => "tabular" ) do %>
- <p><label for="notes"><%=l(:field_notes)%></label>
- <%= text_area_tag 'notes', '', :cols => 60, :rows => 10, :class => 'wiki-edit' %></p>
- <%= submit_tag l(:button_add) %>
- <% end %>
- </div>
-<% end %>
|