mirror of
https://github.com/TracksApp/tracks.git
synced 2026-02-03 06:21:49 +01:00
Added similar code to that in [288] to add context and project dropdowns to all of the lightbox add next action forms.
git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@291 a4c988fc-2ded-0310-b66e-134b36920a42
This commit is contained in:
parent
803a9db6ae
commit
f483c34429
1 changed files with 22 additions and 14 deletions
|
|
@ -1,3 +1,23 @@
|
|||
<%
|
||||
case controller.controller_name
|
||||
when "context"
|
||||
add_string = "Add a next action in this context »"
|
||||
@selected_context = @context.id
|
||||
@selected_project = nil
|
||||
when "project"
|
||||
add_string = "Add a next action in this project »"
|
||||
@selected_context = @contexts[0].id
|
||||
@selected_project = @project.id
|
||||
else
|
||||
add_string = "Add a next action »"
|
||||
@selected_context = @contexts[0].id
|
||||
@selected_project = nil
|
||||
end
|
||||
|
||||
if @on_page == "tickler"
|
||||
add_string = "Add a deferred action »"
|
||||
end
|
||||
%>
|
||||
<% hide_link ||= false %>
|
||||
<% unless hide_link -%>
|
||||
<%= link_to_function(
|
||||
|
|
@ -24,31 +44,19 @@
|
|||
<td><label for="todo_notes">Notes</label></td>
|
||||
<td><%= text_area( "todo", "notes", "cols" => 25, "rows" => 10, "tabindex" => 2) %></td>
|
||||
</tr>
|
||||
<% unless controller.controller_name == "context" -%>
|
||||
<tr>
|
||||
<td><label for="todo_context_id">Context</label></td>
|
||||
<td><%= collection_select( "todo", "context_id", @contexts, "id", "name",
|
||||
{}, {"tabindex" => 3}) %></td>
|
||||
<td><%= select("todo", "context_id", @contexts.collect {|c| [c.name, c.id] }, { :selected => @selected_context }, {"tabindex" => 3}) %></td>
|
||||
</tr>
|
||||
<% end -%>
|
||||
<% unless controller.controller_name == "project" -%>
|
||||
<tr>
|
||||
<td><label for="todo_project_id">Project</label></td>
|
||||
<td><%= collection_select( "todo", "project_id", @projects.reject{|p| p.done?}, "id", "name",
|
||||
{ :include_blank => true }, {"tabindex" => 4}) %></td>
|
||||
<td><%= select( "todo", "project_id", @projects.reject{|x| x.done? }.collect {|p| [p.name, p.id] }, { :selected => @selected_project, :include_blank => true }, {"tabindex" => 4}) %></td>
|
||||
</tr>
|
||||
<% end -%>
|
||||
<tr>
|
||||
<td><label for="todo_due">Due</label></td>
|
||||
<td><%= text_field("todo", "due", "size" => 10, "class" => "Date", "onFocus" => "Calendar.setup", "tabindex" => 5, "autocomplete" => "off") %></td>
|
||||
</tr>
|
||||
|
||||
<% if controller.controller_name == "project" -%>
|
||||
<%= hidden_field( "todo", "project_id", "value" => "#{@project.id}") %>
|
||||
<% elsif controller.controller_name == "context" -%>
|
||||
<%= hidden_field( "todo", "context_id", "value" => "#{@context.id}") %>
|
||||
<% end -%>
|
||||
|
||||
<% if @on_page == "tickler" -%>
|
||||
<tr>
|
||||
<td><label for="todo_show_from">Show from</label></td>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue